aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | tinymce: add inlinepopups pluginFabio Comuni2012-04-182-2/+2
| | * | | tinymce: add filebrowser for photos and attached filesFabio Comuni2012-04-184-0/+192
| | | |/ | | |/|
| * | | Merge pull request #249 from mschmitt/masterfabrixxm2012-04-182-25/+25
| |\ \ \
| | * | | Hadn't merged fixed typo from upstream.Martin Schmitt2012-04-192-2/+2
| | * | | EO translation fixesMartin Schmitt2012-04-192-27/+27
| |/ / /
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-180-0/+0
| | |/ | |/|
| * | Merge pull request #247 from simonlnu/masterSimon2012-04-1814-14/+14
| |\ \
| | * | only affect immediate li childrenSimon L'nu2012-04-182-2/+2
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-180-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #246 from simonlnu/masterSimon2012-04-184-76/+105
| |\ \ \ | | |_|/ | |/| |
| | | * fix silly abandonded typo. shouldn't affect translationsSimon L'nu2012-04-1812-12/+12
| | |/
| | * fix alignment issues with toolbarSimon L'nu2012-04-184-76/+105
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-1832-88/+8975
| | |\ | | |/ | |/|
| * | diabook-themes: some css/bug-fixestommy tomson2012-04-1829-86/+441
| * | Merge pull request #244 from mschmitt/masterfriendica2012-04-172-0/+8532
| |\ \
| | * | messages.po/strings.php at 100% EsperantoMartin Schmitt2012-04-172-0/+8532
| * | | Merge pull request #243 from CatoTH/masterfriendica2012-04-171-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | TypoTobias Hößl2012-04-171-2/+2
| |/ /
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-170-0/+0
| |/
| * diabook-themes: theme-settings: "wide"-option and new screenshotstommy tomson2012-04-1728-32/+25069
| * Merge pull request #242 from simonlnu/masterSimon2012-04-172-10/+0
| |\
| | * [SECURITY] finish ripping out fpostitSimon L'nu2012-04-172-10/+0
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-170-0/+0
| |/
| * Merge pull request #241 from simonlnu/masterSimon2012-04-1712-328/+0
| |\
| | * rip out fpostitSimon L'nu2012-04-1712-328/+0
| * | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-1749-2358/+1783
| |\ \
| | * | diabook-themes: removed fpostit due to security issues and small fix in germa...tommy tomson2012-04-1733-754/+39
| | * | Merge pull request #240 from CatoTH/masterfriendica2012-04-179-43/+44
| | |\ \
| | | * | Some Bugfixes, and variable checksTobias Hößl2012-04-179-43/+44
| | * | | naked br appearing when attaching and textplainfriendica2012-04-171-1/+6
| | |/ /
| | * | Merge https://github.com/friendica/friendica into pullfriendica2012-04-1649-1561/+2162
| | |\ \
| | | * | Merge pull request #239 from simonlnu/masterSimon2012-04-163-1463/+1572
| | | |\|
| | | | * finally fix the ui in the settings. it was fugly.... other bug fixes tooSimon L'nu2012-04-173-1463/+1572
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-160-0/+0
| | | |/
| | * | rev updatefriendica2012-04-163-97/+122
| * | | update to the German string filesTobias Diekershoff2012-04-172-942/+1280
| | |/ | |/|
| * | diabook-themes: bugfix (sry, necessary)tommy tomson2012-04-1612-12/+52
| * | diabook-themes: small bug/css-fixes ---> ver. 1.019tommy tomson2012-04-1626-21/+419
| * | diabook-themes: bug-fixestommy tomson2012-04-1612-48/+68
| * | diabook-themes: minor bugfixestommy tomson2012-04-1612-25/+59
| |/
* | Merge remote branch 'upstream/master'zottel2012-04-1631-180/+524
|\|
| * turn on comment editfriendica2012-04-161-4/+4
| * propagate edited commentsfriendica2012-04-161-2/+6
| * edited comments weren't being relayedfriendica2012-04-161-0/+24
| * rev updatefriendica2012-04-152-73/+78
| * Merge pull request #238 from annando/masterfriendica2012-04-157-67/+259
| |\
| | * DBA: Reverting back to original sourceMichael Vogel2012-04-141-3/+1
| | * DBA: Nothing really done ..Michael Vogel2012-04-141-71/+0
| | * Merge commit 'upstream/master'Michael Vogel2012-04-1498-911/+2464
| | |\
| | * \ Merge commit 'upstream/master'Michael Vogel2012-04-1388-12005/+2087
| | |\ \