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

	Commit message (Expand)	Author	Age	Files	Lines
*	merge from redmatrix	redmatrix	2015-07-13	1	-1/+1
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-13	2	-1/+23
\|\
\| *	change account_default_channel if default channel is removed	zottel	2015-07-13	1	-0/+18
\| *	Only let local logins install webpage elements	redmatrix	2015-07-11	1	-1/+5
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-10	2	-2/+2
\|\\|
\| *	increase width of the aside area and make default profile image size 300x300	Mario Vavti	2015-07-09	1	-1/+1
\| *	fix typo to make directory safe mode default to on work again	Mario Vavti	2015-07-08	1	-1/+1
* \|	inconsistent naming of block item types	redmatrix	2015-07-08	1	-1/+1
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-07	3	-46/+21
\|\\|
\| *	fix sorting of channel suggestions	Mario Vavti	2015-07-07	1	-1/+1
\| *	rename function get_directory_settings => get_directory_setting and move sort...	Mario Vavti	2015-07-07	2	-21/+5
\| *	make public forums only setting sticky and simplify function to get directory...	Mario Vavti	2015-07-07	2	-29/+17
\| *	code style correction	Mario Vavti	2015-07-07	1	-3/+2
\| *	make directory suggest work with directory options	Mario Vavti	2015-07-07	2	-3/+7
* \|	incorrect value for hubloc_deleted in zot_get_hublocs() query	redmatrix	2015-07-07	1	-1/+1
* \|	more work on db storage of doco	redmatrix	2015-07-05	2	-2/+4
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-03	1	-1/+0
\|\\|
\| *	in hubzilla we're going to convert doco to items. define it here so that an a...	redmatrix	2015-07-03	1	-2/+5
* \|	start doco cleanup	redmatrix	2015-07-03	1	-0/+2
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-02	2	-1/+14
\|\\|
\| *	a few clone sync fixes as well as some work on hubzilla clone sync back to re...	redmatrix	2015-07-02	2	-0/+36
* \|	sync abook entries from redmatrix	redmatrix	2015-07-02	1	-0/+21
\|\\|
\| *	provide backward compatibility with hubzilla extended item export	redmatrix	2015-07-01	1	-0/+55
* \|	provide compatibility with redmatrix extended item export	redmatrix	2015-07-01	1	-3/+50
* \|	lots of work on clone/import from redmatrix to hubzilla (won't go back the ot...	redmatrix	2015-06-30	1	-3/+2
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-29	2	-0/+6
\|\\|
\| *	turn the connection filter into a feature.	redmatrix	2015-06-29	2	-0/+6
* \|	fix the postgres schema with all the changes to date	redmatrix	2015-06-29	1	-2/+1
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-29	2	-1/+100
\|\\|
\| *	some prep work	redmatrix	2015-06-29	2	-1/+100
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	2	-17/+94
\|\\|
\| *	no this isn't it. well ok, it's part of it, but not the important part. it's ...	redmatrix	2015-06-28	2	-17/+93
* \|	bring single instance file storage to dav and cloud uploaded photos	redmatrix	2015-06-27	2	-8/+28
* \|	undo the disabling of browser_prefetch and for the time being revert the HTML...	redmatrix	2015-06-25	2	-53/+39
* \|	remove all QR-code stuff from core - now in qrator addon	redmatrix	2015-06-25	1	-14/+0
* \|	localise event calendar	redmatrix	2015-06-25	2	-55/+114
* \|	more work on photos, including os_storage for the size '0' photo and numberin...	redmatrix	2015-06-23	3	-15/+67
* \|	more work on mail flags	redmatrix	2015-06-23	5	-23/+18
* \|	item flag fixes discovered after a few merges	redmatrix	2015-06-23	5	-28/+9
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-23	2	-3/+30
\|\\|
\| *	ensure we always sign a trimmed item body.	redmatrix	2015-06-22	1	-3/+3
\| *	discovered a couple of loose ends in the per-member enable diaspora setting	redmatrix	2015-06-22	1	-0/+26
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-21	3	-11/+156
\|\\|
\| *	some diaspora import issues uncovered during dry-run tests	redmatrix	2015-06-21	1	-6/+4
\| *	Merge pull request #352 from solstag/store_update_fix	redmatrix	2015-06-21	1	-9/+10
\| \|\
\| \| *	Make item_store_update only affect the data we requested	Alexandre Hannud Abdo	2015-06-20	1	-9/+10
\| * \|	ensure the photo driver is included	redmatrix	2015-06-20	1	-0/+1
\| * \|	import_diaspora - incorrect method for importing channel photo, and add dupli...	redmatrix	2015-06-20	1	-20/+42
\| * \|	wrong logic	redmatrix	2015-06-19	1	-1/+1
\| * \|	import_diaspora - a few more atypical settings	redmatrix	2015-06-19	1	-3/+19