aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'quattrofiler'Tobias Diekershoff2012-03-222-0/+6
|\
| * non static filer textTobias Diekershoff2012-03-222-2/+2
| * adding filer functionality to quattro(-green)Tobias Diekershoff2012-03-222-0/+6
* | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-2212-8/+44
|\ \ | |/ |/|
| * 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
|\|
| * 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
| * | 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
| * | | | | | change default profile photo to something more interesting than a reddish bro...friendica2012-03-209-10/+10
| * | | | | | slightly relax overly strict permissions in community and search to match tho...friendica2012-03-203-9/+12
| |/ / / / /
| * | | / / 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 beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657...friendica2012-03-191-24/+2
| |\ \ \ \
| | * | | | modified: include/text.phpThomas2012-03-191-3/+2
| | * | | | modified: include/text.phpThomas2012-03-191-21/+0
| | * | | | Merge remote-tracking branch 'main/master'Thomas2012-03-19207-1628/+11133
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master'Thomas2012-03-0983-123/+11136
| | |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 19:41:56 +0000