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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-08-01	5	-29/+31
\|\
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-07-31	8	-31/+26
\| \|\
\| * \|	typo	zotlabs	2017-07-30	1	-1/+1
\| * \|	modify connection edit display for channels with no address/webbie	zotlabs	2017-07-30	4	-15/+18
\| * \|	ensure we can work around the $is_http var in include/follow - this is left o...	zotlabs	2017-07-30	1	-14/+13
* \| \|	correct the logic for configs in app requirement	git-marijus	2017-08-01	2	-7/+26
\| \|/ \|/\|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-08-01	7	-31/+25
\|\ \
\| * \|	improve file_activity() a little	git-marijus	2017-07-31	3	-29/+9
\| * \|	db update to add index for item.obj_type	git-marijus	2017-07-31	4	-2/+16
\| \|/
* /	less badge more icon	Mario Vavti	2017-08-01	1	-0/+1
\|/
*	Merge remote-tracking branch 'mike/master' into dev	git-marijus	2017-07-31	2	-3/+16
\|\
\| *	provide a better "is_commentable" default for OStatus conversations that were...	zotlabs	2017-07-30	1	-1/+12
\| *	add options flag to bb_to_markdown so we can distinguish between diaspora use...	zotlabs	2017-07-30	1	-2/+4
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-07-29	8	-21/+40
\| \|\
* \| \|	disable file notifications on initial upload for now - it can behave funky wh...	git-marijus	2017-07-31	2	-4/+4
* \| \|	implement system configs as app requirement and add the pubstream app	git-marijus	2017-07-31	2	-4/+16
* \| \|	fix a bug where if multiple channels uploaded the same file to the same folde...	git-marijus	2017-07-30	1	-2/+4
* \| \|	ltrim $display_path in attach_store() to be consistent with attach_mkdir() an...	git-marijus	2017-07-30	2	-2/+4
* \| \|	another syntax error	git-marijus	2017-07-30	1	-1/+1
* \| \|	do not include ACTIVITY_OBJ_FILE obj_type in the ping/something query	git-marijus	2017-07-30	1	-2/+5
* \| \|	no need for jquery here	git-marijus	2017-07-30	2	-2/+8
* \| \|	Merge remote-tracking branch 'mike/master' into dev	git-marijus	2017-07-30	1	-1/+1
\|\\| \| \| \|/ \|/\|
\| *	missing quotes on string in network update_unseen	zotlabs	2017-07-29	1	-1/+1
* \|	implement file notification on initial upload and rename get_parent_cloudpath...	git-marijus	2017-07-29	5	-19/+26
* \|	close the apps-menu if the notifications-menu is open and vice versa	git-marijus	2017-07-29	3	-2/+14
\|/
*	make pubs notification available on small screens	git-marijus	2017-07-29	1	-2/+2
*	provide public stream notification also for not authenticated viewers	git-marijus	2017-07-29	2	-3/+8
*	switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network...	git-marijus	2017-07-29	1	-2/+2
*	fix notifications - item_notshown is set for likes, etc.	zotlabs	2017-07-29	1	-2/+3
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-07-28	11	-17/+110
\|\
\| *	filter by item_notshown instead of obj_type	git-marijus	2017-07-28	2	-5/+4
\| *	do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do no...	git-marijus	2017-07-28	2	-3/+6
\| *	initial notifications support for new shared files and new (since initial sit...	git-marijus	2017-07-28	9	-11/+102
\| *	version 2.7	git-marijus	2017-07-28	1	-1/+1
\| *	default to static updates if not local channel	git-marijus	2017-07-27	2	-2/+2
\| *	remove borders from navbar toggler	git-marijus	2017-07-27	1	-1/+1
\| *	Merge remote-tracking branch 'mike/master' into dev	git-marijus	2017-07-27	12	-220/+512
\| \|\
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-07-26	2	-3/+3
\|\\| \| \| \|/ \|/\|
\| *	move the active app code to include/nav.php - it is only relevant there	git-marijus	2017-07-26	2	-3/+3
* \|	issue with OStatus comments being propagated downstream	zotlabs	2017-07-26	1	-0/+15
* \|	remove activitypub components from core	zotlabs	2017-07-26	1	-182/+0
* \|	more work on signature algorithm choice	zotlabs	2017-07-26	1	-12/+16
* \|	improve the formatting of shares when converting from bbcode to markdown	zotlabs	2017-07-26	1	-0/+69
* \|	start to implement the code needed for verifying variable signature algorithms	zotlabs	2017-07-25	1	-15/+31
* \|	consolidate duplicated code	zotlabs	2017-07-25	1	-208/+59
* \|	sync key changes to clones	zotlabs	2017-07-25	2	-6/+111
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-07-25	21	-46/+61
\|\\|
\| *	version 2.5.10	git-marijus	2017-07-25	1	-1/+1
\| *	make local channel (not our own) nav menus appear similar to what we are used...	git-marijus	2017-07-25	2	-14/+14
\| *	add text-dark class to cat tagsinput	git-marijus	2017-07-22	1	-1/+1