aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #652 from beardy-unixer/masterRedMatrix2014-10-211-1/+13
|\ | | | | Prevent multiple simultaneous pollers.
| * Screwed up merge - put Mike's stuff back.Thomas Willingham2014-10-201-6/+11
| |
| * Prevent more than one instance of the poller running at a time.Thomas Willingham2014-10-201-12/+19
| |
* | bb2diaspora wallwall comment - match both bits (ITEM_WALL|ITEM_ORIGIN)friendica2014-10-201-1/+1
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-204-148/+126
|\ \
| * | minor correction and typomarijus2014-10-202-5/+5
| | |
| * | not quite there yet but getting closermarijus2014-10-203-114/+95
| |/
| * more work on photosmarijus2014-10-203-56/+53
| |
* | move all theme initialisation to one place - just after calling module_init. ↵friendica2014-10-205-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.friendica2014-10-191-6/+11
|
* link tag closed prematurelyfriendica2014-10-192-3/+3
|
* show true author of wall-to-wall comments to Diaspora viewers just like we ↵friendica2014-10-191-0/+13
| | | | did for wall-to-wall posts.
* Tried this once before but had to revert. Basically prevent a comment from ↵friendica2014-10-191-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_mergefriendica2014-10-191-4009/+3853
|\
| * Merge pull request #650 from pafcu/masterRedMatrix2014-10-201-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 Parviainen2014-10-191-1/+1
| | | | | | | | | | | | mobile. In the long run a better fix should be found.
| * | Merge pull request #651 from 23n/masterThomas Willingham2014-10-191-2/+1
| |\ \ | | | | | | | | remove my second me
| | * | edit me23n2014-10-191-2/+1
| |/ /
| * | Seventy five people you won't believe contributed to RedMatrix!Thomas Willingham2014-10-191-0/+77
| | |
| * | Merge pull request #649 from pafcu/masterRedMatrix2014-10-193-110/+57
| |\| | | | | | | Improvements to date selection
| | * Don't display date format, it's already in the placeholder textStefan Parviainen2014-10-193-37/+1
| | |
| | * Changes in the datetimesel api, prevent user from picking event end date ↵Stefan Parviainen2014-10-192-72/+53
| | | | | | | | | | | | earlier than start date
| | * Give an error if event is supposed to end before it starts. Closes ↵Stefan Parviainen2014-10-191-2/+4
| | | | | | | | | | | | friendica/red#534
| * | Merge pull request #646 from pafcu/masterRedMatrix2014-10-194-208/+91
| |\| | | | | | | Initial stab at better general datetime picker
| | * Oops, forgot one fileStefan Parviainen2014-10-181-73/+85
| | |
| | * Initial stab at better general datetime pickerStefan Parviainen2014-10-183-135/+6
| | |
| * | Doco - if I ever have to touch dozens of files to change one link again,Thomas Willingham2014-10-1753-66/+79
| | | | | | | | | | | | I'll stab someone - so make sure we don't have to.
| * | PolicyThomas Willingham2014-10-172-1/+1
| | |
| * | New util/messages.poJeroen2014-10-171-4009/+3853
| | |
| * | Remote login > Remote authentication as discussedJeroen2014-10-171-1/+1
| | |
| * | oups... forgot to remove some debug stuffmarijus2014-10-171-1/+1
| | |
| * | make lockview for photos workmarijus2014-10-172-5/+15
| | |
* | | merge madnessfriendica2014-10-1964-1253/+1177
| | |
* | | string updatefriendica2014-10-191-374/+368
| | |
* | | new doc added to doc checkinfriendica2014-10-1920-0/+2790
| | |
* | | doc updatesfriendica2014-10-19114-2050/+2239
| | |
* | | wall-e random signature failuresfriendica2014-10-191-1/+2
|/ /
* | mark signature forgeriesfriendica2014-10-166-4/+16
| |
* | Merge pull request #645 from pafcu/masterRedMatrix2014-10-172-13/+13
|\| | | | | Turn login button into a menu
| * Merge branch 'master' of https://github.com/pafcu/redStefan Parviainen2014-10-1612-34/+48
| |\
| | * Merge pull request #1 from friendica/masterpafcu2014-10-1612-34/+48
| | |\ | | | | | | | | Sync with upstream
| * | | Login menuStefan Parviainen2014-10-162-13/+13
| |/ /
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-163-3/+6
|\ \ \ | | |/ | |/|
| * | jsonp support (thankxs fabrixxm)friendica2014-10-163-3/+6
| | |
* | | lighttpd sample conf security enhancementmarijus2014-10-161-0/+5
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-151-1/+1
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-162-3/+3
| |\ \
| * | | Let's not play security expert. Use Mozillas recommended serverThomas Willingham2014-10-161-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 statementfriendica2014-10-151-2/+0
| | | |
* | | | missing event permissionsfriendica2014-10-154-4/+7
| |/ / |/| |