aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-200-0/+0
| | | | | | | | | | * remotes/upstream/master: move friend suggestions to top of contact page, add default contact profile photos if missing missed a default profile photo replacement in notifications change default profile photo to something more interesting than a reddish brown square slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible * master:
* move friend suggestions to top of contact page, add default contact profile ↵friendica2012-03-202-2/+23
| | | | photos if missing
* Merge branch 'pull'friendica2012-03-203-13/+148
|\
| * Merge pull request #153 from simonlnu/masterSimon2012-03-203-13/+148
| |\ | | | | | | intro boxen tweaks, dispy gets synced with -dark
| | * some tweakings for intro boxes (finally got an intro i could see :). dispy ↵Simon L'nu2012-03-203-13/+148
| | | | | | | | | | | | | | | | | | synced with dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-201-4/+5
| | |\ | | |/ | |/| | | | | | | | | | | | | * remotes/upstream/master: bug #339 - lostpass sending to username, not email * master:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-206-103/+98
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add IP address to failed login log message modified: include/text.php Stupid bug fixed cleanup after openid refactoring refactor openid logins/registrations modified: include/text.php deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png some openid fixes, use identity url from openid server and normalise it. support "no_smilies" ctrl + left|right cursor keys to prev/next photos add 'loggin_out' hook * master:
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1910-30/+66
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier community discovery cont., cleanup of DB debugging * master:
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: revup CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) * master:
* | | | | missed a default profile photo replacement in notificationsfriendica2012-03-201-1/+1
| | | | |
* | | | | change default profile photo to something more interesting than a reddish ↵friendica2012-03-209-10/+10
| | | | | | | | | | | | | | | | | | | | brown square
* | | | | slightly relax overly strict permissions in community and search to match ↵friendica2012-03-203-9/+12
|/ / / / | | | | | | | | | | | | those in display - tl;dr public conversations are publicly visible
* | | / bug #339 - lostpass sending to username, not emailfriendica2012-03-201-4/+5
| |_|/ |/| |
* | | add IP address to failed login log messagefriendica2012-03-191-1/+2
| | |
* | | Merge pull request #152 from ↵friendica2012-03-191-24/+2
|\ \ \ | | | | | | | | | | | | | | | | beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Smiley removal
| * | | modified: include/text.phpThomas2012-03-191-3/+2
| | | | | | | | | | | | | | | | Stupid bug fixed
| * | | modified: include/text.phpThomas2012-03-191-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out.
| * | | Merge remote-tracking branch 'main/master'Thomas2012-03-19207-1628/+11133
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Thomas2012-03-0983-123/+11136
| |\ \ \ \
* | \ \ \ \ Merge pull request #150 from fabrixxm/masterfriendica2012-03-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add "logging_out" hook
| * \ \ \ \ \ Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-19161-1042/+3487
| |\ \ \ \ \ \
| * | | | | | | add 'loggin_out' hookFabio Comuni2012-03-121-1/+1
| | | | | | | |
* | | | | | | | cleanup after openid refactoringfriendica2012-03-191-1/+6
| | | | | | | |
* | | | | | | | refactor openid logins/registrationsfriendica2012-03-193-77/+60
| |_|_|_|/ / / |/| | | | | |
* | | | | | | some openid fixes, use identity url from openid server and normalise it.friendica2012-03-194-3/+15
| |/ / / / / |/| | | | |
* | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Add a missing security token [Using photos as profile photos]
| * | | | | Existing photos could not be used as profile photos anymore - should be ↵Tobias Hößl2012-03-192-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | fixed now. And some extra logging in the CSRF-Protection to make debugging easier
* | | | | | 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
| | * | | | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵Tobias Hößl2012-03-185-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | group, adding/removing members from it)
* | | | | | 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-kilter
| * | | | | fix the comment box being too wide and looking off-kilterSimon L'nu2012-03-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-188-25/+17
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: replace split() by explode(); split is deprecated lost changes to tinymce/bbcode remove admin view of local directory bug #337, call template_unescape() only at the end of template processing queue optimisation - back off delivery attempts to once per hour after the first 12 hours. * master:
* | | | | | Merge pull request #146 from CatoTH/masterfriendica2012-03-182-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | replace split() by explode(); split is deprecated
| * | | | | 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 ↵friendica2012-03-171-3/+8
| | | | | | | | | | | | | | | | | | | | first 12 hours.
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-173-4/+4
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: compare ssl_policy precisely in case somebody was bitten by template processor bug template processor broken with foreach k=>v and k is integer 0 * master:
* | | | | compare ssl_policy precisely in case somebody was bitten by template ↵friendica2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | processor bug
* | | | | 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
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cut/paste error scheme checking for webservers without $_SERVER['HTTPS'] * master:
* | | | 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 up
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 10:43:55 +0000