Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
|/ / / / / | ||||||
* | | | | | 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 | 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 ente... | friendica | 2014-05-08 | 1 | -3/+7 | |
* | | | | | 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 cook... | friendica | 2014-05-08 | 2 | -1/+3 | |
* | | | | | show hidden connections in contact block if and only if the observer is the p... | friendica | 2014-05-08 | 2 | -8/+26 | |
* | | | | | 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 | 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 | |
* | | | | | | | remove the redundant install check | friendica | 2014-05-08 | 1 | -1/+1 | |
* | | | | | | | turn off ssl cookie protection by default since nobody that has problems with... | friendica | 2014-05-08 | 2 | -10/+12 | |
|/ / / / / / | ||||||
* | | | | | | 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 | |
* | | | | | | fix events until the new event subscription mechanism goes in, as shared even... | friendica | 2014-05-07 | 1 | -1/+1 | |
* | | | | | | ok *now* shred works with alternate config files | friendica | 2014-05-07 | 2 | -10/+16 | |
* | | | | | | shred: perhaps alternate configs will work now - unable to test at the moment... | friendica | 2014-05-07 | 2 | -4/+5 |