Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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: ↵ | jeroenpraat | 2014-05-12 | 1 | -1/+1 |
| | | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=00eeea0d6df910aa92a02bcd292cf0b9e5f918281e34a771eddc485085e4ba0a@redmatrix.nl&zid=jeroenpraat%40redmatrix.nl | ||||
* | make comment_indent an option and removeitem_opacity as it is not working ↵ | marijus | 2014-05-12 | 3 | -7/+6 |
| | | | | properly at the current state - we have got item background opacity now (allthough not yet for custom colors because the colorpicker does not work with rgba colors). Reset left comment border width to 3px as it is barely visible otherwise. | ||||
* | 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 | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-05-12 | 2 | -5308/+5945 |
| | | | | | | | | modified: view/ru/strings.php | ||||
* | | 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 ↵ | friendica | 2014-05-11 | 2 | -6/+20 |
| | | | | | | | | out because the array storage is kindof weird so the first try (assuming simple arrays) didn't work out. I'll have to rethink how to index these things and may have to rewrite the js() function to do the kinds of things I want. | ||||
* | | 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 |
| |\ \ | | | | | | | | | Move "boxy" conversation design into a schema file | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | Default design is now again basically the previous one | ||||
| | * | | 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 | ||||
| | * | | | correct minor typo | Charles | 2014-05-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #454 from chriswinstead/master | RedMatrix | 2014-05-11 | 4 | -8/+43 |
| |\ \ \ \ | | |_|/ / | |/| | | | Detect high-resolution displays (like retina) and serve higher resolution photo thumbnails | ||||
| | * | | | 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 ↵ | root | 2014-05-10 | 2 | -1/+37 |
| | | | | | | | | | | | | | | | | | | | | pixel density. | ||||
| | * | | | 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 ↵ | root | 2014-05-07 | 3 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | page headers to allow user scaling. | ||||
* | | | | | 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 | ||||
| | * | | | | 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 |
|/ / / / | |||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-09 | 2 | -11/+11 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #450 from tuscanhobbit/master | Paolo T | 2014-05-09 | 2 | -11/+11 |
| |\ \ \ \ | | | | | | | | | | | | | IT: strings updated | ||||
| | * | | | | IT: strings updated | Paolo Tacconi | 2014-05-09 | 2 | -11/+11 |
| |/ / / / | |||||
* | | | | | better button theming on oauth connected apps page | friendica | 2014-05-09 | 3 | -413/+420 |
| | | | | | |||||
* | | | | | doc updates | friendica | 2014-05-09 | 5 | -6/+6 |
|/ / / / | |||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-08 | 3 | -24/+37 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-05-09 | 13 | -5695/+5781 |
| |\ \ \ \ | |||||
| * | | | | | add some more bs fu | marijus | 2014-05-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | like indicator rewrite | marijus | 2014-05-08 | 3 | -23/+36 |
| | | | | | | |||||
* | | | | | | shred: ability to execute somewhat arbitrary API functions and echo results | friendica | 2014-05-08 | 2 | -1/+23 |
| |/ / / / |/| | | | | |||||
* | | | | | move the event "unknown finish time" checkbox up so it actually precedes ↵ | friendica | 2014-05-08 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entering the finish time. TODO: we should probably disable the finish time selector with jquery if this is checked. | ||||
* | | | | | event form hard-wired tinymce=on, made selectable | friendica | 2014-05-08 | 4 | -4/+18 |
| | | | | | |||||
* | | | | | better checking for SSL servers, even though it probably doesn't fix the ↵ | friendica | 2014-05-08 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | cookie bug | ||||
* | | | | | show hidden connections in contact block if and only if the observer is the ↵ | friendica | 2014-05-08 | 2 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | profile owner | ||||
* | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-08 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #449 from cvogeley/master | cvogeley | 2014-05-08 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | another one | ||||
| | * | | | | | another one | Christian Vogeley | 2014-05-08 | 1 | -1/+1 |
| | | | | | | |