Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'CatoTH/master' into req245 | Fabio Comuni | 2012-04-20 | 9 | -15/+22 |
|\ | |||||
| * | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 2 | -2/+2 |
| | | |||||
| * | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 7 | -13/+20 |
| | | |||||
* | | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ↵ | tommy tomson | 2012-04-20 | 471 | -28/+75613 |
| | | | | | | | | and some bug/css-fixes | ||||
* | | fix .item-select | Simon L'nu | 2012-04-19 | 2 | -4/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | tweak drop-down and add in filebrowser | Simon L'nu | 2012-04-19 | 4 | -4/+5 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge pull request #248 from fabrixxm/tmcefilebrowser | fabrixxm | 2012-04-19 | 2 | -1/+86 |
|\ \ | | | | | | | TinyMCE file browser | ||||
| * | | filebrowser: fix style, show 10 recent photos if not in an album | Fabio Comuni | 2012-04-18 | 1 | -0/+2 |
| | | | |||||
| * | | filebrowser: more style, load min and max scale photos | Fabio Comuni | 2012-04-18 | 1 | -17/+34 |
| | | | |||||
| * | | tinymce: add inlinepopups plugin | Fabio Comuni | 2012-04-18 | 1 | -1/+1 |
| | | | |||||
| * | | tinymce: add filebrowser for photos and attached files | Fabio Comuni | 2012-04-18 | 2 | -0/+66 |
| |/ | |||||
* | | Hadn't merged fixed typo from upstream. | Martin Schmitt | 2012-04-19 | 2 | -2/+2 |
| | | |||||
* | | EO translation fixes | Martin Schmitt | 2012-04-19 | 2 | -27/+27 |
| | | |||||
* | | only affect immediate li children | Simon L'nu | 2012-04-18 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | fix silly abandonded typo. shouldn't affect translations | Simon L'nu | 2012-04-18 | 12 | -12/+12 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | fix alignment issues with toolbar | Simon L'nu | 2012-04-18 | 4 | -76/+105 |
|/ | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | diabook-themes: some css/bug-fixes | tommy tomson | 2012-04-18 | 29 | -86/+441 |
| | |||||
* | messages.po/strings.php at 100% Esperanto | Martin Schmitt | 2012-04-17 | 2 | -0/+8532 |
| | |||||
* | diabook-themes: theme-settings: "wide"-option and new screenshots | tommy tomson | 2012-04-17 | 28 | -32/+25069 |
| | |||||
* | [SECURITY] finish ripping out fpostit | Simon L'nu | 2012-04-17 | 2 | -10/+0 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge pull request #241 from simonlnu/master | Simon | 2012-04-17 | 12 | -328/+0 |
|\ | | | | | rip out fpostit | ||||
| * | rip out fpostit | Simon L'nu | 2012-04-17 | 12 | -328/+0 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-04-17 | 36 | -2217/+1611 |
|\ \ | |||||
| * | | diabook-themes: removed fpostit due to security issues and small fix in ↵ | tommy tomson | 2012-04-17 | 33 | -754/+39 |
| |/ | | | | | | | german translation | ||||
| * | finally fix the ui in the settings. it was fugly.... other bug fixes too | Simon L'nu | 2012-04-17 | 3 | -1463/+1572 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | update to the German string files | Tobias Diekershoff | 2012-04-17 | 2 | -942/+1280 |
|/ | |||||
* | diabook-themes: bugfix (sry, necessary) | tommy tomson | 2012-04-16 | 12 | -12/+52 |
| | |||||
* | diabook-themes: small bug/css-fixes ---> ver. 1.019 | tommy tomson | 2012-04-16 | 26 | -21/+419 |
| | |||||
* | diabook-themes: bug-fixes | tommy tomson | 2012-04-16 | 12 | -48/+68 |
| | |||||
* | diabook-themes: minor bugfixes | tommy tomson | 2012-04-16 | 12 | -25/+59 |
| | |||||
* | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 2 | -54/+52 |
|\ | | | | | API: Support of the statusnet application | ||||
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 85 | -319/+1591 |
| |\ | |||||
| * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 78 | -10831/+657 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php | ||||
| * \ \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 96 | -457/+1097 |
| |\ \ \ | |||||
| * | | | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | API: Tweetdeck is now working | Michael Vogel | 2012-04-09 | 2 | -54/+51 |
| | | | | | |||||
* | | | | | diabook-themes: css-fixes | tommy tomson | 2012-04-15 | 17 | -24/+88 |
| | | | | | |||||
* | | | | | where did this "lang" string come from and why? | friendica | 2012-04-15 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | REALLY fix fpostit this time | Simon L'nu | 2012-04-15 | 15 | -82/+159 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | | fix fpostJS, add and fix some other stuff | Simon L'nu | 2012-04-15 | 6 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | | diabook-themes: added js for auto-growing comment-textareas | tommy tomson | 2012-04-15 | 12 | -4/+238 |
| | | | | | |||||
* | | | | | diabook: theme-settings: add a wide-option | tommy tomson | 2012-04-15 | 43 | -11/+8147 |
| | | | | | |||||
* | | | | | Merge pull request #234 from copyninja/master | friendica | 2012-04-14 | 150 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Executable permisson removal on files which are not elf/script | ||||
| * | | | | | Another bunch of executable permission removal | Vasudev Kamath | 2012-04-14 | 119 | -0/+0 |
| | | | | | | |||||
| * | | | | | Removed execution permission: lintian warning in Debian packaging | Vasudev Kamath | 2012-04-14 | 31 | -0/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | string fix: typo. slow down scroll to top in dispys | Simon L'nu | 2012-04-14 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | | bogus empty list element in dfrn_request page when emailnet not enabled | friendica | 2012-04-14 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | lighten wrapper shadow a bit on dispy | Simon L'nu | 2012-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | neat little changes. hopefully the shadow will be well recieved | Simon L'nu | 2012-04-13 | 14 | -22/+128 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | well that was a silly mistake... | friendica | 2012-04-13 | 1 | -1/+1 |
| | | | |