volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	consensus items not working correctly and make the collections widget abide ↵	redmatrix	2015-05-18	2	-4/+8
\| \| \| \|	by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.
*	bring the new photo schema into play	redmatrix	2015-05-18	2	-24/+16
\|
*	fix some merge errors	redmatrix	2015-05-18	1	-1/+1
\|
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	1	-2/+9
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	if block title contains $content but $content title is empty do not show an ↵	Mario Vavti	2015-05-18	1	-1/+1
\| \| \| \| \| \| \| \|	empty <h3> tag
\| *	remove dbg code	Mario Vavti	2015-05-18	1	-2/+0
\| \|
\| *	allow block title to contain $content title	Mario Vavti	2015-05-18	1	-2/+11
\| \|
* \|	Merge branch 'master' into tres	redmatrix	2015-05-17	9	-45/+216
\|\ \
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-17	9	-45/+216
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
\| \| *	missing $	redmatrix	2015-05-17	1	-1/+1
\| \| \|
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-17	2	-32/+105
\| \| \|\
\| \| \| *	Merge pull request #322 from dawnbreak/master	redmatrix	2015-05-18	1	-0/+66
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \|	Add functions to parse and get some values from php.ini.
\| \| \| \| *	Add functions to parse and get some values from php.ini.	Klaus Weidenbach	2015-05-16	1	-0/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get upload limits from php.ini. These functions will be used for checking against upload limits and to give information in the frontend. Wasn't sure in which file to put these functions, so I created a new one include/environment.php.
\| \| \| * \|	Merge pull request #323 from dawnbreak/docu	redmatrix	2015-05-18	1	-32/+39
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add some more documentation to attach_store()
\| \| \| \| * \|	Add some more documentation to attach_store()	Klaus Weidenbach	2015-05-17	1	-32/+39
\| \| \| \| \|/
\| \| * \| /	Implement permission checking for OAuth clients using the xperm table. ↵	redmatrix	2015-05-17	3	-5/+95
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied.
\| \| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-17	1	-1/+8
\| \| \|\\|
\| \| \| *	allow a block to contain $content	Mario Vavti	2015-05-15	1	-1/+8
\| \| \| \|
\| \| * \|	more work isolating the projectname from core.	redmatrix	2015-05-17	3	-7/+7
\| \| \|/
* \| \|	Merge branch 'master' into tres	redmatrix	2015-05-14	24	-119/+234
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	6	-9/+9
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php include/api.php include/enotify.php
\| \| *	product was a bad string to use because we may require it for e-commerce, ↵	redmatrix	2015-05-13	6	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \|	and RED_PLATFORM is equally problematic for other reasons.
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-12	4	-4/+23
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/mitem.php view/nl/strings.php
\| \| *	provide a method for loading site/custom widgets	redmatrix	2015-05-12	1	-0/+3
\| \| \|
\| \| *	replace project name with $product or $Product in strings to avoid merge ↵	redmatrix	2015-05-12	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \|	issues across different project names. Currently a place-holder. The strings themselves have not yet been modified.
\| \| *	fix a couple of miscellaneous errors which showed up in the logs	redmatrix	2015-05-11	2	-2/+5
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-10	2	-2/+20
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-10	3	-8/+88
\| \| \|\
\| \| \| *	uid > channel id to make submenus visible for observers	Mario Vavti	2015-05-10	1	-3/+3
\| \| \| \|
\| \| \| *	provide ability to create submenus	Mario Vavti	2015-05-10	1	-1/+19
\| \| \| \|
\| \| * \|	rev update	redmatrix	2015-05-10	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-07	3	-5/+59
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	provide wrap variable for comanche menus	Mario Vavti	2015-05-07	2	-4/+18
\| \| \| \|
\| \| * \|	provide a possibility to include js/css libs	Mario Vavti	2015-05-07	1	-0/+40
\| \| \| \|
\| \| * \|	adjust icon size	Mario Vavti	2015-05-07	1	-1/+1
\| \| \| \|
\| * \| \|	missed one...	redmatrix	2015-05-06	1	-0/+2
\| \| \| \|
\| * \| \|	forgot to save	redmatrix	2015-05-06	1	-2/+0
\| \| \| \|
\| * \| \|	Hopefully this will make item_cache the default	redmatrix	2015-05-06	2	-14/+54
\| \| \| \|
\| * \| \|	convert ITEM_WALL from bitfield to standalone	redmatrix	2015-05-06	14	-49/+54
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-06	2	-2/+25
\| \|\\| \|
\| \| * \|	allow blocks to have custom classes and add a new template called zen which ↵	Mario Vavti	2015-05-06	1	-2/+10
\| \| \|/ \| \| \| \| \| \| \| \| \|	gives you an empty page to work with
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-05	1	-1/+1
\| \| \|\
\| \| * \|	turn consensus items into diaspora polls for that network	redmatrix	2015-05-05	1	-0/+15
\| \| \| \|
\| * \| \|	no need to obscure the diaspora signature if we're not obscuring the posts	redmatrix	2015-05-06	2	-6/+12
\| \| \| \|
\| * \| \|	for hubzilla we won't be obscuring items, only private mail, this will allow ↵	redmatrix	2015-05-05	2	-59/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	us to search and cache private posts
\| * \| \|	second pass name change	redmatrix	2015-05-05	2	-3/+3
\| \| \| \|
\| * \| \|	first pass name change	redmatrix	2015-05-05	13	-22/+22
\| \| \|/ \| \|/\|
\| * \|	remove obsolete linebreak	Mario Vavti	2015-05-04	1	-1/+1
\| \|/
* \|	Merge branch 'master' into tres	friendica	2015-05-01	2	-2/+28
\|\\|
\| *	more performance work	friendica	2015-04-30	1	-1/+9
\| \|