Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | habeascodice | 2014-10-29 | 320 | -13293/+17851 |
|\ | |||||
| * | if any privacy tags are created on a top level post, restrict the post; ↵ | friendica | 2014-10-28 | 1 | -1/+14 |
| | | | | | | | | since it could have been quite sensitive. If there were errors processing the actual tag restrict the post to the profile owner. Also make the "privacy tag over-rides ACL" behaviour configurable. Default is that privacy tags over-ride the ACL. | ||||
| * | the default permissions for new connections when using a custom role is ↵ | friendica | 2014-10-28 | 1 | -1/+5 |
| | | | | | | | | inadequate. Until we can make it configurable start off with something like a public social role. We're typically taking the person straight to the connection editor so they can change it before any privacy damage is done | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-28 | 3 | -29/+66 |
| |\ | |||||
| | * | Merge pull request #668 from git-marijus/master | RedMatrix | 2014-10-28 | 3 | -29/+66 |
| | |\ | | | | | | | | | change the way tagrm works to allow tag removal on the fly | ||||
| | | * | change the way tagrm works to allow tag removal on the fly | marijus | 2014-10-28 | 3 | -29/+66 |
| | |/ | |||||
| * / | change photo tag bubble tip | friendica | 2014-10-28 | 2 | -2/+2 |
| |/ | |||||
| * | several unrelated things - auto_follow wasn't working for new accounts, ↵ | friendica | 2014-10-27 | 6 | -13/+31 |
| | | | | | | | | error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-27 | 12 | -5996/+6185 |
| |\ | |||||
| | * | do not reload page for edit album and some minor cleanup | marijus | 2014-10-27 | 7 | -57/+41 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-10-27 | 3 | -1/+61 |
| | |\ | |||||
| | * | | update nl + Terms of Service more prominent in the help files. | Jeroen | 2014-10-27 | 5 | -5939/+6144 |
| | | | | |||||
| * | | | add "repository" permissions role and make sure we have a sane "accept" ↵ | friendica | 2014-10-27 | 3 | -5/+63 |
| | |/ | |/| | | | | | | | default for the custom role. | ||||
| * | | some documentation of permission roles and what the differences are. | friendica | 2014-10-27 | 3 | -1/+61 |
| |/ | |||||
| * | turn down the preview logging. Haven't needed that level of detail recently. | friendica | 2014-10-26 | 1 | -2/+2 |
| | | |||||
| * | a couple of photo tag issues | friendica | 2014-10-26 | 2 | -23/+34 |
| | | |||||
| * | couple of other places where we need to reset stuff completely if the role ↵ | friendica | 2014-10-26 | 1 | -6/+11 |
| | | | | | | | | changes | ||||
| * | reset ACL just in case it was custom already. | friendica | 2014-10-26 | 1 | -1/+1 |
| | | |||||
| * | put privacy role selector in settings page. Change visibility of various ↵ | friendica | 2014-10-26 | 6 | -150/+157 |
| | | | | | | | | permissions items accordingly. | ||||
| * | use intval rather than dbesc since these are ints. Should work regardless, ↵ | friendica | 2014-10-26 | 1 | -2/+2 |
| | | | | | | | | but this makes it consistent with the way we do most other queries. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-26 | 3 | -14/+114 |
| |\ | | | | | | | | | | | | | Conflicts: mod/like.php | ||||
| | * | wrong vars in template | marijus | 2014-10-26 | 1 | -2/+2 |
| | | | |||||
| | * | some work on photos like/dislike | marijus | 2014-10-25 | 4 | -15/+114 |
| | | | |||||
| * | | allow photos without comments to be liked | friendica | 2014-10-26 | 2 | -3/+16 |
| |/ | |||||
| * | moved post_to_red to its own project ( https://github.com/friendica/wptored ↵ | friendica | 2014-10-25 | 3 | -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. | friendica | 2014-10-24 | 1 | -0/+3 |
| | | |||||
| * | doh - this needs to be markdown, not bbcode | friendica | 2014-10-24 | 1 | -2/+2 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-24 | 13 | -33/+45 |
| |\ | |||||
| | * | Merge pull request #665 from zzottel/master | RedMatrix | 2014-10-25 | 1 | -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 versa | zottel | 2014-10-24 | 1 | -7/+19 |
| | |/ | |||||
| | * | Issue #661 | Thomas Willingham | 2014-10-24 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #664 from zzottel/master | zzottel | 2014-10-24 | 11 | -25/+25 |
| | |\ | | | | | | | | | German help and addon footer correction | ||||
| | | * | correction to addon footer | zottel | 2014-10-24 | 1 | -1/+1 |
| | | | | |||||
| | | * | update to German help | zottel | 2014-10-24 | 10 | -24/+24 |
| | |/ | |||||
| * / | should probably check the body since the title is only going to be rarely set. | friendica | 2014-10-24 | 1 | -1/+1 |
| |/ | |||||
| * | don't decrypt the message body more than once. | friendica | 2014-10-24 | 1 | -2/+7 |
| | | |||||
| * | string update | friendica | 2014-10-24 | 2 | -3705/+3869 |
| | | |||||
| * | doc updates | friendica | 2014-10-24 | 93 | -543/+2308 |
| | | |||||
| * | don't offer forum (@name+) completion in comments, since it won't do anything. | friendica | 2014-10-23 | 3 | -5/+5 |
| | | |||||
| * | I'm speechless. This is just reckless. Set a context flag in text using a ↵ | friendica | 2014-10-23 | 1 | -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 format | friendica | 2014-10-23 | 1 | -1/+11 |
| | | |||||
| * | API: xchan get/create | friendica | 2014-10-23 | 2 | -1/+91 |
| | | |||||
| * | diaspora walltowall comment signature, force update. | friendica | 2014-10-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #660 from beardy-unixer/master | RedMatrix | 2014-10-24 | 1 | -0/+1 |
| |\ | | | | | | | Provide comment box for PERMS_AUTHED items. Presently only commentable ... | ||||
| | * | Provide comment box for PERMS_AUTHED items. Presently only commentable from ↵ | Thomas Willingham | 2014-10-23 | 1 | -0/+1 |
| |/ | | | | | | | owners wall. | ||||
| * | upd nl 2 | Jeroen | 2014-10-23 | 2 | -19/+19 |
| | | |||||
| * | upd nl | Jeroen | 2014-10-23 | 2 | -6219/+6071 |
| | | |||||
| * | Merge pull request #659 from zzottel/master | zzottel | 2014-10-23 | 2 | -6299/+6107 |
| |\ | | | | | | | update to German strings | ||||
| | * | update to German strings | zottel | 2014-10-23 | 2 | -6299/+6107 |
| |/ | |||||
| * | wrong permalink on remote events | friendica | 2014-10-23 | 2 | -5/+11 |
| | |