Commit Graph

4130 Commits

Author SHA1 Message Date
redmatrix 0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
2015-05-10 13:26:44 -07:00
Mario Vavti ca36fce9a7 provide drop down submenu suggestions in edit mode 2015-05-10 21:17:37 +02:00
Mario Vavti 616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
redmatrix 90591bcbc9 missed one... 2015-05-06 22:56:08 -07:00
redmatrix 25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
redmatrix 75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
Mario Vavti 257c670d5c avoid double slash after editing layout 2015-05-06 12:16:53 +02:00
redmatrix c9ec4f46b6 for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts 2015-05-05 18:36:05 -07:00
redmatrix 5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
Mario Vavti 310d122901 disable voting in blocks, layouts and webpages 2015-04-29 21:36:53 +02:00
Mario Vavti e56b8fdfaf fix $noloc state in mod editwebpages 2015-04-29 16:45:05 +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
friendica e01873b4cf Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-24 15:01:59 -07:00
Mario Vavti b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02:00
Mario Vavti 2583cab469 add title to element array 2015-04-24 14:14:33 +02:00
Mario Vavti da0875a015 there is no key named term in this array 2015-04-24 12:43:41 +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 98b3d7d6ff reset route 2015-04-24 00:59:02 -07:00
friendica b3ac1cd993 mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. 2015-04-24 00:56:06 -07:00
friendica ca305f5421 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-23 21:29:27 -07:00
friendica 5ac177391b disconnect 2015-04-23 21:13:59 -07:00
Mario Vavti c696860cc5 webpages blocks fixes 2015-04-23 21:04:01 +02: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 b4dff3a9ff provide headings for blocks and layouts 2015-04-22 10:31:36 +02:00
Mario Vavti e58e8f3f75 bring lockstate to webpages 2015-04-21 23:08:54 +02:00
Mario Vavti 21704ecb93 bring lockview to menu items, slightly change the way /lockview is called 2015-04-21 22:45:54 +02:00
Mario Vavti 0bd9fe0b11 rework and hopefully improve webpage menu creation workflow 2015-04-21 10:05:26 +02:00
friendica 53339d19a3 issue #176, sender copy of item not obscured if using private mention 2015-04-20 20:14:07 -07:00
friendica a707e9b9f5 issue #178, searching for words such as 'data' would return private items regardless of their unobscured content. 2015-04-19 23:16:17 -07:00
friendica 9cc8b44579 issue #157, provide default directory sort order 2015-04-19 23:04:14 -07:00
Michael Johnston dadcfd3ff6 switch from IMG_XXX constants to IMAGETYPE_XXX constants 2015-04-19 18:06:42 -04:00
friendica 0883512e30 log this since we may need it to track down failures 2015-04-18 17:40:44 -07: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 10cc643f65 wording and css fixes 2015-04-16 23:46:12 +02:00
Mario Vavti 9addc4581e provide a separate input field for rpost attachments 2015-04-16 23:26:11 +02:00
Mario Vavti 90d3a6c02d make rpost respect default post permissions 2015-04-16 11:15:04 +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
mrjive a597c74b97 Update viewsrc.php
Adding the item ID to the item source view
2015-04-15 12:26:03 +02: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 89536ff88b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-14 16:22:59 -07:00
friendica 3a45206b99 default perms not being set in some cases 2015-04-14 16:22:33 -07: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 79b5fb5b58 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-04-14 11:50:34 +02:00
Mario Vavti bf2a97147e some more on webpages 2015-04-14 11:50:21 +02:00