304 commits

Author	SHA1	Message	Date
zotlabs	532def0244	bearcaps and other stuff	2019-08-15 23:53:02 -07:00
zotlabs	27c71dcaa5	cleanup	2019-07-18 20:38:36 -07:00
zotlabs	89af6ee5ff	port photo lib updates	2019-04-15 23:43:06 -07:00
zotlabs	2db3efddf5	finish moving html5 parser to composer	2019-04-15 22:08:08 -07:00
zotlabs	3c645174b9	Merge branch 'dev' of ../p3 into dev	2019-03-17 16:34:54 -07:00
zotlabs	8e6e157be8	use php_eol in all mail functions	2019-03-17 16:32:21 -07:00
zotlabs	6b09cdfbaf	Revert "use CRLF for all email headers" ... This reverts commit fe89b8d137.	2019-03-16 15:12:57 -07:00
zotlabs	6eb1aa277a	Revert "use CRLF for all email headers" ... This reverts commit fe89b8d137.	2019-03-16 15:12:41 -07:00
zotlabs	84a99f9d6f	Merge branch 'dev' of ../p3 into dev	2019-03-16 13:46:43 -07:00
zotlabs	06852de396	fix max line length calculation in email_header_encode	2019-03-16 13:46:05 -07:00
zotlabs	fe89b8d137	use CRLF for all email headers	2019-03-16 13:44:43 -07:00
zotlabs	27889aaa06	stupid typo	2019-03-07 20:15:03 -08:00
zotlabs	8a43ee8fa8	changes from upstream	2019-03-07 20:13:33 -08:00
zotlabs	880579f249	change repo locations	2019-02-11 15:55:07 -08:00
zotlabs	f81d2f08d1	cleanup	2019-01-17 15:12:58 -08:00
zotlabs	66e0c61ebb	separate blacklisting availability for public streams and general communications	2019-01-05 14:47:21 -08:00
zotlabs	e47bc21034	crypto: switch to Keyutils - please review	2018-12-14 12:46:03 -08:00
zotlabs	c3583e22a4	relocate	2018-12-13 14:28:38 -08:00
zotlabs	6dc45a9644	fix wildcard blacklist checking	2018-11-20 21:50:41 -08:00
zotlabs	5ea011b0ce	remove the spoiler blocks	2018-11-11 17:44:01 -08:00
zotlabs	a4088ec4bf	more repair of malformed xchan storage	2018-11-08 17:02:04 -08:00
zotlabs	b20032a61d	compatibility fix for prismo 'Page' types and fix from upstream for scaled images	2018-11-01 16:53:45 -07:00
zotlabs	e6d8fe98e1	reduce the curl logging info to the important stuff	2018-10-11 21:18:02 -07:00
zotlabs	c9bcde817a	the rest of the bits	2018-10-10 17:58:51 -07:00
zotlabs	0bc76e85e4	Merge branch 'zap' into dev	2018-09-19 16:26:36 -07:00
zotlabs	d3b28b718c	Merge branch 'red' into dev	2018-09-18 20:51:38 -07:00
zotlabs	6d9b38dad8	discover issue	2018-09-16 22:05:04 -07:00
zotlabs	943edb4c14	simplify AP discovery	2018-09-16 21:42:41 -07:00
zotlabs	a3e3c93902	consistency	2018-09-16 01:17:25 -07:00
zotlabs	df7605435f	Merge branch 'zap' into dev	2018-09-15 16:21:00 -07:00
zotlabs	f58c244ba0	refactor include/follow	2018-09-15 16:13:44 -07:00
Max Kostikov	66bf55710e	Update network.php	2018-09-10 15:13:28 +02:00
zotlabs	896d25d7ae	ap discovery issues	2018-08-28 18:37:21 -07:00
zotlabs	301d79b4e2	For Osada, move activitypub into core.	2018-08-22 23:04:37 -07:00
zotlabs	248d20c347	Merge branch 'red'	2018-08-13 20:36:40 -07:00
zotlabs	5afe779ffc	prevent json-ld bombing, turn off browser autocomplete on channel sources creation	2018-08-11 16:16:54 -07:00
zotlabs	60014547a2	more cleanup of owa upgrade	2018-08-03 17:03:55 -07:00
zotlabs	62ea8564fa	owa issues	2018-08-03 16:03:16 -07:00
zotlabs	c6f34c7f80	more spring cleaning	2018-08-02 01:56:34 -07:00
zotlabs	a87d5aa730	Merge branch 'red' into red_merge	2018-07-30 18:22:25 -07:00
gia vec	149071bf0c	Update network.php ... (cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)	2018-07-30 09:48:24 +02:00
zotlabs	f7e9cd5a8f	SECURITY: sanitise vcard fields	2018-07-29 17:36:05 -07:00
zotlabs	5ec73e6862	Revert "Merge branch 'red'" ... This reverts commit 159f24afe3, reversing changes made to dd899418c1.	2018-07-29 17:17:33 -07:00
zotlabs	159f24afe3	Merge branch 'red'	2018-07-29 16:48:14 -07:00
zotlabs	2367d94a42	SECURITY: sanitise vcard fields	2018-07-28 15:33:20 -07:00
zotlabs	b3b6b813f2	upstream/downstream comment work	2018-07-11 18:02:25 -07:00
zotlabs	6bf88f10d2	move queue functions to Zotlabs/Lib	2018-07-02 22:43:41 -07:00
zotlabs	8222b02495	more zot6 heavy lifting	2018-06-24 18:54:29 -07:00
zotlabs	38a2493ed0	Merge branch 'red'	2018-06-07 18:44:05 -07:00
zotlabs	2c7597066c	update a number of links in the code	2018-06-06 17:12:20 -07:00