]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 5 Apr 2012 03:32:16 +0000 (23:32 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  correct some filer dialog weirdness caused by introduction of categories
  move alert box away from nav links
  log disabled requests
  fix config storage of booleans

* master:

12 years agoMerge pull request #205 from unary/filerfix
friendica [Thu, 5 Apr 2012 03:23:20 +0000 (20:23 -0700)]
Merge pull request #205 from unary/filerfix

correct some filer dialog weirdness caused by introduction of categories

12 years agocorrect some filer dialog weirdness caused by introduction of categories
Michael Johnston [Thu, 5 Apr 2012 03:08:16 +0000 (23:08 -0400)]
correct some filer dialog weirdness caused by introduction of categories

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 5 Apr 2012 02:58:32 +0000 (22:58 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  well that was a stupid mistake...
  string update
  bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
  better handling of reshares containing embeds

* master:

12 years agomove alert box away from nav links
friendica [Thu, 5 Apr 2012 02:13:41 +0000 (19:13 -0700)]
move alert box away from nav links

12 years agolog disabled requests
friendica [Thu, 5 Apr 2012 01:49:39 +0000 (18:49 -0700)]
log disabled requests

12 years agofix config storage of booleans
friendica [Thu, 5 Apr 2012 00:51:59 +0000 (17:51 -0700)]
fix config storage of booleans

12 years agowell that was a stupid mistake...
friendica [Thu, 5 Apr 2012 00:19:46 +0000 (17:19 -0700)]
well that was a stupid mistake...

12 years agostring update
friendica [Wed, 4 Apr 2012 22:51:56 +0000 (15:51 -0700)]
string update

12 years agobug: diaspora_enabled setting turns it on but doesn't fully turn it off.
friendica [Wed, 4 Apr 2012 21:13:34 +0000 (14:13 -0700)]
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.

12 years agoMerge branch 'pull'
friendica [Wed, 4 Apr 2012 09:02:50 +0000 (02:02 -0700)]
Merge branch 'pull'

12 years agobetter handling of reshares containing embeds
friendica [Wed, 4 Apr 2012 09:02:23 +0000 (02:02 -0700)]
better handling of reshares containing embeds

12 years agoMerge pull request #204 from simonlnu/master
Simon [Wed, 4 Apr 2012 06:21:39 +0000 (23:21 -0700)]
Merge pull request #204 from simonlnu/master

many changes, all small

12 years agolatest changes are the popup menu for notifs, fixes
Simon L'nu [Wed, 4 Apr 2012 06:19:39 +0000 (02:19 -0400)]
latest changes are the popup menu for notifs, fixes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 4 Apr 2012 06:14:26 +0000 (02:14 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  display settings hooks
  re-opened bug #363
  this is better
  include contact_widgets for categories_widget when doing updates
  remove loozah themes which fell too far behind to recover
  smal fix
  german translation for right_aside
  make right_aside translatable and provide german translation... and some css-fixes
  suppress duplicates in search
  make contact ssl_policy change a function since it is used in a few places
  more ssl policy fixes and prevent delivery to soapbox when using  local delivery
  don't change ssl settings on local photos for remote contact

* master:

12 years agodisplay settings hooks
friendica [Wed, 4 Apr 2012 05:01:52 +0000 (22:01 -0700)]
display settings hooks

12 years agore-opened bug #363
friendica [Wed, 4 Apr 2012 03:14:37 +0000 (20:14 -0700)]
re-opened bug #363

12 years agothis is better
friendica [Wed, 4 Apr 2012 02:20:39 +0000 (19:20 -0700)]
this is better

12 years agoMerge branch 'pull'
friendica [Wed, 4 Apr 2012 02:16:59 +0000 (19:16 -0700)]
Merge branch 'pull'

12 years agoinclude contact_widgets for categories_widget when doing updates
friendica [Wed, 4 Apr 2012 02:16:02 +0000 (19:16 -0700)]
include contact_widgets for categories_widget when doing updates

12 years agoremove loozah themes which fell too far behind to recover
friendica [Tue, 3 Apr 2012 23:40:25 +0000 (16:40 -0700)]
remove loozah themes which fell too far behind to recover

12 years agosmal fix
tommy tomson [Tue, 3 Apr 2012 19:45:58 +0000 (21:45 +0200)]
smal fix

12 years agoMerge pull request #202 from tomtom84/master
tomtom84 [Tue, 3 Apr 2012 19:08:40 +0000 (12:08 -0700)]
Merge pull request #202 from tomtom84/master

german translation for right_aside

12 years agogerman translation for right_aside
tommy tomson [Tue, 3 Apr 2012 19:06:57 +0000 (21:06 +0200)]
german translation for right_aside

12 years agoMerge pull request #201 from tomtom84/master
tomtom84 [Tue, 3 Apr 2012 19:00:24 +0000 (12:00 -0700)]
Merge pull request #201 from tomtom84/master

fixes in diabook-themes

12 years agomake right_aside translatable and provide german translation...
tommy tomson [Tue, 3 Apr 2012 18:59:00 +0000 (20:59 +0200)]
make right_aside translatable and provide german translation...
and some css-fixes

12 years agosuppress duplicates in search
friendica [Tue, 3 Apr 2012 09:44:29 +0000 (02:44 -0700)]
suppress duplicates in search

12 years agomake contact ssl_policy change a function since it is used in a few places
friendica [Tue, 3 Apr 2012 06:07:26 +0000 (23:07 -0700)]
make contact ssl_policy change a function since it is used in a few places

12 years agomore ssl policy fixes and prevent delivery to soapbox when using local delivery
friendica [Tue, 3 Apr 2012 04:01:19 +0000 (21:01 -0700)]
more ssl policy fixes and prevent delivery to soapbox when using  local delivery

12 years agodon't change ssl settings on local photos for remote contact
friendica [Tue, 3 Apr 2012 02:38:13 +0000 (19:38 -0700)]
don't change ssl settings on local photos for remote contact

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 3 Apr 2012 01:55:10 +0000 (21:55 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #363 and a couple of other reported ssl link issues

* master:

12 years agobug #363 and a couple of other reported ssl link issues
friendica [Tue, 3 Apr 2012 00:43:11 +0000 (17:43 -0700)]
bug #363 and a couple of other reported ssl link issues

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 2 Apr 2012 20:53:47 +0000 (16:53 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master:

12 years agodiabook-themes: css-fixes
tommy tomson [Mon, 2 Apr 2012 18:30:27 +0000 (20:30 +0200)]
diabook-themes: css-fixes

12 years agodiabook-themes: fixes in js
tommy tomson [Mon, 2 Apr 2012 16:16:58 +0000 (18:16 +0200)]
diabook-themes: fixes in js

12 years agodiabook-themes: fixed pageheader
tommy tomson [Mon, 2 Apr 2012 15:17:14 +0000 (17:17 +0200)]
diabook-themes: fixed pageheader

12 years agodiabook-themes: bugfixes / css-fixes
tommy tomson [Mon, 2 Apr 2012 13:06:55 +0000 (15:06 +0200)]
diabook-themes: bugfixes / css-fixes

12 years agomake the "new calendar" (javascript interactive) the default
friendica [Mon, 2 Apr 2012 08:46:35 +0000 (01:46 -0700)]
make the "new calendar" (javascript interactive) the default

12 years agoremove zrl from query string
friendica [Mon, 2 Apr 2012 07:45:45 +0000 (00:45 -0700)]
remove zrl from query string

12 years agocatch a couple more Oo smilies
friendica [Mon, 2 Apr 2012 05:57:50 +0000 (22:57 -0700)]
catch a couple more Oo smilies

12 years agoadd page_content_top hook
friendica [Mon, 2 Apr 2012 05:22:26 +0000 (22:22 -0700)]
add page_content_top hook

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 2 Apr 2012 03:56:13 +0000 (23:56 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add title to D* posts
  allow users to set categories on their posts
  Modified peopleyouknow to handle sites without Facebook better
  diabook-themes: add link to global dir in "find friends" at right_aside
  modified:   mod/newmember.php
  New user quick start.
  check for style.php existence before inclusion
  Moved Diaspora notes away from top, per user request

* master:

12 years agoadd title to D* posts
friendica [Mon, 2 Apr 2012 02:16:13 +0000 (19:16 -0700)]
add title to D* posts

12 years agoMerge pull request #200 from unary/categories
friendica [Mon, 2 Apr 2012 02:03:20 +0000 (19:03 -0700)]
Merge pull request #200 from unary/categories

allow users to set categories on their posts

12 years agoallow users to set categories on their posts
Michael Johnston [Mon, 2 Apr 2012 01:28:31 +0000 (21:28 -0400)]
allow users to set categories on their posts

12 years agoMerge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d
friendica [Mon, 2 Apr 2012 00:53:59 +0000 (17:53 -0700)]
Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d

Better peopleyouknow for sites without Facebook

12 years agoModified peopleyouknow to handle sites without Facebook better
Thomas Willingham [Mon, 2 Apr 2012 00:26:45 +0000 (01:26 +0100)]
Modified peopleyouknow to handle sites without Facebook better

12 years agoMerge pull request #198 from beardy-unixer/master
friendica [Sun, 1 Apr 2012 23:49:19 +0000 (16:49 -0700)]
Merge pull request #198 from beardy-unixer/master

New User Quick Start

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas Willingham [Sun, 1 Apr 2012 23:29:27 +0000 (00:29 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agodiabook-themes: add link to global dir in "find friends" at right_aside
tommy tomson [Sun, 1 Apr 2012 23:29:20 +0000 (01:29 +0200)]
diabook-themes: add link to global dir in "find friends" at right_aside

12 years ago modified: mod/newmember.php
Thomas Willingham [Sun, 1 Apr 2012 23:27:47 +0000 (00:27 +0100)]
modified:   mod/newmember.php

Add a link to the quick start

12 years agoNew user quick start.
Thomas Willingham [Sun, 1 Apr 2012 23:23:58 +0000 (00:23 +0100)]
New user quick start.

12 years agocheck for style.php existence before inclusion
friendica [Sun, 1 Apr 2012 23:21:55 +0000 (16:21 -0700)]
check for style.php existence before inclusion

12 years agoMoved Diaspora notes away from top, per user request
Thomas Willingham [Sun, 1 Apr 2012 23:18:03 +0000 (00:18 +0100)]
Moved Diaspora notes away from top, per user request

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 1 Apr 2012 22:59:53 +0000 (18:59 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  slight improvement in handling of plaintext feeds
  css-fixes
  add new messages-layout in diabook
  fix the display of community-plugin in diabook-themes
  that didn't quite work out
  document tinymce fixes/workarounds
  various bugfixes and css-fixes
  qcomment overflow
  try slightly better detection of html in feeds
  send unverified private mail using zrl

* master:

12 years agoMerge branch 'pull'
friendica [Sun, 1 Apr 2012 22:44:27 +0000 (15:44 -0700)]
Merge branch 'pull'

12 years agoslight improvement in handling of plaintext feeds
friendica [Sun, 1 Apr 2012 22:43:57 +0000 (15:43 -0700)]
slight improvement in handling of plaintext feeds

12 years agocss-fixes
tommy tomson [Sun, 1 Apr 2012 22:05:49 +0000 (00:05 +0200)]
css-fixes

12 years agoMerge pull request #197 from tomtom84/master
tomtom84 [Sun, 1 Apr 2012 16:13:35 +0000 (09:13 -0700)]
Merge pull request #197 from tomtom84/master

fixes in diabook-derivates

12 years agoadd new messages-layout in diabook
tommy tomson [Sun, 1 Apr 2012 16:12:20 +0000 (18:12 +0200)]
add new messages-layout in diabook

12 years agoMerge pull request #196 from tomtom84/master
tomtom84 [Sun, 1 Apr 2012 14:35:47 +0000 (07:35 -0700)]
Merge pull request #196 from tomtom84/master

fixes in diabook-derivates

12 years agofix the display of community-plugin in diabook-themes
tommy tomson [Sun, 1 Apr 2012 14:34:31 +0000 (16:34 +0200)]
fix the display of community-plugin in diabook-themes

12 years agothat didn't quite work out
friendica [Sun, 1 Apr 2012 13:46:12 +0000 (06:46 -0700)]
that didn't quite work out

12 years agoMerge branch 'pull'
friendica [Sun, 1 Apr 2012 11:13:58 +0000 (04:13 -0700)]
Merge branch 'pull'

12 years agoMerge pull request #195 from tomtom84/master
tomtom84 [Sun, 1 Apr 2012 11:13:48 +0000 (04:13 -0700)]
Merge pull request #195 from tomtom84/master

fixes in diabook-derivates

12 years agodocument tinymce fixes/workarounds
friendica [Sun, 1 Apr 2012 11:13:27 +0000 (04:13 -0700)]
document tinymce fixes/workarounds

12 years agovarious bugfixes and css-fixes
tommy tomson [Sun, 1 Apr 2012 11:12:15 +0000 (13:12 +0200)]
various bugfixes and css-fixes

12 years agoqcomment overflow
friendica [Sun, 1 Apr 2012 10:37:41 +0000 (03:37 -0700)]
qcomment overflow

12 years agotry slightly better detection of html in feeds
friendica [Sun, 1 Apr 2012 10:19:37 +0000 (03:19 -0700)]
try slightly better detection of html in feeds

12 years agoMerge branch 'pull'
friendica [Sun, 1 Apr 2012 08:03:05 +0000 (01:03 -0700)]
Merge branch 'pull'

12 years agosend unverified private mail using zrl
friendica [Sun, 1 Apr 2012 07:59:35 +0000 (00:59 -0700)]
send unverified private mail using zrl

12 years agoMerge pull request #194 from simonlnu/master
Simon [Sun, 1 Apr 2012 07:58:08 +0000 (00:58 -0700)]
Merge pull request #194 from simonlnu/master

latest fixes for dispys. tweaking/repairing

12 years agolatest fixes for dispys. tweaking/repairing
Simon L'nu [Sun, 1 Apr 2012 07:57:05 +0000 (03:57 -0400)]
latest fixes for dispys. tweaking/repairing

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 1 Apr 2012 07:54:58 +0000 (03:54 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  line 86: s/Friendika/Friendica/
  fix "between yourself and You" in mail list

* master:

12 years agoline 86: s/Friendika/Friendica/
Simon [Sun, 1 Apr 2012 07:52:45 +0000 (04:52 -0300)]
line 86: s/Friendika/Friendica/

12 years agofix "between yourself and You" in mail list
friendica [Sun, 1 Apr 2012 03:08:32 +0000 (20:08 -0700)]
fix "between yourself and You" in mail list

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 1 Apr 2012 02:46:13 +0000 (22:46 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  more error handling
  ensure all new users get a timezone. We'll use UTC until they choose otherwise.
  handle escaped file chars in display and search
  escape % in file_tag_query as it is ultimately embedded in a sprintf
  diabook-themes: move "common tabs" to left side on settings page
  move the common tabs to right_aside in diabook-derivates
  register hooks for a COPA plugin
  some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
  bug fix in diabook-aerith and -red
  bug-fixes in diabook-derivates
  settings for unknown private mail acceptance

* master:

12 years agomore error handling
friendica [Sun, 1 Apr 2012 00:44:34 +0000 (17:44 -0700)]
more error handling

12 years agoensure all new users get a timezone. We'll use UTC until they choose otherwise.
friendica [Sat, 31 Mar 2012 23:08:40 +0000 (16:08 -0700)]
ensure all new users get a timezone. We'll use UTC until they choose otherwise.

12 years agohandle escaped file chars in display and search
friendica [Sat, 31 Mar 2012 22:25:17 +0000 (15:25 -0700)]
handle escaped file chars in display and search

12 years agoMerge branch 'pull'
friendica [Sat, 31 Mar 2012 21:50:14 +0000 (14:50 -0700)]
Merge branch 'pull'

12 years agoescape % in file_tag_query as it is ultimately embedded in a sprintf
friendica [Sat, 31 Mar 2012 21:48:35 +0000 (14:48 -0700)]
escape % in file_tag_query as it is ultimately embedded in a sprintf

12 years agoMerge pull request #193 from tomtom84/master
tomtom84 [Sat, 31 Mar 2012 16:44:12 +0000 (09:44 -0700)]
Merge pull request #193 from tomtom84/master

diabook-themes: move "common tabs" to left side on settings page

12 years agodiabook-themes: move "common tabs" to left side on settings page
tommy tomson [Sat, 31 Mar 2012 16:42:11 +0000 (18:42 +0200)]
diabook-themes: move "common tabs" to left side on settings page

12 years agoMerge pull request #192 from tomtom84/master
tomtom84 [Sat, 31 Mar 2012 15:00:45 +0000 (08:00 -0700)]
Merge pull request #192 from tomtom84/master

fixes in diabook-derivates

12 years agomove the common tabs to right_aside in diabook-derivates
tommy tomson [Sat, 31 Mar 2012 14:58:02 +0000 (16:58 +0200)]
move the common tabs to right_aside in diabook-derivates

12 years agoregister hooks for a COPA plugin
friendica [Sat, 31 Mar 2012 13:15:33 +0000 (06:15 -0700)]
register hooks for a COPA plugin

12 years agosome js fixes - ignore backspace as history selector and cleanup errors closing non...
friendica [Sat, 31 Mar 2012 12:51:56 +0000 (05:51 -0700)]
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus

12 years agoMerge branch 'pull'
friendica [Sat, 31 Mar 2012 11:40:35 +0000 (04:40 -0700)]
Merge branch 'pull'

12 years agobug fix in diabook-aerith and -red
tommy tomson [Sat, 31 Mar 2012 09:50:33 +0000 (11:50 +0200)]
bug fix in diabook-aerith and -red

12 years agoMerge pull request #191 from tomtom84/master
tomtom84 [Sat, 31 Mar 2012 09:11:30 +0000 (02:11 -0700)]
Merge pull request #191 from tomtom84/master

bug-fixes in diabook-derivates

12 years agobug-fixes in diabook-derivates
tommy tomson [Sat, 31 Mar 2012 09:09:57 +0000 (11:09 +0200)]
bug-fixes in diabook-derivates

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 31 Mar 2012 08:05:19 +0000 (04:05 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #190 from simonlnu/master
Simon [Sat, 31 Mar 2012 08:03:39 +0000 (01:03 -0700)]
Merge pull request #190 from simonlnu/master

forgot the css changes for last push

12 years agoforgot the css changes for last push
Simon L'nu [Sat, 31 Mar 2012 08:02:51 +0000 (04:02 -0400)]
forgot the css changes for last push

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agosettings for unknown private mail acceptance
friendica [Sat, 31 Mar 2012 07:57:59 +0000 (00:57 -0700)]
settings for unknown private mail acceptance

12 years agoMerge pull request #189 from simonlnu/master
Simon [Sat, 31 Mar 2012 07:57:26 +0000 (00:57 -0700)]
Merge pull request #189 from simonlnu/master

most notable one is fixing qcomment

12 years agotheme fixes; fix qcomment (finally)
Simon L'nu [Sat, 31 Mar 2012 07:56:06 +0000 (03:56 -0400)]
theme fixes; fix qcomment (finally)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 31 Mar 2012 07:42:19 +0000 (03:42 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  warning cleanup

* master:

12 years agowarning cleanup
friendica [Sat, 31 Mar 2012 06:18:46 +0000 (23:18 -0700)]
warning cleanup