Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'navbacker' | friendica | 2014-05-14 | 7 | -13/+51 |
|\ | |||||
| * | fix fluid layout for choklet_bannertwo | friendica | 2014-05-14 | 7 | -18/+43 |
| * | this doesn't really work | friendica | 2014-05-14 | 3 | -3/+16 |
* | | whitespace | marijus | 2014-05-14 | 1 | -6/+6 |
* | | colorpicker: enable rgba for for item and comment colors | marijus | 2014-05-14 | 1 | -1/+2 |
|/ | |||||
* | xss prevention | friendica | 2014-05-14 | 1 | -0/+2 |
* | more choklet work | friendica | 2014-05-13 | 1 | -0/+48 |
* | choklet tweaks | friendica | 2014-05-13 | 2 | -2/+3 |
* | allow jgrowl 'close all' message to be translated | friendica | 2014-05-13 | 2 | -0/+2 |
* | fix ca anomaly | friendica | 2014-05-13 | 1 | -1/+1 |
* | missing paren | friendica | 2014-05-13 | 11 | -11/+11 |
* | forbid redefinition of language plural_select function | friendica | 2014-05-13 | 11 | -12/+23 |
* | make comment_indent an option and removeitem_opacity as it is not working pro... | marijus | 2014-05-12 | 3 | -7/+6 |
* | fix bootstrap override position issue with dropdown menu | marijus | 2014-05-12 | 1 | -17/+0 |
* | Merge pull request #458 from pixelroot/master | RedMatrix | 2014-05-12 | 2 | -5308/+5945 |
|\ | |||||
| * | modified: view/ru/messages.po | pixelroot | 2014-05-12 | 2 | -5308/+5945 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-11 | 5 | -9/+63 |
|\ \ | |||||
| * \ | Merge pull request #456 from cvogeley/master | RedMatrix | 2014-05-12 | 3 | -8/+59 |
| |\ \ | |||||
| | * | | grrr | Christian Vogeley | 2014-05-11 | 1 | -1/+1 |
| | * | | For the moment last change | Christian Vogeley | 2014-05-11 | 1 | -5/+7 |
| | * | | saved 2 | Christian Vogeley | 2014-05-11 | 1 | -1/+1 |
| | * | | saved | Christian Vogeley | 2014-05-11 | 1 | -0/+9 |
| | * | | some corrections and cleanup | Christian Vogeley | 2014-05-11 | 2 | -5/+8 |
| | * | | Move "boxy" conversation design into a schema file | Christian Vogeley | 2014-05-11 | 3 | -8/+41 |
| | * | | another experiment | Christian Vogeley | 2014-05-10 | 1 | -5/+9 |
| * | | | Removed some unnecessary changes. | root | 2014-05-10 | 2 | -2/+2 |
| * | | | Made code changes to serve higher resolution images in displays with high pix... | root | 2014-05-10 | 1 | -0/+3 |
| * | | | Merge branch 'master' of https://github.com/chriswinstead/red | root | 2014-05-10 | 9 | -5701/+5756 |
| |\| | | |||||
| * | | | Made some changes to img tags to enforce max-width everywhere, and to the pag... | root | 2014-05-07 | 2 | -2/+2 |
* | | | | button styling mitemlist | friendica | 2014-05-11 | 2 | -1/+5 |
* | | | | issue #452 | friendica | 2014-05-09 | 1 | -1/+2 |
| |/ / |/| | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-09 | 2 | -11/+11 |
|\ \ \ | |||||
| * | | | IT: strings updated | Paolo Tacconi | 2014-05-09 | 2 | -11/+11 |
* | | | | better button theming on oauth connected apps page | friendica | 2014-05-09 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-05-09 | 7 | -5675/+5730 |
|\ \ \ | |||||
| * | | | move the event "unknown finish time" checkbox up so it actually precedes ente... | friendica | 2014-05-08 | 1 | -3/+7 |
| * | | | event form hard-wired tinymce=on, made selectable | friendica | 2014-05-08 | 3 | -2/+7 |
| * | | | Merge pull request #449 from cvogeley/master | cvogeley | 2014-05-08 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | another one | Christian Vogeley | 2014-05-08 | 1 | -1/+1 |
| * | | | | Merge pull request #448 from cvogeley/master | cvogeley | 2014-05-08 | 1 | -1/+3 |
| |\| | | | |||||
| | * | | | Small adjustment | Christian Vogeley | 2014-05-08 | 1 | -1/+3 |
| * | | | | Merge pull request #447 from cvogeley/master | RedMatrix | 2014-05-09 | 2 | -4/+9 |
| |\| | | | |||||
| | * | | | Trying to make the conversation better readable | Christian Vogeley | 2014-05-08 | 2 | -4/+9 |
| | |/ / | |||||
| * | | | Merge pull request #446 from tuscanhobbit/master | Paolo T | 2014-05-08 | 2 | -5666/+5705 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | IT: strings updated | Paolo Tacconi | 2014-05-08 | 2 | -5666/+5705 |
* | | | | add some more bs fu | marijus | 2014-05-08 | 1 | -1/+1 |
* | | | | like indicator rewrite | marijus | 2014-05-08 | 2 | -22/+22 |
|/ / / | |||||
* | | | put permissions dialog inside the form element - should fix issue #444 | friendica | 2014-05-05 | 1 | -2/+2 |
* | | | fix some issues with nav-tabs overrides and make their background transparent | marijus | 2014-05-05 | 2 | -11/+20 |
* | | | Height auto or mini-height 120px. The latter. | jeroenpraat | 2014-05-05 | 1 | -2/+2 |