friendica
|
912be23e16
|
Merge branch 'master' into tres
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
|
2015-01-29 15:09:35 -08:00 |
|
friendica
|
ff68ea6087
|
more message restrict conversions
|
2015-01-29 14:51:41 -08:00 |
|
friendica
|
a496036066
|
local_user => local_channel
|
2015-01-28 20:56:04 -08:00 |
|
friendica
|
dfdef0af0d
|
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
|
2015-01-13 18:30:30 -08:00 |
|
friendica
|
03bbbdaf10
|
shareable design elements
|
2014-10-06 17:47:17 -07:00 |
|
friendica
|
ec604a4158
|
more infrastructure for sharing page design elements
|
2014-10-03 16:51:22 -07:00 |
|
friendica
|
f5623ae11d
|
doc updates
|
2014-10-03 03:34:50 -07:00 |
|