Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -5/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | ||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -5/+5 |
| | | |||||
* | | more message restrict conversions | friendica | 2015-01-29 | 1 | -3/+3 |
|/ | |||||
* | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 1 | -2/+2 |
| | | | | isn't always appropriate to apply this to all channels in an account. | ||||
* | shareable design elements | friendica | 2014-10-06 | 1 | -11/+19 |
| | |||||
* | more infrastructure for sharing page design elements | friendica | 2014-10-03 | 1 | -1/+43 |
| | |||||
* | doc updates | friendica | 2014-10-03 | 1 | -0/+71 |