redmatrix
a497d8ee66
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
2015-07-10 14:27:41 -07:00
Mario Vavti
fee607db56
more webpages - generic-content-wrapper fixes
2015-07-10 13:16:45 +02:00
redmatrix
a6cb90c81c
Merge branch 'master' into tres
...
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
2015-05-14 18:02:29 -07:00
Mario Vavti
257c670d5c
avoid double slash after editing layout
2015-05-06 12:16:53 +02:00
friendica
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
f987fc3e6f
adjust placeholder naming
2015-04-29 16:33:03 +02:00
Mario Vavti
c6a75f407d
webpages layout fixes
2015-04-24 11:36:49 +02:00
friendica
6679734135
Merge branch 'master' into tres
...
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
2015-04-23 19:49:41 -07:00
Mario Vavti
b4dff3a9ff
provide headings for blocks and layouts
2015-04-22 10:31:36 +02:00
friendica
d3c064cc34
title of preview button incorrect, fix ability to upload to webpages
2015-03-30 19:41:42 -07:00
friendica
b3a9a6c802
remove the now redundant audio/video buttons and label the editor text style 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.
2015-03-11 18:56:28 -07:00
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
5b49211035
edit and preview removed from additional features and turned into core functionality (always enabled).
2014-12-16 14:28:07 -08:00
Stefan Parviainen
97d1072f9b
Make it clear that title and categories are optional
2014-12-08 16:49:48 +01:00
friendica
a2cf1900c8
this should make all the 'sys' webpage design tools useable by the admin
2014-11-12 18:04:00 -08:00
friendica
ada2e43ea2
extend sys support to layouts
2014-11-12 00:48:09 -08:00
friendica
03bbbdaf10
shareable design elements
2014-10-06 17:47:17 -07:00
friendica
0074ef0bf3
rule of snakes #1 , kill the snake.
...
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.
2014-06-28 05:05:34 -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
Christian Vogeley
325c5e4e76
delete confirmation popup for blocks and layouts
2014-01-12 02:29:03 +01:00
Christian Vogeley
7a9ea83382
Fix webpage layout title editing
2014-01-12 01:51:30 +01:00
friendica
587c5d3e46
a few fixes to webpage editing
2014-01-04 13:44:43 -08:00
friendica
941f81eb30
check that every invocation of htmlspecialchars has the right arg list
2013-12-12 02:01:42 -08:00
friendica
7381326b7a
provide expire feature on post and comments as well as private messages. 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.
2013-11-07 00:47:50 -08:00
friendica
f72cc77e46
spurious blank lines
2013-09-15 22:33:47 -07:00
friendica
f2f3372aa9
provide ability to delete webpages, layouts and blocks
2013-09-06 04:07:43 -07:00
friendica
cbab62c95e
add layouts and editlayout and rework the page logic in mod/item
2013-09-01 18:22:31 -07:00
