aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | 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
| | * | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-290-0/+0
| |/ / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / bugfixes: private photo embeds and search for strings with %friendica2012-05-294-148/+154
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | ability to only expire contacts, not selffriendica2012-05-294-5/+10
* | | | | | | | | | | | | | | | | | Provide backend option to only expire other peoples' conversations.friendica2012-05-281-1/+8
* | | | | | | | | | | | | | | | | | more theme cleanupfriendica2012-05-284-2/+24
* | | | | | | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2811-294/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #315 from simonlnu/masterSimon2012-05-2811-294/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | fixed font-size/line-height stuffsSimon L'nu2012-05-2811-294/+172
| | * | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2811-76/+168
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-263-88/+89
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2612-499/+543
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
* | | | | | | | | | | | | | | | | | | | | rev updatefriendica2012-05-283-202/+202
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | slackr - tone down the shadows a smidginfriendica2012-05-271-4/+9
* | | | | | | | | | | | | | | | | | | | add plugin hooks to gender, sexpref, and marital selectorsfriendica2012-05-271-0/+7
* | | | | | | | | | | | | | | | | | | | birthday in november,december bugfriendica2012-05-271-2/+2
* | | | | | | | | | | | | | | | | | | | rework the way private photos are embedded to avoid url differences and also ...friendica2012-05-276-69/+142
* | | | | | | | | | | | | | | | | | | | handle multiple underscores in D* linksfriendica2012-05-262-1/+8
| |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | more ssl policy stufffriendica2012-05-261-15/+12
* | | | | | | | | | | | | | | | | | | allow force ssl on notificationsfriendica2012-05-263-73/+77
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |