Commit graph

32 commits

Author SHA1 Message Date
redmatrix
e4f3605054 add page title to the html title 2016-03-29 14:14:17 -07:00
redmatrix
888bf76e4b allow pdl content 2015-11-12 17:47:38 -08:00
redmatrix
03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
507e10fa45 remove debugging 2015-06-08 16:57:30 -07:00
redmatrix
39f0e6fe62 add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public". 2015-06-08 16:55:17 -07:00
redmatrix
5795e2a58b more migration of page types 2015-05-21 22:17:17 -07: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
redmatrix
c3c202d650 issue #187 2015-05-12 22:57:55 -07: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
friendica
2c8394a4b9 funny I should mention comanche preview (yesterday) as clicking the view link on a layout does nothing interesting at all. So I've made it do a crude but useable preview with page content of 'Lorem Ipsum'. 2015-04-14 21:48:42 -07:00
friendica
aff7588832 fix comanche regions after comanche refactor a few days ago 2015-03-09 00:44:58 -07:00
friendica
ff68ea6087 more message restrict conversions 2015-01-29 14:51:41 -08:00
friendica
cb15c73dae move all theme initialisation to one place - just after calling module_init. Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them. 2014-10-20 16:47:58 -07:00
friendica
e1ec1e7c5f sort out the unobscure mess 2014-06-15 19:21:32 -07:00
friendica
876f5d4de0 transmit, receive, and parse bookmarks 2014-02-03 19:38:15 -08:00
friendica
47b8071ca7 dav: throw exception if channel for requested DAV directory is deleted 2014-01-15 03:12:47 -08:00
friendica
e8c9dafb90 revert to prepare_page - but have it call prepare_body 2013-11-15 15:32:26 -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
fe5f470c62 mod/page - display most recent revision by default, or numbered revision specified by rev URL parameter 2013-09-07 04:36:47 -07:00
friendica
0be8e4061c testing Comanche 2013-09-03 01:57:11 -07:00
friendica
a1906482dc rework the pdl_selector a bit since we've slightly changed the way layouts are stored. 2013-09-01 18:36:14 -07:00
friendica
7458263017 I've got a pretty good idea of how to bootstrap, parse and render Comanche now. This does not mean it's close to being presentable - far from it. 2013-08-29 20:54:42 -07:00
friendica
70c0beb857 block attempts to set the baseurl to an ip address if it was previously a dns name 2013-08-29 16:46:22 -07:00
Thomas Willingham
608e04c65e More progress on pages - extend writepages widget, add pagelist widget 2013-08-14 20:46:48 +01:00
Thomas Willingham
94335f237f Initial shot at write_pages widget 2013-08-10 22:06:30 +01:00
Thomas Willingham
3743d5ca79 Observer permissions (but not ACL yet) for webpages. 2013-07-16 18:48:53 +01:00
Thomas Willingham
c28f7e0622 Make sure we load the channel theme when displaying a page. 2013-07-12 01:19:05 +01:00
friendica
ba3cff6d9a progress on tag delivery 2013-02-11 00:20:14 -08:00
friendica
62b1eb65dc pages sorta working 2013-01-15 01:32:11 -08:00
friendica
639325b235 progress on pages - they're still getting lost inside conversation(), but progress is progress. 2013-01-14 16:49:57 -08:00
friendica
82e0c04d92 add page module 2013-01-12 02:49:17 -08:00