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 |
|
redmatrix
|
a3c37f1458
|
first pass name change
|
2015-05-05 03:56:10 -07:00 |
|
friendica
|
c4221f3273
|
Merge branch 'master' into tres
Conflicts:
include/notifier.php
|
2015-04-29 21:49:43 -07:00 |
|
Mario Vavti
|
310d122901
|
disable voting in blocks, layouts and webpages
|
2015-04-29 21:36:53 +02:00 |
|
Mario Vavti
|
f987fc3e6f
|
adjust placeholder naming
|
2015-04-29 16:33:03 +02:00 |
|
Mario Vavti
|
31b5b06e42
|
Provide webpage layout description
|
2015-04-25 22:35:24 +02:00 |
|
Mario Vavti
|
2583cab469
|
add title to element array
|
2015-04-24 14:14:33 +02:00 |
|
Mario Vavti
|
9894a7b2d0
|
copy/paste typo
|
2015-04-24 12:37:13 +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
|
2619b60721
|
make sure we redirect to a sane place after deleting a webpage element
|
2015-04-09 15:45:08 -07:00 |
|
Klaus Weidenbach
|
754ac2cff7
|
Fix Design Tool navigation for sys channel.
Fix creating menu for sys channel.
|
2015-04-06 23:52:13 +02: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
|
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 |
|