aboutsummaryrefslogtreecommitdiffstats
path: root/mod/editlayout.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * avoid double slash after editing layoutMario Vavti2015-05-061-1/+1
| |
* | Merge branch 'master' into tresfriendica2015-04-291-25/+5
|\| | | | | | | | | Conflicts: include/notifier.php
| * adjust placeholder namingMario Vavti2015-04-291-1/+2
| |
| * webpages layout fixesMario Vavti2015-04-241-24/+3
| |
* | Merge branch 'master' into tresfriendica2015-04-231-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * provide headings for blocks and layoutsMario Vavti2015-04-221-2/+1
| |
| * title of preview button incorrect, fix ability to upload to webpagesfriendica2015-03-301-1/+1
| |
| * remove the now redundant audio/video buttons and label the editor text style ↵friendica2015-03-111-0/+5
| | | | | | | | buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
* | Merge branch 'master' into tresfriendica2015-01-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_channelfriendica2015-01-281-1/+1
| |
* | more message restrict conversionsfriendica2015-01-291-1/+1
|/
* edit and preview removed from additional features and turned into core ↵friendica2014-12-161-1/+1
| | | | functionality (always enabled).
* Make it clear that title and categories are optionalStefan Parviainen2014-12-081-2/+2
|
* this should make all the 'sys' webpage design tools useable by the adminfriendica2014-11-121-4/+1
|
* extend sys support to layoutsfriendica2014-11-121-92/+127
|
* shareable design elementsfriendica2014-10-061-0/+17
|
* rule of snakes #1, kill the snake.friendica2014-06-281-2/+2
| | | | | | tinymce is gone. if you want a visual editor, figure out what you want and make it happen. If you don't want a visual editor, do nothing. This is in the community's hands. I don't need a visual editor.
* use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵marijus2014-04-091-1/+0
| | | | editblock and editlayout which still depended on it.
* change the way jot tools are displayed/hiddenmarijus2014-04-081-2/+2
|
* delete confirmation popup for blocks and layoutsChristian Vogeley2014-01-121-2/+3
|
* Fix webpage layout title editingChristian Vogeley2014-01-121-2/+7
|
* a few fixes to webpage editingfriendica2014-01-041-0/+1
|
* check that every invocation of htmlspecialchars has the right arg listfriendica2013-12-121-1/+1
|
* provide expire feature on post and comments as well as private messages. ↵friendica2013-11-071-0/+3
| | | | This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone.
* spurious blank linesfriendica2013-09-151-1/+0
|
* provide ability to delete webpages, layouts and blocksfriendica2013-09-061-1/+6
|
* add layouts and editlayout and rework the page logic in mod/itemfriendica2013-09-011-0/+139