Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-22 | 11 | -127/+107 |
|\ | |||||
| * | Doco - politics, unwritten pages, links, and stuff. Nothing major. | Thomas Willingham | 2014-10-22 | 8 | -58/+17 |
| | | |||||
| * | Doco - some clean up to install - keep politics out of it, 80 columnise it and | Thomas Willingham | 2014-10-22 | 1 | -63/+63 |
| | | | | | | | | whitespace. | ||||
| * | Merge pull request #658 from zzottel/master | RedMatrix | 2014-10-22 | 1 | -2/+3 |
| |\ | | | | | | | document store writability requirements | ||||
| | * | document store writability requirements | zottel | 2014-10-22 | 1 | -2/+3 |
| |/ | |||||
| * | Merge pull request #655 from pafcu/master | RedMatrix | 2014-10-22 | 2 | -7/+27 |
| |\ | | | | | | | Better handling of incorrect info entered in event | ||||
| | * | If entered event info is not valid, let user try again with the old info ↵ | Stefan Parviainen | 2014-10-21 | 2 | -7/+27 |
| | | | | | | | | | | | | still there. Closes friendica/red#648 | ||||
| | * | Merge pull request #2 from friendica/master | pafcu | 2014-10-21 | 207 | -5527/+8458 |
| | |\ | | | | | | | | | Sync with upstream | ||||
* | | | | you've gotta' be on your toes to catch this bug... though it's been here for ↵ | friendica | 2014-10-22 | 2 | -3/+3 |
|/ / / | | | | | | | | | | about 2 1/2 years and even survived a rewrite. Symptoms are that the archive widget only lists one month (the month when you first posted), and only if your first post was written between the 28th and 31st of whatever month that was. | ||||
* | | | when removing a channel, check to see if there are any valid hublocs ↵ | friendica | 2014-10-21 | 1 | -4/+17 |
| | | | | | | | | | | | | | | | | | | remaining before marking the xchan deleted. Issue #657 | ||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-21 | 2 | -5/+9 |
|\ \ \ | |||||
| * | | | Typo | Thomas Willingham | 2014-10-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix nav double dropdown | marijus | 2014-10-21 | 1 | -4/+8 |
| | | | | |||||
* | | | | private forum issues | friendica | 2014-10-21 | 4 | -2/+19 |
|/ / / | |||||
* | | | strip out the Diaspora quoted reshare markers | friendica | 2014-10-20 | 1 | -0/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-20 | 1 | -1/+13 |
|\ \ \ | |||||
| * \ \ | Merge pull request #652 from beardy-unixer/master | RedMatrix | 2014-10-21 | 1 | -1/+13 |
| |\ \ \ | | | | | | | | | | | Prevent multiple simultaneous pollers. | ||||
| | * | | | Screwed up merge - put Mike's stuff back. | Thomas Willingham | 2014-10-20 | 1 | -6/+11 |
| | | | | | |||||
| | * | | | Prevent more than one instance of the poller running at a time. | Thomas Willingham | 2014-10-20 | 1 | -12/+19 |
| | | | | | |||||
* | | | | | wrong template loaded issue | friendica | 2014-10-20 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | bb2diaspora wallwall comment - match both bits (ITEM_WALL|ITEM_ORIGIN) | friendica | 2014-10-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-20 | 4 | -148/+126 |
|\ \ \ \ | |||||
| * | | | | minor correction and typo | marijus | 2014-10-20 | 2 | -5/+5 |
| | |_|/ | |/| | | |||||
| * | | | 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 |
| | | | |||||
* | | | move all theme initialisation to one place - just after calling module_init. ↵ | friendica | 2014-10-20 | 5 | -19/+62 |
|/ / | | | | | | | Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them. | ||||
* | | 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 |
| | | |