Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |
| | |||||
* | Merge pull request #264 from mschmitt/master | friendica | 2012-04-25 | 2 | -78/+112 |
|\ | | | | | Esperanto at 100% again | ||||
| * | Esperanto at 100% again | Martin Schmitt | 2012-04-25 | 2 | -78/+112 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-25 | 12 | -12/+96 |
|\| | |||||
| * | Merge pull request #263 from tomtom84/master | tomtom84 | 2012-04-24 | 12 | -12/+96 |
| |\ | | | | | | | diabook-themes: fix css to login.tpl | ||||
| | * | diabook-themes: fix css to login.tpl | tommy tomson | 2012-04-25 | 12 | -12/+96 |
| | | | |||||
* | | | cleanup - make bb-buttons vanish when comment closed | friendica | 2012-04-25 | 14 | -374/+16 |
|/ / | |||||
* / | restore qcomment selector | friendica | 2012-04-24 | 7 | -21/+35 |
|/ | |||||
* | zero-themes: add bbcode-toolbar to commentbox | tommy tomson | 2012-04-25 | 22 | -0/+732 |
| | |||||
* | diabook-themes: small fix | tommy tomson | 2012-04-25 | 3 | -8/+31 |
| | |||||
* | Merge pull request #261 from fabrixxm/eventspage | friendica | 2012-04-24 | 5 | -56/+131 |
|\ | | | | | Some tweak on events page and events/bitrhdays reminder | ||||
| * | quattro: small week calendar view for event/birthday reminders | Fabio Comuni | 2012-04-24 | 2 | -0/+40 |
| | | |||||
| * | remove html from get_birthdays() and get_events() | Fabio Comuni | 2012-04-24 | 2 | -0/+20 |
| | | |||||
| * | events page: set calendar start date from url (events/[year]/[month]/) and ↵ | Fabio Comuni | 2012-04-24 | 1 | -56/+71 |
| | | | | | | | | show event popup from url anchor (#link-[event id]) | ||||
* | | Diabook-dark css fix | Thomas Willingham | 2012-04-24 | 1 | -3/+3 |
| | | |||||
* | | Diabook-dark, couple of new icons, and another css fix. | Thomas Willingham | 2012-04-24 | 4 | -1/+1 |
|/ | |||||
* | Esperanto at 100% again | Martin Schmitt | 2012-04-24 | 9 | -459/+733 |
| | |||||
* | Improvements to diabook-dark | Thomas Willingham | 2012-04-24 | 21 | -4/+4 |
| | | | | Still a long way to go, but some icons and a few CSS fixes | ||||
* | DE strings, correction of a typo | Tobias Diekershoff | 2012-04-23 | 2 | -198/+98 |
| | |||||
* | diabok-themes: fixed bug in green-wide and dark-wide | tommy tomson | 2012-04-23 | 5 | -12/+12 |
| | |||||
* | diabook-themes: small fix in nets_aside, group_aside and delete obsolete ↵ | tommy tomson | 2012-04-23 | 211 | -13669/+5 |
| | | | | .tpls in subfolders | ||||
* | diabook-themes: bugfix in admin-section | tommy tomson | 2012-04-23 | 1 | -1/+1 |
| | |||||
* | diabook-themes: bugfix | tommy tomson | 2012-04-22 | 15 | -27/+31 |
| | |||||
* | diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer | tommy tomson | 2012-04-22 | 45 | -101/+108 |
| | |||||
* | DE strings update | Tobias Diekershoff | 2012-04-22 | 8 | -542/+789 |
| | |||||
* | diabook-themes: comment-bbcode-bugfix | tommy tomson | 2012-04-22 | 2 | -9/+9 |
| | |||||
* | fix tinymce theming | Simon L'nu | 2012-04-22 | 2 | -22/+30 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | diabook-themes: deleted obsolete diabook-folder & minor bug-fixes | tommy tomson | 2012-04-22 | 382 | -55989/+76 |
| | |||||
* | fix checkbox/radio buttons for some browsers | Simon L'nu | 2012-04-20 | 2 | -0/+4 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | diabook-themes: add diabook-dark | tommy tomson | 2012-04-21 | 117 | -1/+18810 |
| | |||||
* | diabook-themes: add diabook-green and some minor css/bug-fixes | tommy tomson | 2012-04-20 | 121 | -30/+19091 |
| | |||||
* | Merge pull request #254 from simonlnu/master | Simon | 2012-04-20 | 21 | -21/+1803 |
|\ | | | | | add some knobs to comment boxes | ||||
| * | fix the buttons. don't hide the buttons once shown | Simon L'nu | 2012-04-20 | 4 | -14/+2 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | optimise imgs; add some comment editing knobs | Simon L'nu | 2012-04-20 | 21 | -21/+1815 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge pull request #253 from fabrixxm/master | fabrixxm | 2012-04-20 | 8 | -50/+50 |
|\ \ | |/ |/| | fix bug n385 | ||||
| * | escape email template var names. fix bug n385. | Fabio Comuni | 2012-04-20 | 8 | -50/+50 |
| | | |||||
* | | 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> |