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 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-14 | 1 | -5/+6 |
|\ \ | |||||
| * | | whitespace | marijus | 2014-05-14 | 1 | -6/+6 |
| * | | colorpicker: enable rgba for for item and comment colors | marijus | 2014-05-14 | 1 | -1/+2 |
| |/ | |||||
* / | explain default permissions choices better | friendica | 2014-05-14 | 1 | -2/+13 |
|/ | |||||
* | fix author delete (non-owner) | friendica | 2014-05-14 | 1 | -3/+3 |
* | xss prevention | friendica | 2014-05-14 | 3 | -1/+8 |
* | more choklet work | friendica | 2014-05-13 | 1 | -0/+48 |
* | choklet tweaks | friendica | 2014-05-13 | 2 | -2/+3 |
* | add photo widget | friendica | 2014-05-13 | 2 | -10/+57 |
* | add activity_received hook | friendica | 2014-05-13 | 1 | -0/+3 |
* | zrlify (turn into zmg) any relevant img tags in a post. | friendica | 2014-05-13 | 2 | -0/+30 |
* | allow jgrowl 'close all' message to be translated | friendica | 2014-05-13 | 3 | -0/+3 |
* | fix ca anomaly | friendica | 2014-05-13 | 1 | -1/+1 |
* | missing paren | friendica | 2014-05-13 | 12 | -12/+12 |
* | forbid redefinition of language plural_select function | friendica | 2014-05-13 | 13 | -14/+26 |
* | update the tagging doco | friendica | 2014-05-12 | 1 | -5/+50 |
* | try to fix random logouts | friendica | 2014-05-12 | 3 | -3/+7 |
* | Docu update: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=00eeea0d6df910a... | jeroenpraat | 2014-05-12 | 1 | -1/+1 |
* | 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 |
* | Typo | marijus | 2014-05-12 | 1 | -2/+2 |
* | 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 |
* | | log IP mis-matches even if paranoia isn't set. | friendica | 2014-05-11 | 1 | -7/+8 |
* | | a bit more progress on using shred to pick through API results. Commented out... | friendica | 2014-05-11 | 2 | -6/+20 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-11 | 7 | -17/+103 |
|\ \ | |||||
| * \ | 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 |
| * | | | Merge pull request #455 from encyclomundi/master | RedMatrix | 2014-05-11 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | correct minor typo | Charles | 2014-05-10 | 1 | -1/+1 |
| * | | | | Merge pull request #454 from chriswinstead/master | RedMatrix | 2014-05-11 | 4 | -8/+43 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Removed some unnecessary changes. | root | 2014-05-10 | 2 | -2/+2 |
| | * | | | Changed some comments. | root | 2014-05-10 | 1 | -2/+1 |
| | * | | | Made code changes to serve higher resolution images in displays with high pix... | root | 2014-05-10 | 2 | -1/+37 |
| | * | | | Merge branch 'master' of https://github.com/chriswinstead/red | root | 2014-05-10 | 26 | -6154/+6313 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Made some changes to img tags to enforce max-width everywhere, and to the pag... | root | 2014-05-07 | 3 | -8/+8 |
* | | | | | button styling mitemlist | friendica | 2014-05-11 | 3 | -2/+6 |
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-10 | 1 | -0/+24 |
|\| | | | | |||||
| * | | | | Merge pull request #453 from unary/bbcode | RedMatrix | 2014-05-10 | 1 | -0/+24 |
| |\ \ \ \ | |||||
| | * | | | | add support for h1, h2, etc. to bbcode | Michael Johnston | 2014-05-10 | 1 | -0/+24 |
| |/ / / / | |||||
* / / / / | issue #452 | friendica | 2014-05-09 | 1 | -1/+2 |
|/ / / / |