25511 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	626709159f	Some cleaning up	2019-05-06 18:46:30 +00:00
Hypolite Petovan	14f65b968a	Merge pull request #7111 from nupplaphil/bug/admin_loglevel_tpl ... remove superfluous tpl action	2019-05-06 14:44:34 -04:00
Philipp Holzer	8ac1cf926c	remove superfluous tpl action	2019-05-06 20:40:53 +02:00
Philipp	cd3bda3e0e	Merge pull request #7108 from friendica/MrPetovan-router-vertical-bar ... Remove remaining disallowed vertical bar in Router	2019-05-06 19:51:12 +02:00
Hypolite Petovan	afb0c7b8fd	Remove remaining disallowed vertical bar in Router	2019-05-06 13:41:48 -04:00
Hypolite Petovan	41642061d7	Merge pull request #7107 from nupplaphil/bug/mod_fix_routes ... Fix contact/group routes	2019-05-06 13:15:29 -04:00
Philipp Holzer	f497261ec0	added 'updateprofile'	2019-05-06 19:08:15 +02:00
Philipp Holzer	53d13f4e4a	Fix contact routes	2019-05-06 18:57:50 +02:00
Hypolite Petovan	20c9d5fe1d	Merge pull request #7103 from nupplaphil/task/mod_smilies ... Move mod/smilies to src/Module/Smilies	2019-05-06 12:53:45 -04:00
Philipp Holzer	97f02c2670	Move Smilies::getList() into if	2019-05-06 18:46:37 +02:00
Philipp	097ef9b326	Merge pull request #7105 from tobiasd/missingSubject ... The email for a successful DB structure update was missing a subject line as well	2019-05-06 12:00:12 +02:00
Tobias Diekershoff	959054f2f2	Add subject to DB Update email	2019-05-06 11:13:38 +02:00
Philipp Holzer	23158bc3c8	add feedback	2019-05-06 08:27:57 +02:00
Michael	37f9af2f24	Merge remote-tracking branch 'upstream/develop' into separated-confirm	2019-05-06 05:54:51 +00:00
Michael	5da3e17a12	The follow confirmation process is now separated between DFRN and the rest	2019-05-06 05:46:13 +00:00
Philipp	14d8c12130	Merge pull request #7092 from MrPetovan/task/7047-theme-error-page ... Add style to exception page	2019-05-06 07:33:42 +02:00
Hypolite Petovan	bd604d1cfb	Merge pull request #7084 from nupplaphil/task/mod_removetag ... Move mod/filerm to src/Module/Filer/RemoveTag	2019-05-05 20:36:38 -04:00
Hypolite Petovan	fbf36d6e7f	Merge pull request #7086 from nupplaphil/task/mod_maintenance ... Move mod/maintenance to src/Module/Maintenance	2019-05-05 20:36:12 -04:00
Hypolite Petovan	b79201beaf	Merge pull request #7102 from nupplaphil/task/mod_pretheme ... Move mod/pretheme to src/Module/ThemeDetails	2019-05-05 20:33:21 -04:00
Hypolite Petovan	1e6affada1	Merge pull request #7101 from nupplaphil/task/mod_viewsrc ... Move mod/viewsrc to src/Module/ItemBody	2019-05-05 20:32:42 -04:00
Hypolite Petovan	bb8d297ae4	Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing ... Fixings for Mod-Refactorings	2019-05-05 20:28:57 -04:00
Hypolite Petovan	12b6ab9943	Merge pull request #7100 from nupplaphil/task/mod_robots_txt ... Move mod/robots_txt to src/Module/RobotsTxt	2019-05-05 14:23:10 -04:00
Hypolite Petovan	8af0ae171e	Merge pull request #7083 from nupplaphil/task/mod_friendica ... Move mod/friendica to src/Module/Friendica	2019-05-05 14:19:57 -04:00
Michael Vogel	fb563e0495	Merge pull request #7099 from nupplaphil/task/mod_modexp ... Move mod/modexp to src/Module/PublicRSAKey	2019-05-05 19:49:51 +02:00
Philipp Holzer	e90876cd86	Move mod/smilies to src/Module/Smilies	2019-05-05 19:39:02 +02:00
Philipp	b29cacbbdb	Merge pull request #7098 from annando/notices ... Fixes "parent-guid" notice - finally	2019-05-05 19:26:25 +02:00
Philipp Holzer	3f71a51d21	Move mod/pretheme to src/Module/ThemeDetails	2019-05-05 19:24:10 +02:00
Philipp Holzer	49a3179578	Move mod/viewsrc to src/Module/ItemBody	2019-05-05 19:15:33 +02:00
Philipp Holzer	510c150156	Move mod/robots_txt to src/Module/RobotsTxt	2019-05-05 19:06:51 +02:00
Philipp Holzer	9f0bbd96be	Move mod/modexp to src/Module/PublicRSAKey	2019-05-05 19:02:19 +02:00
Philipp Holzer	039f9490dd	Optimized Profile::searchProfiles & Bugfix Contact::getProbeDataFromDatabase	2019-05-05 18:40:36 +02:00
Philipp Holzer	f6af90fa32	Create XML output for RSD with XML::fromArray()	2019-05-05 18:15:39 +02:00
Philipp Holzer	440d0a3a63	Rename BookMarklet to Bookmarklet	2019-05-05 17:59:57 +02:00
Michael	0244a231d5	Fixes "parent-guid" notice - finally	2019-05-05 15:48:57 +00:00
Philipp Holzer	5d1a12d9b3	add feedback	2019-05-05 17:02:17 +02:00
Philipp Holzer	06ce74c7c9	add feedback	2019-05-05 17:01:51 +02: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
Hypolite Petovan	1e2d9e0bd4	Add EOF EOL to view/global.css	2019-05-05 08:14:55 -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