Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2 from friendica/master | pafcu | 2014-10-21 | 207 | -5527/+8458 |
|\ | | | | | Sync with upstream | ||||
| * | not quite there yet but getting closer | marijus | 2014-10-20 | 3 | -114/+95 |
| | | |||||
| * | more work on photos | marijus | 2014-10-20 | 3 | -56/+53 |
| | | |||||
| * | don't auto-archive connections we can't poll. | friendica | 2014-10-19 | 1 | -6/+11 |
| | | |||||
| * | link tag closed prematurely | friendica | 2014-10-19 | 2 | -3/+3 |
| | | |||||
| * | show true author of wall-to-wall comments to Diaspora viewers just like we ↵ | friendica | 2014-10-19 | 1 | -0/+13 |
| | | | | | | | | did for wall-to-wall posts. | ||||
| * | Tried this once before but had to revert. Basically prevent a comment from ↵ | friendica | 2014-10-19 | 1 | -1/+7 |
| | | | | | | | | being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-19 | 1 | -4009/+3853 |
| |\ | |||||
| | * | Merge pull request #650 from pafcu/master | RedMatrix | 2014-10-20 | 1 | -1/+1 |
| | |\ | |_|/ |/| | | Move registration button to before login in nav to avoid problems with m... | ||||
* | | | Move registration button to before login in nav to avoid problems with ↵ | Stefan Parviainen | 2014-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | mobile. In the long run a better fix should be found. | ||||
| | * | Merge pull request #651 from 23n/master | Thomas Willingham | 2014-10-19 | 1 | -2/+1 |
| | |\ | | | | | | | | | remove my second me | ||||
| | | * | edit me | 23n | 2014-10-19 | 1 | -2/+1 |
| | |/ | |||||
| | * | Seventy five people you won't believe contributed to RedMatrix! | Thomas Willingham | 2014-10-19 | 1 | -0/+77 |
| | | | |||||
| | * | Merge pull request #649 from pafcu/master | RedMatrix | 2014-10-19 | 3 | -110/+57 |
| | |\ | |_|/ |/| | | Improvements to date selection | ||||
* | | | Don't display date format, it's already in the placeholder text | Stefan Parviainen | 2014-10-19 | 3 | -37/+1 |
| | | | |||||
* | | | Changes in the datetimesel api, prevent user from picking event end date ↵ | Stefan Parviainen | 2014-10-19 | 2 | -72/+53 |
| | | | | | | | | | | | | earlier than start date | ||||
* | | | Give an error if event is supposed to end before it starts. Closes ↵ | Stefan Parviainen | 2014-10-19 | 1 | -2/+4 |
| | | | | | | | | | | | | friendica/red#534 | ||||
| | * | Merge pull request #646 from pafcu/master | RedMatrix | 2014-10-19 | 4 | -208/+91 |
| | |\ | |_|/ |/| | | Initial stab at better general datetime picker | ||||
* | | | Oops, forgot one file | Stefan Parviainen | 2014-10-18 | 1 | -73/+85 |
| | | | |||||
* | | | Initial stab at better general datetime picker | Stefan Parviainen | 2014-10-18 | 3 | -135/+6 |
| | | | |||||
| | * | Doco - if I ever have to touch dozens of files to change one link again, | Thomas Willingham | 2014-10-17 | 53 | -66/+79 |
| | | | | | | | | | | | | I'll stab someone - so make sure we don't have to. | ||||
| | * | Policy | Thomas Willingham | 2014-10-17 | 2 | -1/+1 |
| | | | |||||
| | * | New util/messages.po | Jeroen | 2014-10-17 | 1 | -4009/+3853 |
| | | | |||||
| | * | Remote login > Remote authentication as discussed | Jeroen | 2014-10-17 | 1 | -1/+1 |
| | | | |||||
| | * | oups... forgot to remove some debug stuff | marijus | 2014-10-17 | 1 | -1/+1 |
| | | | |||||
| | * | make lockview for photos work | marijus | 2014-10-17 | 2 | -5/+15 |
| | | | |||||
| * | | merge madness | friendica | 2014-10-19 | 64 | -1253/+1177 |
| | | | |||||
| * | | string update | friendica | 2014-10-19 | 1 | -374/+368 |
| | | | |||||
| * | | new doc added to doc checkin | friendica | 2014-10-19 | 20 | -0/+2790 |
| | | | |||||
| * | | doc updates | friendica | 2014-10-19 | 114 | -2050/+2239 |
| | | | |||||
| * | | wall-e random signature failures | friendica | 2014-10-19 | 1 | -1/+2 |
| |/ | |||||
| * | mark signature forgeries | friendica | 2014-10-16 | 6 | -4/+16 |
| | | |||||
| * | Merge pull request #645 from pafcu/master | RedMatrix | 2014-10-17 | 2 | -13/+13 |
| |\ | |/ |/| | Turn login button into a menu | ||||
* | | Merge branch 'master' of https://github.com/pafcu/red | Stefan Parviainen | 2014-10-16 | 12 | -34/+48 |
|\ \ | |||||
| * \ | Merge pull request #1 from friendica/master | pafcu | 2014-10-16 | 12 | -34/+48 |
| |\ \ | | | | | | | | | Sync with upstream | ||||
* | | | | Login menu | Stefan Parviainen | 2014-10-16 | 2 | -13/+13 |
|/ / / | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-16 | 3 | -3/+6 |
| | |\ | | |/ | |/| | |||||
| * | | jsonp support (thankxs fabrixxm) | friendica | 2014-10-16 | 3 | -3/+6 |
| | | | |||||
| | * | lighttpd sample conf security enhancement | marijus | 2014-10-16 | 1 | -0/+5 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-15 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-10-16 | 2 | -3/+3 |
| | |\ | |||||
| | * | | Let's not play security expert. Use Mozillas recommended server | Thomas Willingham | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | config, even if it's ridiculously verbose. Reasoning - they make the browser, so if they've got it wrong, you're buggered anyway. | ||||
| * | | | remove log statement | friendica | 2014-10-15 | 1 | -2/+0 |
| | | | | |||||
| * | | | missing event permissions | friendica | 2014-10-15 | 4 | -4/+7 |
| | |/ | |/| | |||||
| * | | Don't recognise hashtags starting with #, e.g. ### | friendica | 2014-10-15 | 2 | -3/+3 |
| |/ | |||||
| * | SSL is broken you say? Well bah gum. | Thomas Willingham | 2014-10-16 | 1 | -1/+1 |
| | | | | | | | | Someone probably needs to update Lighttpd and Apache too. | ||||
| * | $comments > $commentbox | marijus | 2014-10-15 | 1 | -1/+1 |
| | | |||||
| * | some work on single photo view comments | marijus | 2014-10-15 | 3 | -19/+29 |
| | | |||||
| * | one more item_id > id | marijus | 2014-10-15 | 1 | -1/+1 |
| | | |||||
| * | it seems we do not have an key called item_id here so must be id only | marijus | 2014-10-15 | 1 | -1/+1 |
|/ |