21647 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	6dcad87ae8	make refresh packet work	2018-05-30 20:32:59 -07:00
zotlabs	1ef937834b	more work	2018-05-29 23:52:08 -07:00
zotlabs	e0a35392f7	more commits	2018-05-29 23:30:18 -07:00
zotlabs	111bb93462	basic communication	2018-05-29 21:08:52 -07:00
zotlabs	b88a683127	zot communications	2018-05-28 19:42:40 -07:00
zotlabs	aa57887dd5	Merge branch 'master' into zapp	2018-05-26 15:13:57 -07:00
zotlabs	3e184ef403	z6 permissions work	2018-05-26 15:12:02 -07:00
Mario Vavti	eb04dbc5ce	DB update to fix wrong hubloc_url for activitypub hublocs	2018-05-26 21:15:22 +02:00
Mario Vavti	33700e9cf4	differentiate between direct messages and followers-only messages	2018-05-25 15:29:59 +02:00
Mario Vavti	eebeb450c3	Merge remote-tracking branch 'mike/master' into dev	2018-05-25 12:34:59 +02:00
Mario Vavti	0fe449ba33	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2018-05-25 12:34:35 +02:00
zotlabs	cd4454100b	alternate fix for z_check_dns	2018-05-24 16:32:21 -07:00
Jeroen	fcd9e115c2	Finaly an update of Dutch language strings	2018-05-24 18:22:09 +02:00
git-marijus	cf00a9dbfc	Merge pull request #1190 from fadelkon/dev ... Update catalan translation for sources changes up to Apr 23rd 2018	2018-05-24 11:55:47 +02:00
git-marijus	bace238e9f	Merge pull request #1183 from galettesaucisse/patch-50 ... Create TermsOfService.md	2018-05-24 11:54:09 +02:00
git-marijus	7586bc9dcf	Merge pull request #1182 from galettesaucisse/patch-49 ... Create gdpr1.md	2018-05-24 11:53:50 +02:00
antil0pa	7a294c3843	Update remote_friends_common.tpl ... Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.	2018-05-24 11:50:35 +02:00
zotlabs	c9fb4fd070	start sorting the permission debacle	2018-05-23 22:50:33 -07:00
zotlabs	d101ea88ca	more zot6 work	2018-05-23 21:48:19 -07:00
fadelkon	ea17b46e94	Update catalan translation (both po and php) for sources changes up to Apr 23rd 2018, 07:35.	2018-05-24 03:59:01 +02:00
Mario Vavti	9cf8931136	paint the locks on private activitypub items red. their privacy model is "slightly" different from ours	2018-05-23 22:11:13 +02:00
zotlabs	afb29176a4	deal with db failure gracefully	2018-05-23 02:33:46 -07:00
zotlabs	27ce7c11bd	lots more zot6 work	2018-05-22 23:20:29 -07:00
zotlabs	9e44835cc9	Merge branch 'master' into zapp	2018-05-22 19:04:24 -07:00
zotlabs	76d8e59e9b	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2018-05-21 21:15:24 -07:00
zotlabs	1061027071	new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick	2018-05-21 20:17:17 -07:00
zotlabs	a403611ac9	update response types	2018-05-21 19:34:03 -07:00
zotlabs	2b3f931c85	oauth2 discovery per draft-ietf-oauth-discovery-10	2018-05-21 19:25:03 -07:00
zotlabs	9bf26cee6d	add hook 'get_system_apps'	2018-05-21 16:19:17 -07:00
zotlabs	d9066ef26b	not null violation oauth1	2018-05-21 13:37:55 -07:00
Mario Vavti	fff720c00d	address globbing issue in #1170	2018-05-21 20:01:03 +02:00
Galette Saucisse	7e26200510	Update gdpr1.md	2018-05-21 10:25:03 +02:00
Galette Saucisse	1dbf89362f	Update gdpr1.md	2018-05-21 10:22:19 +02:00
Galette Saucisse	cc1453a8de	Update gdpr1.md	2018-05-21 10:16:39 +02:00
Galette Saucisse	a8def37dcf	Create TermsOfService.md	2018-05-21 10:08:00 +02:00
Galette Saucisse	355a9ac7ee	Create gdpr1.md	2018-05-21 10:05:17 +02:00
Mario Vavti	a8274bbfb3	missing permission description	2018-05-21 09:25:57 +02:00
Mario Vavti	7dadbbbac7	bring jot reset to some more places	2018-05-21 09:13:14 +02:00
zotlabs	49f7d63290	first cut at a general purpose gdpr document. What we would like to do is use a conditional expression so that a site document will be loaded if it exists, and fallback to a project boiler plate document if it does not. This is an exercise for the community.	2018-05-20 23:40:10 -07:00
zotlabs	21230fb39a	Merge branch 'master' into zapp	2018-05-20 20:44:20 -07:00
zotlabs	a9e81abcf9	more z6 work	2018-05-20 20:42:31 -07:00
zotlabs	0044906fab	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	2018-05-20 20:19:11 -07:00
zotlabs	ac8706e919	pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint)	2018-05-20 20:15:19 -07:00
Mario	469809183d	update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180	2018-05-20 22:42:47 +02:00
zotlabs	8611e7f8a6	remove unused mindate parameter in the network/stream API method	2018-05-20 13:29:48 -07:00
Mario Vavti	55e1026c98	improve abconfig queries	2018-05-20 20:48:52 +02:00
Mario Vavti	9e1af2492f	more local_channel() is not string	2018-05-20 14:15:46 +02:00
Mario Vavti	4eb40528a9	local_channel() is not string	2018-05-20 14:07:30 +02:00
Mario Vavti	6ba77ce0e2	css fix	2018-05-20 13:47:05 +02:00
Mario Vavti	a256195767	remove preview on jot reset	2018-05-20 12:30:08 +02:00