aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Some new German translationszottel2012-04-092-64/+64
* Merge remote branch 'upstream/master'zottel2012-04-0926-333/+498
|\
| * Merge branch 'pull'friendica2012-04-0821-45/+179
| |\
| | * Merge pull request #215 from tomtom84/mastertomtom842012-04-0821-45/+179
| | |\
| | | * fixed z-index of youtube-vidstommy tomson2012-04-0921-45/+179
| | |/
| * / fix to wall_upload photos default permissions to use cid rather than uid.friendica2012-04-085-288/+319
| |/
* | Merge remote branch 'upstream/master'zottel2012-04-0822-25/+302
|\|
| * prepare for using a master theme_init()friendica2012-04-081-0/+7
| * provide theme_init() functionsfriendica2012-04-089-0/+20
| * rev updatesfriendica2012-04-082-3/+3
| * Merge pull request #214 from annando/masterfriendica2012-04-0812-22/+272
| |\
| | * Merge commit 'upstream/master'Michael Vogel2012-04-0815-30/+43
| | |\ | | |/ | |/|
| | * 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
| | |\
| | * | "vier": Bookmarks now look better.Michael Vogel2012-04-072-0/+10
| | * | Merge commit 'upstream/master'Michael Vogel2012-04-06102-4851/+1753
| | |\ \
| | * | | API: template for test function addedMichael Vogel2012-04-021-0/+1
| | * | | Merge commit 'upstream/master'Michael Vogel2012-04-0286-488/+1850
| | |\ \ \
| | * | | | The "vier"-theme is now working again. But there is still work neededMichael Vogel2012-04-025-10/+66
| | * | | | New script that checks if a script is runningMichael Vogel2012-04-011-0/+32
| | * | | | poller: An optional lockfile is used to check if the poller is already runningMichael Vogel2012-04-012-1/+14
| | * | | | Merge commit 'upstream/master'Michael Vogel2012-04-01277-1573/+32158
| | |\ \ \ \
| | * | | | | Several improvementsMichael Vogel2012-03-312-2/+6
* | | | | | | Merge remote branch 'upstream/master'zottel2012-04-081418-2297/+4820
|\| | | | | |
| * | | | | | 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 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
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-07180-231/+365
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
| | |/ / / / / / | |/| | | | | |