aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'habeascodice2014-10-29320-13293/+17851
|\
| * if any privacy tags are created on a top level post, restrict the post; since...friendica2014-10-281-1/+14
| * the default permissions for new connections when using a custom role is inade...friendica2014-10-281-1/+5
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-283-29/+66
| |\
| | * Merge pull request #668 from git-marijus/masterRedMatrix2014-10-283-29/+66
| | |\
| | | * change the way tagrm works to allow tag removal on the flymarijus2014-10-283-29/+66
| | |/
| * / change photo tag bubble tipfriendica2014-10-282-2/+2
| |/
| * several unrelated things - auto_follow wasn't working for new accounts, error...friendica2014-10-276-13/+31
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-2712-5996/+6185
| |\
| | * do not reload page for edit album and some minor cleanupmarijus2014-10-277-57/+41
| | * Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-273-1/+61
| | |\
| | * | update nl + Terms of Service more prominent in the help files.Jeroen2014-10-275-5939/+6144
| * | | add "repository" permissions role and make sure we have a sane "accept" defau...friendica2014-10-273-5/+63
| | |/ | |/|
| * | some documentation of permission roles and what the differences are.friendica2014-10-273-1/+61
| |/
| * 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 ch...friendica2014-10-261-6/+11
| * 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 perm...friendica2014-10-266-150/+157
| * use intval rather than dbesc since these are ints. Should work regardless, bu...friendica2014-10-261-2/+2
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-263-14/+114
| |\
| | * 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
| * 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:02:45 +0000