aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doh - this needs to be markdown, not bbcodefriendica2014-10-241-2/+2
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-2413-33/+45
|\
| * Merge pull request #665 from zzottel/masterRedMatrix2014-10-251-7/+19
| |\
| | * make bbcode/html includes work in markdown help pages and vice versazottel2014-10-241-7/+19
| |/
| * Issue #661Thomas Willingham2014-10-241-1/+1
| * Merge pull request #664 from zzottel/masterzzottel2014-10-2411-25/+25
| |\
| | * correction to addon footerzottel2014-10-241-1/+1
| | * update to German helpzottel2014-10-2410-24/+24
| |/
* / should probably check the body since the title is only going to be rarely set.friendica2014-10-241-1/+1
|/
* don't decrypt the message body more than once.friendica2014-10-241-2/+7
* string updatefriendica2014-10-242-3705/+3869
* doc updatesfriendica2014-10-2493-543/+2308
* don't offer forum (@name+) completion in comments, since it won't do anything.friendica2014-10-233-5/+5
* I'm speechless. This is just reckless. Set a context flag in text using a con...friendica2014-10-231-2/+2
* generalise the output format of xchan_fetch so it matches the input formatfriendica2014-10-231-1/+11
* API: xchan get/createfriendica2014-10-232-1/+91
* diaspora walltowall comment signature, force update.friendica2014-10-231-1/+1
* Merge pull request #660 from beardy-unixer/masterRedMatrix2014-10-241-0/+1
|\
| * Provide comment box for PERMS_AUTHED items. Presently only commentable from ...Thomas Willingham2014-10-231-0/+1
|/
* upd nl 2Jeroen2014-10-232-19/+19
* upd nlJeroen2014-10-232-6219/+6071
* Merge pull request #659 from zzottel/masterzzottel2014-10-232-6299/+6107
|\
| * update to German stringszottel2014-10-232-6299/+6107
|/
* wrong permalink on remote eventsfriendica2014-10-232-5/+11
* improved wall-to-wall detection for comments so we can handle Diaspora signin...friendica2014-10-222-8/+27
* 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
| |/ /