aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:annando/friendicaMichael2012-04-112186-18156/+97640
|\
| * html2plain: changed behaviour for the "hr" element.Michael Vogel2012-04-091-1/+1
| * API: Tweetdeck is now workingMichael Vogel2012-04-092-54/+51
| * API: Added Public TimelineMichael Vogel2012-04-081-5/+85
| * API: Now mentions could work as well - only my client doesn't really workMichael Vogel2012-04-081-61/+72
| * API: Basic support of the identica client added.Michael Vogel2012-04-081-0/+72
| * Merge commit 'upstream/master'Michael Vogel2012-04-0815-30/+43
| |\
| | * Merge pull request #213 from simonlnu/masterSimon2012-04-077-30/+35
| | |\
| | | * minor dispy* fixesSimon L'nu2012-04-077-30/+35
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0744-153/+1476
| | | |\ | | | |/ | | |/|
| | * | diabook-themes: small fixtommy tomson2012-04-078-0/+8
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-07180-231/+365
| | | |\
| | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-061505-1390/+2052
| | | |\ \
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-060-0/+0
| * | | | | API: API is now enhanced. mentions, repeat and destroy now works.Michael Vogel2012-04-081-9/+142
| * | | | | "vier": Some design stuffMichael Vogel2012-04-071-0/+1
| * | | | | Merge commit 'upstream/master'Michael Vogel2012-04-071393-1443/+3554
| |\| | | |
| | * | | | Merge pull request #212 from tomtom84/mastertomtom842012-04-0737-79/+1373
| | |\ \ \ \
| | | * | | | changelog 1.014 :tommy tomson2012-04-0737-79/+1373
| | |/ / / /
| | * | | | ignore utf8 offset error for unit testsfriendica2012-04-071-1/+3
| | * | | | had arg order backwardsfriendica2012-04-071-1/+1
| | * | | | try assertContainsfriendica2012-04-071-1/+1
| | * | | | tag tests cont.friendica2012-04-072-5/+15
| | * | | | fix autonamenegativelength testfriendica2012-04-071-1/+1
| | * | | | some work on testsfriendica2012-04-077-68/+77
| | | |_|/ | | |/| |
| | * | | ignore removed pluginsfriendica2012-04-061-2/+9
| | * | | Merge branch 'pull'friendica2012-04-06176-73/+154
| | |\ \ \
| | | * \ \ Merge pull request #211 from tomtom84/mastertomtom842012-04-060-0/+0
| | | |\ \ \
| | | | * \ \ Merge remote-tracking branch 'origin/master'tommy tomson2012-04-060-0/+0
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge pull request #210 from tomtom84/mastertomtom842012-04-06174-54/+135
| | | |\ \ \ \
| | | | | * \ \ Merge remote-tracking branch 'origin/master'tommy tomson2012-04-064-24/+29
| | | | | |\ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-063-156/+157
| | | |\ \ \ \ \
| | | * | | | | | small fixes for the German stringsTobias Diekershoff2012-04-062-19/+19
| | | | |_|_|_|/ | | | |/| | | |
| | | | | | * | Merge remote-tracking branch 'origin/master'tommy tomson2012-04-061-151/+147
| | | | | |/| |
| | | | | * | | new-contacts-introductions in contacts-drop-down and new-messages in messages...tommy tomson2012-04-06174-54/+135
| | | | |/ / / | | | |/| | |
| | * | | | | fix messed up config tables w/ duplicate entriesfriendica2012-04-063-6/+51
| | | |/ / / | | |/| | |
| | * | | | fix bad sql updatefriendica2012-04-062-5/+10
| | | |/ / | | |/| |
| | * | | Merge branch 'pull'friendica2012-04-062-1216/+1850
| | |\| |
| | | * | update to the German stringsTobias Diekershoff2012-04-062-1216/+1850
| | * | | revert config changes, we're getting duplicate keysfriendica2012-04-061-151/+147
| | |/ /
| | * | Merge branch 'pull'friendica2012-04-051503-158/+179
| | |\ \
| | | * | Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-051809-6998/+48636
| | | |\|
| | | * | added index to config and pconfig tableAlexander Kampmann2012-04-054-160/+178
| | * | | add network_tabs hookfriendica2012-04-051-2/+6
| | * | | pass autoname(0) testfriendica2012-04-051-0/+3
| | * | | rev updatefriendica2012-04-052-14/+14
| | | |/ | | |/|
| * | | "vier": Bookmarks now look better.Michael Vogel2012-04-072-0/+10
| * | | Merge commit 'upstream/master'Michael Vogel2012-04-06102-4851/+1753
| |\| |
| | * | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2phpfriendica2012-04-052-1/+3
| | * | Merge pull request #207 from simonlnu/masterSimon2012-04-042-4/+24
| | |\ \