19835 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
git-marijus	1f2482f6ab	correct the logic for configs in app requirement	2017-08-01 03:38:41 +02:00
zotlabs	9476c631b0	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-07-31 17:23:33 -07:00
Mario Vavti	10e459140b	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-08-01 02:12:52 +02:00
Mario Vavti	b66cd8363e	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2017-08-01 00:57:15 +02:00
Mario Vavti	376b05bcc9	less badge more icon	2017-08-01 00:56:59 +02:00
Mario Vavti	2fcbbfe3d4	Merge remote-tracking branch 'mike/master' into dev	2017-07-31 17:34:26 +02:00
git-marijus	9ec995dbf0	improve file_activity() a little	2017-07-31 16:59:43 +02:00
git-marijus	79a806f328	db update to add index for item.obj_type	2017-07-31 16:49:56 +02:00
zotlabs	445fa6825a	typo	2017-07-30 21:56:39 -07:00
zotlabs	e3c8e4f483	modify connection edit display for channels with no address/webbie	2017-07-30 21:55:28 -07:00
zotlabs	8f3a99ad1f	ensure we can work around the $is_http var in include/follow - this is left over from when the only non-webfinger connections we could make were RSS/Atom feeds.	2017-07-30 19:04:17 -07:00
git-marijus	126e06b32a	Merge remote-tracking branch 'mike/master' into dev	2017-07-31 02:47:24 +02:00
git-marijus	988371be0b	disable file notifications on initial upload for now - it can behave funky when uploading multiple small files at once	2017-07-31 02:35:46 +02:00
git-marijus	b4efe8ad8d	implement system configs as app requirement and add the pubstream app	2017-07-31 02:24:49 +02:00
zotlabs	964a02d684	provide a better "is_commentable" default for OStatus conversations that were fetched on the fly	2017-07-30 16:15:34 -07:00
zotlabs	40effa4417	add options flag to bb_to_markdown so we can distinguish between diaspora use and other use and ... therefore filter and adjust content selectively	2017-07-30 13:52:16 -07:00
git-marijus	35c05a3180	fix a bug where if multiple channels uploaded the same file to the same folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder	2017-07-30 19:46:52 +02:00
git-marijus	4a071b9a1c	ltrim $display_path in attach_store() to be consistent with attach_mkdir() and go to created folder after successfully creating one	2017-07-30 19:21:02 +02:00
git-marijus	ead80481b9	another syntax error	2017-07-30 18:01:01 +02:00
git-marijus	297057d2bd	do not include ACTIVITY_OBJ_FILE obj_type in the ping/something query	2017-07-30 17:49:35 +02:00
git-marijus	06bd540cfa	no need for jquery here	2017-07-30 10:45:59 +02:00
git-marijus	3451fe2d40	Merge remote-tracking branch 'mike/master' into dev	2017-07-30 07:41:46 +02:00
zotlabs	2ee0f769d9	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-07-29 15:42:33 -07:00
git-marijus	8161ec88e5	implement file notification on initial upload and rename get_parent_cloudpath() to get_cloud_url() which now includes the filename	2017-07-29 23:32:48 +02:00
git-marijus	7b992decd4	close the apps-menu if the notifications-menu is open and vice versa	2017-07-29 16:06:42 +02:00
zotlabs	9b9fe39839	missing quotes on string in network update_unseen	2017-07-29 04:47:55 -07:00
git-marijus	1f57a59618	make pubs notification available on small screens	2017-07-29 12:36:54 +02:00
git-marijus	5a1b850dd6	provide public stream notification also for not authenticated viewers	2017-07-29 12:24:03 +02:00
git-marijus	c4e0e20eb3	switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network since item_notshown is also used for likes	2017-07-29 11:37:35 +02:00
zotlabs	eedee6d0a1	fix notifications - item_notshown is set for likes, etc.	2017-07-29 01:58:34 -07:00
zotlabs	e316494e06	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-07-28 15:25:29 -07:00
git-marijus	4585e35b3e	filter by item_notshown instead of obj_type	2017-07-28 23:07:16 +02:00
git-marijus	9717d4502f	do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do not mark those read in /network	2017-07-28 23:01:39 +02:00
git-marijus	f9b342c87d	initial notifications support for new shared files and new (since initial site load) pubstream activity	2017-07-28 22:42:02 +02:00
git-marijus	5f7b2e7c17	version 2.7	2017-07-28 10:19:09 +02:00
git-marijus	179478a940	default to static updates if not local channel	2017-07-27 21:51:59 +02:00
git-marijus	41a6300d3c	remove borders from navbar toggler	2017-07-27 20:47:07 +02:00
git-marijus	9be4c4d6d1	Merge remote-tracking branch 'mike/master' into dev	2017-07-27 11:17:08 +02:00
zotlabs	d3a5911932	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-07-26 22:09:01 -07:00
zotlabs	dbbae4bac8	issue with OStatus comments being propagated downstream	2017-07-26 17:38:34 -07:00
zotlabs	9132b9c026	remove activitypub components from core	2017-07-26 16:39:13 -07:00
zotlabs	769f697ae3	more work on signature algorithm choice	2017-07-26 16:36:09 -07:00
zotlabs	7d891a54e7	improve the formatting of shares when converting from bbcode to markdown	2017-07-26 16:22:20 -07:00
git-marijus	e71cdf02a8	move the active app code to include/nav.php - it is only relevant there	2017-07-26 21:42:07 +02:00
zotlabs	7d82b5f28d	start to implement the code needed for verifying variable signature algorithms	2017-07-25 22:17:31 -07:00
zotlabs	eec2871680	consolidate duplicated code	2017-07-25 20:52:29 -07:00
zotlabs	029cf6395d	sync key changes to clones	2017-07-25 17:58:46 -07:00
zotlabs	08f15a6fc6	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-07-25 16:02:41 -07:00
zotlabs	c24cfbc62a	make signing methods variable and signable	2017-07-25 15:59:58 -07:00
git-marijus	caf077cbf8	version 2.5.10	2017-07-25 20:07:16 +02:00