Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -2/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | restrict webpage list to undeleted items | redmatrix | 2015-05-13 | 1 | -1/+0 |
| | | |||||
| * | issue #187 | redmatrix | 2015-05-12 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -17/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | funny I should mention comanche preview (yesterday) as clicking the view ↵ | friendica | 2015-04-14 | 1 | -17/+15 |
| | | | | | | | | 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'. | ||||
| * | fix comanche regions after comanche refactor a few days ago | friendica | 2015-03-09 | 1 | -0/+1 |
| | | |||||
* | | more message restrict conversions | friendica | 2015-01-29 | 1 | -4/+4 |
|/ | |||||
* | move all theme initialisation to one place - just after calling module_init. ↵ | friendica | 2014-10-20 | 1 | -4/+18 |
| | | | | Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them. | ||||
* | sort out the unobscure mess | friendica | 2014-06-15 | 1 | -1/+0 |
| | |||||
* | transmit, receive, and parse bookmarks | friendica | 2014-02-03 | 1 | -2/+2 |
| | |||||
* | dav: throw exception if channel for requested DAV directory is deleted | friendica | 2014-01-15 | 1 | -2/+2 |
| | |||||
* | revert to prepare_page - but have it call prepare_body | friendica | 2013-11-15 | 1 | -1/+1 |
| | |||||
* | acl in webpages and a couple of other little bits related to webpages - sort ↵ | friendica | 2013-11-14 | 1 | -7/+24 |
| | | | | the list of pages by last edited and use prepare_body() so we get private stuff (and attachments, categories, etc.) formatted correctly | ||||
* | mod/page - display most recent revision by default, or numbered revision ↵ | friendica | 2013-09-07 | 1 | -1/+7 |
| | | | | specified by rev URL parameter | ||||
* | testing Comanche | friendica | 2013-09-03 | 1 | -1/+4 |
| | |||||
* | rework the pdl_selector a bit since we've slightly changed the way layouts ↵ | friendica | 2013-09-01 | 1 | -0/+13 |
| | | | | are stored. | ||||
* | I've got a pretty good idea of how to bootstrap, parse and render Comanche ↵ | friendica | 2013-08-29 | 1 | -9/+6 |
| | | | | now. This does not mean it's close to being presentable - far from it. | ||||
* | block attempts to set the baseurl to an ip address if it was previously a ↵ | friendica | 2013-08-29 | 1 | -8/+9 |
| | | | | dns name | ||||
* | More progress on pages - extend writepages widget, add pagelist widget | Thomas Willingham | 2013-08-14 | 1 | -5/+1 |
| | |||||
* | Initial shot at write_pages widget | Thomas Willingham | 2013-08-10 | 1 | -1/+14 |
| | |||||
* | Observer permissions (but not ACL yet) for webpages. | Thomas Willingham | 2013-07-16 | 1 | -0/+11 |
| | |||||
* | Make sure we load the channel theme when displaying a page. | Thomas Willingham | 2013-07-12 | 1 | -1/+18 |
| | |||||
* | progress on tag delivery | friendica | 2013-02-11 | 1 | -1/+1 |
| | |||||
* | pages sorta working | friendica | 2013-01-15 | 1 | -1/+1 |
| | |||||
* | progress on pages - they're still getting lost inside conversation(), but ↵ | friendica | 2013-01-14 | 1 | -1/+3 |
| | | | | progress is progress. | ||||
* | add page module | friendica | 2013-01-12 | 1 | -0/+42 |