aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* backtrack on attribution for wall-to-wall comments - triggered too often and ...friendica2014-10-222-9/+13
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-2211-127/+107
|\
| * 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
| * Merge pull request #658 from zzottel/masterRedMatrix2014-10-221-2/+3
| |\
| | * document store writability requirementszottel2014-10-221-2/+3
| |/
| * Merge pull request #655 from pafcu/masterRedMatrix2014-10-222-7/+27
| |\
| | * If entered event info is not valid, let user try again with the old info stil...Stefan Parviainen2014-10-212-7/+27
| | * Merge pull request #2 from friendica/masterpafcu2014-10-21207-5527/+8458
| | |\
* | | | you've gotta' be on your toes to catch this bug... though it's been here for ...friendica2014-10-222-3/+3
|/ / /
* | | when removing a channel, check to see if there are any valid hublocs remainin...friendica2014-10-211-4/+17
* | | 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
| |\ \ \
| | * | | 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
|/ /
* | 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 di...friendica2014-10-191-0/+13
* | Tried this once before but had to revert. Basically prevent a comment from be...friendica2014-10-191-1/+7
* | 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 mobile...Stefan Parviainen2014-10-191-1/+1
| * | Merge pull request #651 from 23n/masterThomas Willingham2014-10-191-2/+1
| |\ \
| | * | 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
| |\|
| | * 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 earl...Stefan Parviainen2014-10-192-72/+53
| | * Give an error if event is supposed to end before it starts. Closes friendica/...Stefan Parviainen2014-10-191-2/+4
| * | Merge pull request #646 from pafcu/masterRedMatrix2014-10-194-208/+91
| |\|
| | * 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
| * | 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