Commit Graph

13 Commits

Author SHA1 Message Date
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
ada2e43ea2 extend sys support to layouts 2014-11-12 00:48:09 -08:00
friendica
ed4896def1 make blocks, webpages, and layouts postable (pre-filled forms if supplied from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save. 2014-08-28 01:08:42 -07:00
marijus
b88a7fc23a use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it. 2014-04-09 18:29:22 +02:00
marijus
9f621dac85 change the way jot tools are displayed/hidden 2014-04-08 22:07:06 +02:00
friendica
cdd2e9cd95 layout export to file 2014-03-03 20:05:23 -08:00
friendica
102521844b put schemas in Comanche (this requires theme support (!)) 2014-02-27 20:48:10 -08:00
friendica
125543aded more comanche migration 2013-12-19 02:16:14 -08:00
friendica
1380bee82c Comanche documentation and some cleanup of layout page (including link to doco) and a few other webpage related cleanups 2013-10-28 17:48:42 -07:00
friendica
ab1c9dc9c9 add design tool menu to appropriate pages 2013-09-03 19:55:26 -07:00
friendica
cbab62c95e add layouts and editlayout and rework the page logic in mod/item 2013-09-01 18:22:31 -07:00