aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #150 from fabrixxm/masterfriendica2012-03-191-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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
|\ \ \ \ \ \
| * | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 00:53:28 +0000