aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-04-22380-38276/+1184
|\
| * fix tinymce themingSimon L'nu2012-04-222-22/+30
| * diabook-themes: deleted obsolete diabook-folder & minor bug-fixestommy tomson2012-04-22382-55989/+76
| * fix checkbox/radio buttons for some browsersSimon L'nu2012-04-202-0/+4
| * diabook-themes: add diabook-darktommy tomson2012-04-21117-1/+18810
* | Few more files with unnecessary executable permissionsVasudev Kamath2012-04-2174-0/+0
|/
* diabook-themes: add diabook-green and some minor css/bug-fixestommy tomson2012-04-20121-30/+19091
* Merge pull request #254 from simonlnu/masterSimon2012-04-2021-21/+1803
|\
| * fix the buttons. don't hide the buttons once shownSimon L'nu2012-04-204-14/+2
| * optimise imgs; add some comment editing knobsSimon L'nu2012-04-2021-21/+1815
* | Merge pull request #253 from fabrixxm/masterfabrixxm2012-04-208-50/+50
|\ \ | |/ |/|
| * escape email template var names. fix bug n385.Fabio Comuni2012-04-208-50/+50
* | Merge remote-tracking branch 'CatoTH/master' into req245Fabio Comuni2012-04-209-15/+22
|\ \ | |/ |/|
| * XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-182-2/+2
| * XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-187-13/+20
* | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ...tommy tomson2012-04-20471-28/+75613
* | fix .item-selectSimon L'nu2012-04-192-4/+2
* | tweak drop-down and add in filebrowserSimon L'nu2012-04-194-4/+5
* | Merge pull request #248 from fabrixxm/tmcefilebrowserfabrixxm2012-04-192-1/+86
|\ \
| * | filebrowser: fix style, show 10 recent photos if not in an albumFabio Comuni2012-04-181-0/+2
| * | filebrowser: more style, load min and max scale photosFabio Comuni2012-04-181-17/+34
| * | tinymce: add inlinepopups pluginFabio Comuni2012-04-181-1/+1
| * | tinymce: add filebrowser for photos and attached filesFabio Comuni2012-04-182-0/+66
| |/
* | Hadn't merged fixed typo from upstream.Martin Schmitt2012-04-192-2/+2
* | EO translation fixesMartin Schmitt2012-04-192-27/+27
* | only affect immediate li childrenSimon L'nu2012-04-182-2/+2
* | 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
|/
* diabook-themes: some css/bug-fixestommy tomson2012-04-1829-86/+441
* messages.po/strings.php at 100% EsperantoMartin Schmitt2012-04-172-0/+8532
* diabook-themes: theme-settings: "wide"-option and new screenshotstommy tomson2012-04-1728-32/+25069
* [SECURITY] finish ripping out fpostitSimon L'nu2012-04-172-10/+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-1736-2217/+1611
|\ \
| * | diabook-themes: removed fpostit due to security issues and small fix in germa...tommy tomson2012-04-1733-754/+39
| |/
| * finally fix the ui in the settings. it was fugly.... other bug fixes tooSimon L'nu2012-04-173-1463/+1572
* | 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 pull request #238 from annando/masterfriendica2012-04-152-54/+52
|\
| * Merge commit 'upstream/master'Michael Vogel2012-04-1485-319/+1591
| |\
| * \ Merge commit 'upstream/master'Michael Vogel2012-04-1378-10831/+657
| |\ \
| * \ \ Merge commit 'upstream/master'Michael Vogel2012-04-1196-457/+1097
| |\ \ \
| * | | | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-111-0/+1
| * | | | API: Tweetdeck is now workingMichael Vogel2012-04-092-54/+51
* | | | | diabook-themes: css-fixestommy tomson2012-04-1517-24/+88
* | | | | where did this "lang" string come from and why?friendica2012-04-151-0/+10