19719 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
git-marijus	b4efe8ad8d	implement system configs as app requirement and add the pubstream app	2017-07-31 02:24:49 +02: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
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
git-marijus	5cc8837fb6	make local channel (not our own) nav menus appear similar to what we are used from remote channels	2017-07-25 20:06:01 +02:00
zotlabs	ddecbf052e	new field names did not get saved	2017-07-24 22:45:50 -07:00
zotlabs	6a7fa6bf54	provide a keychange operation to rebase an identity on a new keypair	2017-07-24 20:23:00 -07:00
zotlabs	5ed4ed2246	suppress fopen errors from dav	2017-07-23 19:54:32 -07:00
git-marijus	72ed290ccd	add text-dark class to cat tagsinput	2017-07-22 16:23:41 +02:00
git-marijus	16067db718	show the right conversation active and do not show any conversation active if we compose a new one	2017-07-22 12:46:02 +02:00
git-marijus	363d872326	Merge remote-tracking branch 'mike/master' into dev	2017-07-22 12:08:47 +02:00
git-marijus	f4a4d70149	indicate the selected channel in the dropdown menu and minor css fixes	2017-07-22 12:01:13 +02:00
git-marijus	4335e49381	more nav_set_selected	2017-07-22 11:04:18 +02:00
zotlabs	992f8272d3	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2017-07-21 16:20:50 -07:00
git-marijus	27678a523c	more nav_set_selected apps	2017-07-21 22:36:47 +02:00
git-marijus	1bdcfe5219	provide a mechanism to mark apps active in the bin	2017-07-21 10:32:21 +02:00
zotlabs	89d21c0873	begin the tedious process of mapping activities between AS1, zot, and AS2	2017-07-20 22:55:04 -07:00
zotlabs	23e2b3be09	allow wildcard tag searches in search module also	2017-07-20 18:30:48 -07:00
zotlabs	a346399fe6	allow wildcard tag and category searches	2017-07-20 18:11:47 -07:00
git-marijus	8e5c56dcc2	more css fixes	2017-07-20 12:03:54 +02:00