aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | missing tooltip for "file as"friendica2012-03-226-6/+6
| | * | | prevent re-registrations using a deleted username - not an issue with Friendi...friendica2012-03-226-2/+38
| * | | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-226-0/+10
| |\| | |
| | * | | Merge pull request #156 from tomtom84/mastertomtom842012-03-216-0/+10
| | |\ \ \
| | | * | | add file_as-option to diabook-derivatestommy tomson2012-03-226-0/+10
| | |/ / /
| * | | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-22389-10614/+22032
| |\| | |
| * | | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-186-23/+15
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-173-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1731-321/+504
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1651-189/+619
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1538-284/+1398
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1447-338/+752
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1329-58/+379
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1210-156/+196
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "OpenID: display error msg if ID URL used to register an account does ...Tobias Diekershoff2012-03-111-9/+4
| * | | | | | | | | | | | OpenID: display error msg if ID URL used to register an account does not existTobias Diekershoff2012-03-111-4/+9
| | | | | | | | | | | | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-194-3/+15
| | | | | | | | | | | | |\
* | | | | | | | | | | | | \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-22356-10435/+21643
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ 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
* | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-200-0/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | move friend suggestions to top of contact page, add default contact profile p...friendica2012-03-202-2/+23
* | | | | | | | | | | | | | Merge branch 'pull'friendica2012-03-203-13/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #153 from simonlnu/masterSimon2012-03-203-13/+148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | some tweakings for intro boxes (finally got an intro i could see :). dispy sy...Simon L'nu2012-03-203-13/+148
| | * | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-201-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-206-103/+98
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1910-30/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-180-0/+0
* | | | | | | | | | | | | | | | | | missed a default profile photo replacement in notificationsfriendica2012-03-201-1/+1