aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doco - politics, unwritten pages, links, and stuff. Nothing major.Thomas Willingham2014-10-228-58/+17
|
* Doco - some clean up to install - keep politics out of it, 80 columnise it andThomas Willingham2014-10-221-63/+63
| | | | whitespace.
* Merge pull request #658 from zzottel/masterRedMatrix2014-10-221-2/+3
|\ | | | | document store writability requirements
| * document store writability requirementszottel2014-10-221-2/+3
|/
* Merge pull request #655 from pafcu/masterRedMatrix2014-10-222-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 Parviainen2014-10-212-7/+27
| | | | | | | | still there. Closes friendica/red#648
| * Merge pull request #2 from friendica/masterpafcu2014-10-21207-5527/+8458
| |\ | | | | | | Sync with upstream
* | | when removing a channel, check to see if there are any valid hublocs ↵friendica2014-10-211-4/+17
| | | | | | | | | | | | | | | | | | remaining before marking the xchan deleted. Issue #657
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-212-5/+9
|\ \ \
| * | | TypoThomas Willingham2014-10-211-1/+1
| | | |
| * | | fix nav double dropdownmarijus2014-10-211-4/+8
| | | |
* | | | private forum issuesfriendica2014-10-214-2/+19
|/ / /
* | | strip out the Diaspora quoted reshare markersfriendica2014-10-201-0/+2
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-201-1/+13
|\ \ \
| * \ \ 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
| | | | |
* | | | | wrong template loaded issuefriendica2014-10-201-1/+1
|/ / / /
* | | | 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
| | |