aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* new lines removedAlexander Kampmann2012-03-222-1/+2
|
* removed some new lines to cut down number of changed filesAlexander Kampmann2012-03-223-2/+1
|
* removed unneccessary stuffAlexander Kampmann2012-03-222-23/+0
|
* Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-22498-11542/+24259
|\ | | | | | | | | | | | | | | Conflicts: boot.php database.sql include/template_processor.php update.php
| * missing tooltip for "file as"friendica2012-03-226-6/+6
| |
| * prevent re-registrations using a deleted username - not an issue with ↵friendica2012-03-226-2/+38
| | | | | | | | Friendica but could create a serious privacy issue with federated platforms
| * Merge pull request #156 from tomtom84/mastertomtom842012-03-216-0/+10
| |\ | | | | | | fixes in diabook-derivates
| | * add file_as-option to diabook-derivatestommy tomson2012-03-226-0/+10
| |/
| * support lowercase :-p smiliefriendica2012-03-211-0/+2
| |
| * Merge branch 'pull'friendica2012-03-2114-46/+65
| |\
| | * Merge pull request #155 from tomtom84/mastertomtom842012-03-2114-46/+65
| | |\ | | | | | | | | fixes in diabook-derivates
| | | * add icons to aside diabook, fixes in csstommy tomson2012-03-2214-46/+65
| | |/
| * / work around doubled linefeeds in tinymce3.5b2friendica2012-03-211-0/+10
| |/
| * revert permissions relaxation on communityfriendica2012-03-211-2/+2
| |
| * add comix-plainfriendica2012-03-217-1/+415
| |
| * smooth the comix comment boxfriendica2012-03-212-2/+36
| |
| * make autocomplete work with updated tinymcefriendica2012-03-211-10/+10
| |
| * ika to icafriendica2012-03-211-1/+1
| |
| * private file in repositoryfriendica2012-03-211-0/+0
| |
| * facepark is unsupported ATMfriendica2012-03-212-0/+0
| |
| * Merge branch 'pull'friendica2012-03-2025-0/+3661
| |\
| | * Merge pull request #154 from tonybaldwin/masterfriendica2012-03-2025-0/+3661
| | |\ | | | | | | | | added theme
| | | * Merge remote branch 'upstream/master'tony baldwin2012-03-21426-11330/+19994
| | | |\
| | | * | added Vijay's theme from facepark.intony baldwin2012-03-2125-0/+3661
| | | | |
| * | | | remove stray template variable from old codefriendica2012-03-202-3/+1
| |/ / /
| * | | add comix themefriendica2012-03-205-0/+386
| | | |
| * | | use password field for DB inputfriendica2012-03-201-1/+1
| | |/ | |/|
| * | added README to mcefixes to explain what is going on.friendica2012-03-201-0/+4
| | |
| * | update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocksfriendica2012-03-20296-10368/+17048
| | |
| * | more friend suggestionsfriendica2012-03-201-1/+1
| | |
| * | 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
| | |\ \ \ \ \ \ \