23664 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philipp	b29cacbbdb	Merge pull request #7098 from annando/notices ... Fixes "parent-guid" notice - finally	2019-05-05 19:26:25 +02:00
Michael	0244a231d5	Fixes "parent-guid" notice - finally	2019-05-05 15:48:57 +00:00
Philipp	2bf8590bd4	Merge pull request #7096 from annando/notices ... Fixes notices	2019-05-05 17:00:06 +02:00
Michael	f3cae4bf0c	Fixes notices	2019-05-05 14:12:43 +00:00
Hypolite Petovan	e17db489ee	Merge pull request #7095 from annando/ap-connect ... Switching from legacy DFRN connect to ActivityPub	2019-05-05 09:37:43 -04:00
Hypolite Petovan	155d541860	Merge pull request #7093 from nupplaphil/bug/mod_home ... Bugfixing Home	2019-05-05 08:36:37 -04:00
Hypolite Petovan	c830e4b300	Merge pull request #7091 from nupplaphil/task/mod_rsd ... Move mod/rsd_xml to src/Module/ReallySimpleDiscovery	2019-05-05 08:30:06 -04:00
Michael	bdf1e7ebfd	Improved protocol storing	2019-05-05 11:53:17 +00:00
Michael	b6000b3395	Storing the protocol while following a contact	2019-05-05 11:19:30 +00:00
Michael	74a25707e1	Filling the protocol on ap contact action	2019-05-05 11:02:19 +00:00
Michael	c66927a12b	Updated database sql description	2019-05-05 10:40:02 +00:00
Michael	0efab157c4	Reverted storing the protocol at all the time	2019-05-05 10:36:51 +00:00
Michael Vogel	2365193691	AP: Support of request messages	2019-05-05 11:17:45 +02:00
Philipp Holzer	dc9c9040e5	Bugfixing Home	2019-05-05 10:47:08 +02:00
Philipp Holzer	1a79a741f0	include feedback	2019-05-05 10:09:08 +02:00
Hypolite Petovan	0046e62077	Merge pull request #7090 from nupplaphil/task/mod_like ... Move mod/like to src/Module/Like	2019-05-04 22:02:48 -04:00
Hypolite Petovan	0a8a614608	Merge pull request #7089 from nupplaphil/task/mod_help ... Move mod/help to src/Module/Help	2019-05-04 22:02:38 -04:00
Hypolite Petovan	3118453fb9	Merge pull request #7088 from nupplaphil/task/mod_invite ... Move mod/invite to src/Module/Invite	2019-05-04 19:30:13 -04:00
Philipp Holzer	a1f332aaa5	Move mod/rsd_xml to src/Module/ReallySimpleDiscovery	2019-05-04 21:37:32 +02:00
Philipp Holzer	15d0913226	fix quotes	2019-05-04 21:25:16 +02:00
Philipp Holzer	aeae65daf8	Move mod/like to src/Module/Like	2019-05-04 21:20:39 +02:00
Philipp Holzer	1d106762da	Move mod/help to src/Module/Help	2019-05-04 21:06:08 +02:00
Philipp Holzer	bacf9825ff	Move mod/invite to src/Module/Invite	2019-05-04 20:32:31 +02:00
Hypolite Petovan	74fda8f390	Merge pull request #7085 from nupplaphil/task/mod_home ... Move mod/home to src/Module/Home	2019-05-04 14:09:54 -04:00
Philipp Holzer	35d4daa4f9	Kept the hook, ditched the init	2019-05-04 16:26:32 +02:00
Hypolite Petovan	5e3a55915d	Merge pull request #7078 from nupplaphil/task/mod_fetch ... Move mod/fetch to src/Module/Diaspora/Fetch	2019-05-04 08:47:23 -04:00
Philipp Holzer	708ffaff51	Move mod/home to src/Module/Home	2019-05-04 13:08:31 +02:00
Philipp Holzer	6ff3389f6e	add status code to System::externalRedirect	2019-05-04 09:16:37 +02:00
Philipp Holzer	21aa82e064	Add redirect for fetch	2019-05-03 15:08:50 +02:00
Hypolite Petovan	41401bb18d	Merge pull request #7077 from nupplaphil/task/mod_nogroup ... Move mod/nogroup to src/Module/Group	2019-05-03 08:54:04 -04:00
Philipp Holzer	2b4c710e3f	Move mod/fetch to src/Module/Fetch	2019-05-03 10:42:40 +02:00
Philipp Holzer	1ef4b9c7e4	Move mod/nogroup to src/Module/Group	2019-05-03 08:50:17 +02:00
Philipp	c9cce8492e	Merge pull request #7000 from MrPetovan/task/6999-no-probe-magic-link ... Remove probing in magic link construction	2019-05-03 08:43:26 +02:00
Michael Vogel	33931ff15e	Corrected order	2019-05-03 08:13:02 +02:00
Michael	30a6211d5c	Merge branch 'ap-connect' of github.com:annando/friendica into ap-connect	2019-05-03 05:55:19 +00:00
Michael	b1222e174e	Ensure that an existing contact isn't archived or pending	2019-05-03 05:54:40 +00:00
Philipp	900fe158f5	Merge pull request #7076 from MrPetovan/bug/fix-proxy-router ... Fix Proxy module routes	2019-05-03 07:31:30 +02:00
Michael Vogel	56d2df04f0	Don't switch Friendica contacts to AP	2019-05-03 07:10:02 +02:00
Michael Vogel	6c34196264	Cleaning confirm	2019-05-03 06:17:26 +02:00
Michael Vogel	949fd1e8bf	Fixes undefined variable	2019-05-03 06:01:01 +02:00
Hypolite Petovan	70bef12fd2	Fix Proxy module routes ... - Fix EOL in view/templates/exception.tpl	2019-05-02 21:35:37 -04:00
Hypolite Petovan	cd41efe29d	Merge pull request #7071 from nupplaphil/task/mod_bookmarklet ... Move mod/bookmarklet to src/Module/BookMarklet	2019-05-02 20:03:26 -04:00
Hypolite Petovan	8010ccdc21	Merge pull request #7072 from nupplaphil/task/mod_directory ... Move mod/directory to src/Module/Directory	2019-05-02 20:03:13 -04:00
Hypolite Petovan	d48b100f78	Merge pull request #7069 from nupplaphil/task/mod_allfriends ... Move mod/allfriends to src/Module/AllFriends	2019-05-02 20:03:05 -04:00
Hypolite Petovan	4dcdc56e81	Merge pull request #7075 from nupplaphil/task/move_console_namespace ... Move Console namespace one level up	2019-05-02 18:01:06 -04:00
Philipp	97f723e09e	Merge pull request #7074 from MrPetovan/task/move-display-to-src ... Remove support for defunct Friendica F-Droid app	2019-05-02 23:55:54 +02:00
Philipp Holzer	83e5fe2539	added url for magic link again	2019-05-02 23:39:20 +02:00
Philipp	d60edb5056	Merge pull request #7073 from MrPetovan/task/7047-theme-error-page ... Remove usage of non-existent Module\Special\HTTPException::rawContent return value	2019-05-02 23:36:33 +02:00
Philipp Holzer	c685ce3db1	Fixed Forbidden message.	2019-05-02 23:35:52 +02:00
Philipp Holzer	43a0f2d8d7	fixed alignment :-)	2019-05-02 23:35:01 +02:00