redmatrix
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
redmatrix
ec1dcb8f2e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-06 17:31:22 -07:00
Mario Vavti
d84f77bbc6
use the right webpage layout for an installed webpage if it exists
2015-06-04 23:04:58 +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
redmatrix
c82082d2bb
restrict webpage list to undeleted items
2015-05-13 16:27:04 -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
da0875a015
there is no key named term in this array
2015-04-24 12:43:41 +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
29061b3ee3
do not show acl button if not owner
2015-04-22 12:31:30 +02:00
Mario Vavti
dfc88a41df
fix webpages profile_tabs
2015-04-22 12:21:33 +02:00
Mario Vavti
9e490d022b
fix webpage perms
2015-04-22 12:00:15 +02:00
Mario Vavti
e58e8f3f75
bring lockstate to webpages
2015-04-21 23:08:54 +02:00
Mario Vavti
61e4ee753d
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
2015-04-17 11:20:22 +02:00
Mario Vavti
b42bb09635
whitespace
2015-04-16 10:46:59 +02:00
Mario Vavti
86ac9c0d6b
move share webpage element from editwebpage to webpages and make it shareable with rpost
2015-04-16 10:43:14 +02:00
Mario Vavti
953819e7da
css fixes and remove expert mode for block page content type
2015-04-14 12:52:31 +02:00
Mario Vavti
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
Mario Vavti
865b602cf8
webpages appearence
2015-04-13 23:38: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
friendica
7bec4b313a
system channel always has allow_code privileges
2015-04-08 23:05:36 -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
9be4fcce55
uid not set in webpages.php, start on editwebpage.php
2014-11-11 22:55:24 -08:00
friendica
4b9ec6645b
cleanup
2014-11-11 20:44:43 -08:00
friendica
b5af667985
slow progress on sys publishing, making sure all the data we need is in the places we need it but validate it anyway
2014-11-11 19:29:30 -08:00
friendica
37742be6af
some more work on sys publishing
2014-11-11 18:57:59 -08:00
Thomas Willingham
b84b2d5aa5
FFS, another oops
2014-10-11 16:19:36 +01:00
Thomas Willingham
d46fd7917f
Fix webpages. Sycning between too many codebases...
2014-10-11 16:18:15 +01:00
Thomas Willingham
d132646915
Unbreak webpages
2014-10-11 15:42:31 +01:00
marijus
4e9bd8b8f0
This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme.
...
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
2014-10-10 15:52:56 +02:00
Jeroen
e06c3e5a91
Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it.
2014-10-09 14:54:04 +00:00
Jeroen
e1cb4b2833
expert_mode > expert
2014-09-12 18:18:46 +00:00
friendica
75fc3a8ceb
for webpages, hide the mimetype selector unless in advanced mode. For pages that endless scroll and show blocky-block things, set the default items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and 20 without leaving remaindered items dangling at the end. No other setting less than 100 has this much versatility.
2014-09-07 19:16:48 -07: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
friendica
e1ec1e7c5f
sort out the unobscure mess
2014-06-15 19:21:32 -07:00
friendica
0f6c321e3f
only show jotnets when posting conversation items
2014-06-14 20:16:40 -07:00
friendica
31fd284b3c
clean up the webpage list a bit
2014-04-29 18:28:05 -07:00
marijus
9f621dac85
change the way jot tools are displayed/hidden
2014-04-08 22:07:06 +02:00
friendica
64dfe3ab64
issue #395 , item 2
2014-04-06 03:47:53 -07:00
friendica
125543aded
more comanche migration
2013-12-19 02:16:14 -08:00
friendica
48c650c715
improve editing ability of webpages - acls, photos, location, page link title, etc.
2013-12-07 15:20:12 -08:00
friendica
49a392942c
acl in webpages and a couple of other little bits related to webpages - sort the list of pages by last edited and use prepare_body() so we get private stuff (and attachments, categories, etc.) formatted correctly
2013-11-14 14:19:20 -08:00
friendica
7b7ef56b54
replace text links with icons on design pages
2013-10-23 19:35:51 -07:00
friendica
ab1c9dc9c9
add design tool menu to appropriate pages
2013-09-03 19:55:26 -07:00
friendica
615bf23733
add a layout selector
2013-09-02 20:25:33 -07:00
friendica
f44274bfca
allow a channel owner to define a default mimetype on webpages (otherwise default to "choose") - also fix the selector w/r/t php code. There is no ui for setting either at the moment, but for instance with wiki pages we probably don't want to have multiple choice of the mimetype. Keep it simple.
2013-09-02 13:31:59 -07:00
friendica
8b7757e033
webpage content-type -- needs cleaning up and a security check once all the important bits are in place.
2013-09-02 01:38:17 -07:00