aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-05-3111-186/+214
|\
| * prevent email from leaking in feedsfriendica2012-05-301-0/+4
| * y didn't i think of this b4?friendica2012-05-301-0/+4
| * some zero theming on settings pagefriendica2012-05-304-12/+26
| * missing delimiterfriendica2012-05-301-1/+1
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-301-1/+1
| |\
| | * Friendicaland - you can't 'live' on a demo server.Thomas Willingham2012-05-301-1/+1
| * | transition to beta for private forumsfriendica2012-05-302-3/+0
| * | rev updatefriendica2012-05-303-168/+172
| * | Create a "potential default group" called "Friends" on registration.friendica2012-05-301-0/+5
| * | fix private photos that also have a size specificationfriendica2012-05-301-2/+2
| |/
* | Merge remote branch 'upstream/master'zottel2012-05-3047-839/+995
|\|
| * private group tests, cont.friendica2012-05-298-24/+54
| * hide private group if desiredfriendica2012-05-292-6/+14
| * prvgroup should see introsfriendica2012-05-291-1/+1
| * private group fixfriendica2012-05-291-1/+1
| * possible sql injection in searchfriendica2012-05-292-3/+3
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-2913-111/+197
| |\
| | * Merge pull request #316 from annando/masterSimon2012-05-297-78/+148
| | |\
| | | * MySQL-Fulltext search option is disabled by defaultMichael Vogel2012-05-291-1/+1
| | | * Disabled logging of SQL statementsMichael Vogel2012-05-291-4/+4
| | | * Merge remote branch 'upstream/master'Michael Vogel2012-05-2927-655/+660
| | | |\
| | | * \ 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
| | | | |\ \ \
| | | | * \ \ \ 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Performance testsMichael Vogel2012-05-204-10/+19
| | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge remote branch 'upstream/master'Michael Vogel2012-05-1926-665/+1036
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael Vogel2012-05-16109-12544/+17543
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'Michael Vogel2012-05-09854-82504/+27120
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | API: RSS-Feeds are now shortened to 1000 characters. (With added link)Michael Vogel2012-04-221-45/+48
| | | * | | | | | | | | | | | | | | Merge commit 'upstream/master'Michael Vogel2012-04-21864-4473/+154113
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'upstream/master'Michael Vogel2012-04-15162-136/+8652
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #317 from CatoTH/masterSimon2012-05-291-6/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Add two hooks, event_created and event_updated. One Bugfix for the <id>...</i...Tobias Hößl2012-05-291-6/+11
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge pull request #318 from simonlnu/masterSimon2012-05-295-28/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | fix toolbar. more size dynamicismSimon L'nu2012-05-295-28/+38
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-17 03:53:39 +0000