aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-19161-1042/+3487
|\
| * support "no_smilies"friendica2012-03-191-0/+5
| * ctrl + left|right cursor keys to prev/next photosfriendica2012-03-191-1/+12
| * Merge pull request #149 from CatoTH/masterSimon2012-03-192-9/+13
| |\
| | * Existing photos could not be used as profile photos anymore - should be fixed...Tobias Hößl2012-03-192-9/+13
| * | community discovery cont., cleanup of DB debuggingfriendica2012-03-188-21/+53
| * | Merge branch 'pull'friendica2012-03-185-10/+29
| |\ \
| | * | Merge pull request #147 from CatoTH/masterfriendica2012-03-185-10/+29
| | |\|
| | | * CSRF-Protection in the group-related form (creating, renaming and dropping a ...Tobias Hößl2012-03-185-10/+29
| * | | revupfriendica2012-03-181-1/+1
| |/ /
| * | Merge pull request #148 from simonlnu/masterSimon2012-03-182-2/+2
| |\ \
| | * | fix the comment box being too wide and looking off-kilterSimon L'nu2012-03-182-2/+2
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-188-25/+17
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #146 from CatoTH/masterfriendica2012-03-182-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | replace split() by explode(); split is deprecatedTobias Hößl2012-03-182-2/+2
| |/ /
| * | lost changes to tinymce/bbcodefriendica2012-03-171-61/+136
| * | remove admin view of local directoryfriendica2012-03-172-151/+63
| * | bug #337, call template_unescape() only at the end of template processingfriendica2012-03-174-5/+5
| * | queue optimisation - back off delivery attempts to once per hour after the fi...friendica2012-03-171-3/+8
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-173-4/+4
| | |\ | | |/ | |/|
| * | compare ssl_policy precisely in case somebody was bitten by template processo...friendica2012-03-171-1/+1
| * | template processor broken with foreach k=>v and k is integer 0friendica2012-03-172-3/+3
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-170-0/+0
| |/
| * cut/paste errorfriendica2012-03-171-1/+1
| * scheme checking for webservers without $_SERVER['HTTPS']friendica2012-03-161-1/+6
| * Merge pull request #145 from simonlnu/masterSimon2012-03-164-16/+10
| |\
| | * [fix] whitespace in photo_view and like_noshare. dispy-dark clean upSimon L'nu2012-03-174-16/+10
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-170-0/+0
| |/
| * Merge pull request #144 from simonlnu/masterSimon2012-03-163-7/+9
| |\
| | * remove auto-complete from darkzero-NS, dispys, since the comment one is now g...Simon L'nu2012-03-162-6/+0
| | * make auto-complete work in more placesSimon L'nu2012-03-161-1/+9
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| |/
| * Merge pull request #143 from simonlnu/masterSimon2012-03-161-0/+3
| |\
| | * make auto-complete in darkzero-NS. other themes can use this easily. might ne...Simon L'nu2012-03-161-0/+3
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-162-7/+18
| | |\ | | |/ | |/|
| * | convert boolean or int settings to strings to work around issues with templat...friendica2012-03-161-7/+7
| * | add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| |/
| * Merge branch 'pull'friendica2012-03-1619-200/+325
| |\
| | * Merge pull request #142 from simonlnu/masterSimon2012-03-162-0/+18
| | |\
| | | * make profiles-menu disappear when clicked outside itSimon L'nu2012-03-162-0/+18
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | |/
| | * Merge pull request #141 from CatoTH/masterSimon2012-03-164-10/+18
| | |\
| | | * Bugfix of old IEsTobias Hößl2012-03-161-1/+1
| | | * Forgot to remove a debug lineTobias Hößl2012-03-161-1/+0
| | | * Use tabindex to enable easy navigation in the dialog to write private mails; ...Tobias Hößl2012-03-164-11/+20
| | * | Merge pull request #140 from simonlnu/masterSimon2012-03-1615-195/+294
| | |\ \
| | | * | weee, dispys get another updateSimon L'nu2012-03-1615-195/+294
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-165-98/+141
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | | |\ \