aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #254 from simonlnu/masterSimon2012-04-2021-21/+1803
|\ | | | | add some knobs to comment boxes
| * fix the buttons. don't hide the buttons once shownSimon L'nu2012-04-204-14/+2
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * optimise imgs; add some comment editing knobsSimon L'nu2012-04-2021-21/+1815
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge pull request #253 from fabrixxm/masterfabrixxm2012-04-208-50/+50
|\ \ | |/ |/| fix bug n385
| * 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
| | | | | | | | and some bug/css-fixes
* | fix .item-selectSimon L'nu2012-04-192-4/+2
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | tweak drop-down and add in filebrowserSimon L'nu2012-04-194-4/+5
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | Merge pull request #248 from fabrixxm/tmcefilebrowserfabrixxm2012-04-192-1/+86
|\ \ | | | | | | TinyMCE file browser
| * | 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
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | fix silly abandonded typo. shouldn't affect translationsSimon L'nu2012-04-1812-12/+12
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | fix alignment issues with toolbarSimon L'nu2012-04-184-76/+105
|/ | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* 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
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* Merge pull request #241 from simonlnu/masterSimon2012-04-1712-328/+0
|\ | | | | rip out fpostit
| * rip out fpostitSimon L'nu2012-04-1712-328/+0
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | 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 ↵tommy tomson2012-04-1733-754/+39
| |/ | | | | | | german translation
| * finally fix the ui in the settings. it was fugly.... other bug fixes tooSimon L'nu2012-04-173-1463/+1572
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | 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
|\ | | | | API: Support of the statusnet application
| * Merge commit 'upstream/master'Michael Vogel2012-04-1485-319/+1591
| |\
| * \ Merge commit 'upstream/master'Michael Vogel2012-04-1378-10831/+657
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php
| * \ \ 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
| | | | |
* | | | | REALLY fix fpostit this timeSimon L'nu2012-04-1515-82/+159
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | | | fix fpostJS, add and fix some other stuffSimon L'nu2012-04-156-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | | | diabook-themes: added js for auto-growing comment-textareastommy tomson2012-04-1512-4/+238
| | | | |
* | | | | diabook: theme-settings: add a wide-optiontommy tomson2012-04-1543-11/+8147
| | | | |
* | | | | Merge pull request #234 from copyninja/masterfriendica2012-04-14150-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Executable permisson removal on files which are not elf/script
| * | | | | Another bunch of executable permission removalVasudev Kamath2012-04-14119-0/+0
| | | | | |
| * | | | | Removed execution permission: lintian warning in Debian packagingVasudev Kamath2012-04-1431-0/+0
| | |_|_|/ | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 12:23:00 +0000