aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* turn down the preview logging. Haven't needed that level of detail recently.friendica2014-10-261-2/+2
|
* a couple of photo tag issuesfriendica2014-10-262-23/+34
|
* couple of other places where we need to reset stuff completely if the role ↵friendica2014-10-261-6/+11
| | | | changes
* reset ACL just in case it was custom already.friendica2014-10-261-1/+1
|
* put privacy role selector in settings page. Change visibility of various ↵friendica2014-10-266-150/+157
| | | | permissions items accordingly.
* use intval rather than dbesc since these are ints. Should work regardless, ↵friendica2014-10-261-2/+2
| | | | but this makes it consistent with the way we do most other queries.
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-263-14/+114
|\ | | | | | | | | Conflicts: mod/like.php
| * wrong vars in templatemarijus2014-10-261-2/+2
| |
| * some work on photos like/dislikemarijus2014-10-254-15/+114
| |
* | allow photos without comments to be likedfriendica2014-10-262-3/+16
|/
* moved post_to_red to its own project ( https://github.com/friendica/wptored ↵friendica2014-10-253-533/+1
| | | | ), which I was planning to do anyway since it's kind of lost in the util folder, but also because having it there may present licensing issues, as it's GPL.
* the to-do list is getting longer again.friendica2014-10-241-0/+3
|
* 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 versa
| | * 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
| |\ | | | | | | German help and addon footer correction
| | * 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 ↵friendica2014-10-231-2/+2
| | | | context trigger character which is likely to be present in that text already. Without escaping any previous instances of that character. Grrr.
* 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 ...
| * Provide comment box for PERMS_AUTHED items. Presently only commentable from ↵Thomas Willingham2014-10-231-0/+1
|/ | | | owners wall.
* 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 strings
| * 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 ↵friendica2014-10-222-8/+27
| | | | | | | signing and wall-to-wall attribution correctly. Do it at the point of submission. This also fixes a potential bug in yesterday's wall-to-wall permission setting, if it was a local comment to a remote post.
* backtrack on attribution for wall-to-wall comments - triggered too often and ↵friendica2014-10-222-9/+13
| | | | unnecessarily.
* 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
| | | | | | | | 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
* | | | you've gotta' be on your toes to catch this bug... though it's been here for ↵friendica2014-10-222-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 ↵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
| | | |