harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,389 Commits 6 Branches 36 Tags
develop
Commit Graph

8246 Commits

Author SHA1 Message Date
redmatrix d6f98e6511 product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons. 2015-05-13 16:01:00 -07:00
redmatrix 018e702281 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/nl/strings.php
 2015-05-12 19:00:54 -07:00
redmatrix 1e0e812440 provide a method for loading site/custom widgets 2015-05-12 18:11:54 -07:00
redmatrix 1970670596 replace project name with $product or $Product in strings to avoid merge issues across different project names. Currently a place-holder. The strings themselves have not yet been modified. 2015-05-12 17:06:47 -07:00
redmatrix f2a0dac653 fix a couple of miscellaneous errors which showed up in the logs 2015-05-11 22:57:12 -07:00
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
redmatrix 2cb8b19972 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-10 13:18:04 -07:00
redmatrix 3140650b8f rev update 2015-05-10 13:17:41 -07:00
Mario Vavti 70e5bf04e1 uid > channel id to make submenus visible for observers 2015-05-10 21:52:48 +02:00
Mario Vavti 616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
redmatrix 37a63365f1 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-07 16:44:28 -07:00
Mario Vavti cd8ecb8649 provide wrap variable for comanche menus 2015-05-07 23:02:14 +02:00
Mario Vavti 4f235de3c5 provide a possibility to include js/css libs 2015-05-07 13:26:14 +02:00
Mario Vavti 8ca10dcbab adjust icon size 2015-05-07 10:35:22 +02:00
redmatrix 90591bcbc9 missed one... 2015-05-06 22:56:08 -07:00
redmatrix d01206af5a forgot to save 2015-05-06 21:43:52 -07:00
redmatrix e85593e970 Hopefully this will make item_cache the default 2015-05-06 21:43:15 -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
redmatrix f17c1f9694 no need to obscure the diaspora signature if we're not obscuring the posts 2015-05-06 18:38:30 -07:00
Mario Vavti 9391f6f905 allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with 2015-05-06 10:53:26 +02:00
redmatrix 245080a6d7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-05 19:24:35 -07:00
redmatrix f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07: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 ad7a629b96 remove obsolete linebreak 2015-05-04 15:04:21 +02:00
friendica b467dc4f00 Merge branch 'master' into tres 2015-05-01 13:19:19 -07:00
friendica e4fe068ed5 more performance work 2015-04-30 18:16:54 -07:00
friendica 9fc87d43c9 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-30 17:53:47 -07:00
friendica 097002910e just a test, please do not try to implement this as there are severe security issues 2015-04-30 17:52:34 -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 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
friendica 268307b534 zotfeed issues 2015-04-24 15:01:37 -07:00
Mario Vavti cc3c1107bd add widget class to blocks again by default. we have the wrap variable now to remove the div wrapper if necessary. 2015-04-24 22:41:56 +02:00
Mario Vavti b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02: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 41343b32c5 block unfederated posts from zot_feed 2015-04-23 21:45:42 -07:00
friendica 5ac177391b disconnect 2015-04-23 21:13:59 -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
Mario Vavti 9e490d022b fix webpage perms 2015-04-22 12:00:15 +02:00
friendica 2cef6c3ac5 use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos. 2015-04-21 21:41:39 -07:00
friendica 6bc2766d79 issue #162 2015-04-20 20:49:55 -07:00
friendica 53339d19a3 issue #176, sender copy of item not obscured if using private mention 2015-04-20 20:14:07 -07:00
friendica 3eeea9d8f0 force event obj_type on update 2015-04-20 17:02:45 -07:00
friendica 9cc8b44579 issue #157, provide default directory sort order 2015-04-19 23:04:14 -07:00
friendica 4383564777 doco updates 2015-04-19 21:39:45 -07:00
friendica d5f4a19a77 add favorites/create and destroy to api 2015-04-19 20:37:24 -07:00