aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:annando/friendicaMichael Vogel2012-05-268-46/+67
|\
| * Merge branch 'master' of github.com:annando/friendicaMichael2012-05-267-31/+76
| |\
| * \ Merge remote branch 'upstream/master'Michael2012-05-2665-1886/+2705
| |\ \
| | * | missing entries on personal tab after sql text search optimisefriendica2012-05-252-7/+6
| | * | bug #434 - default group placement not working after accepting dfrn friend re...friendica2012-05-251-1/+1
| | * | fix wall_uploaded photo permissions on group post by memberfriendica2012-05-251-1/+3
| | * | improve location change notificationsfriendica2012-05-251-1/+10
| | * | keep private FB stuff out of personal notesfriendica2012-05-253-39/+50
| * | | Merge branch 'master' of github.com:annando/friendicaMichael2012-05-19915-87935/+37921
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-05-16981-4562/+162753
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'upstream/master'Michael2012-04-1498-911/+2464
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-04-1392-12077/+2089
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-04-11133-1946/+2921
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-04-112186-18156/+97640
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-03-0341-273/+2646
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-03-0213-69/+50
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-03-0250-741/+1128
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Doing negative caching for config values, special logfile for database optmis...Michael Vogel2012-05-262-4/+26
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Saved searches now can search for tags as wellMichael Vogel2012-05-262-6/+17
* | | | | | | | | | | | Deactivating the test output in db engineMichael Vogel2012-05-261-2/+2
* | | | | | | | | | | | Speed optimisation by enabling the posibility of the MySQL fulltext engineMichael Vogel2012-05-265-18/+43
* | | | | | | | | | | | Merge remote branch 'upstream/master'Michael Vogel2012-05-2564-1873/+2671
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2510-444/+450
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | DE update to strings and templatesTobias Diekershoff2012-05-253-397/+419
| | * | | | | | | | | | | Merge pull request #313 from fabrixxm/masterSimon2012-05-243-5/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | fix small js error when user not logged inroot2012-05-241-1/+1
| | | * | | | | | | | | | | install wizard: fix php executable pathroot2012-05-242-4/+6
| | * | | | | | | | | | | | Merge pull request #314 from simonlnu/masterSimon2012-05-244-42/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | update dark a bit. i messed up some buttonsSimon L'nu2012-05-244-42/+24
| | | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / rev updatefriendica2012-05-254-89/+90
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | slackr: improve interactivityfriendica2012-05-231-0/+14
| * | | | | | | | | | | | slackr: hide calendar when postingfriendica2012-05-231-0/+8
| * | | | | | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-234-39/+70
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #312 from simonlnu/masterSimon2012-05-234-39/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | clean up and more fixingSimon L'nu2012-05-234-39/+70
| | | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-233-151/+174
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| * | | | | | | | | | | | | | more theme stufffriendica2012-05-233-1/+56
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | slackr - better highlighting of current selectionsfriendica2012-05-231-1/+6
| * | | | | | | | | | | | | slackr - knock the sharp edges off the events calendarfriendica2012-05-231-1/+1
| * | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2312-137/+278
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #309 from fabrixxm/masterSimon2012-05-234-38/+56
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Update install wizardroot2012-05-234-38/+56
| | * | | | | | | | | | | | Merge pull request #311 from simonlnu/masterSimon2012-05-235-64/+164
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | clean up and make nice the dispy photo edit stuffSimon L'nu2012-05-235-64/+164
| | | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge pull request #310 from simonlnu/masterSimon2012-05-237-35/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-237-35/+58
| | | * | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2319-269/+417
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 02:34:22 +0000