32070 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	458e26b00a	Link to displayed contact URL no matter the "Stay local" setting value	2021-09-14 17:39:03 -04:00
Hypolite Petovan	da869260ef	Merge pull request #10711 from annando/indentation ... Fixed indendation	2021-09-14 17:30:11 -04:00
Hypolite Petovan	44ec4de14c	Use CSRF token as name and value for contact deletion confirm form	2021-09-14 17:28:42 -04:00
Hypolite Petovan	06b8f93eae	Add support for specific confirm value in confirm.tpl ... - button tags allow for a different value from the label	2021-09-14 17:28:07 -04:00
Hypolite Petovan	3068cb5788	[frio] Fix contact deletion modal URL concatenation ... - The deletion URL now has an initial query string parameter in the form of a CSRF token	2021-09-14 17:27:16 -04:00
Michael	7a51a7f6c6	Avoid duplicated filed posts	2021-09-14 21:27:09 +00:00
Michael Vogel	a689db7b64	Update src/Protocol/ActivityPub.php ... Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>	2021-09-14 23:22:57 +02:00
Michael	b18f92ea72	Fixed indendation	2021-09-14 20:46:59 +00:00
Hypolite Petovan	39e4ab89fa	Merge pull request #10708 from annando/peertube-videos ... Better handling of displaying peertube videos	2021-09-14 15:34:30 -04:00
Michael Vogel	67a2444bc8	Merge pull request #10709 from tobiasd/20210914-hu ... HU translation updated THX Balázs Úr	2021-09-14 18:59:31 +02:00
Tobias Diekershoff	f0b589f6d7	HU translation updated THX Balázs Úr	2021-09-14 18:09:09 +02:00
Michael	f99c4ca704	Removing unused variable	2021-09-14 08:08:50 +00:00
Michael	72fa4e9970	Better handling of displaying peertube videos	2021-09-14 07:52:53 +00:00
Tobias Diekershoff	c3172cf3cb	Merge pull request #10707 from annando/issue-10706 ... Issue 10706: Publish public custom fields in AP	2021-09-14 06:54:48 +02:00
Michael	d33fea1993	Fix: Use the $uid	2021-09-14 02:00:40 +00:00
Michael	e3413cf959	Issue 10706: Publish public custom fields in AP	2021-09-14 01:28:58 +00:00
Michael	2926282f8d	More fields added to "user-contact"	2021-09-13 14:20:20 +00:00
Michael	5abc1543fd	Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact	2021-09-13 12:31:30 +00:00
Michael Vogel	c8344886fd	Merge pull request #10703 from tobiasd/20210913-fr ... update FR translations THX MrPetovan	2021-09-13 14:29:06 +02:00
Tobias Diekershoff	a0c31fad84	update FR translations THX MrPetovan	2021-09-13 14:13:59 +02:00
Hypolite Petovan	d78661817e	Merge pull request #10693 from nupplaphil/feat/config_dir ... Add the possibility to use a different configuration directory	2021-09-13 07:02:52 -04:00
Michael	84666a314a	Rearranged fields	2021-09-13 08:22:11 +00:00
Michael Vogel	399930e7a6	Merge pull request #10702 from tobiasd/20210913-deru ... DE, RU translation updates	2021-09-13 10:17:13 +02:00
Tobias Diekershoff	558e06ff5a	DE translation updates	2021-09-13 07:41:35 +02:00
Tobias Diekershoff	5f1016bb61	RU translations THX Alexander An	2021-09-13 07:41:26 +02:00
Michael	7c2913488c	Remove deprecated fields	2021-09-12 21:02:29 +00:00
Michael	0a01f0443e	Deprecated fields	2021-09-12 20:50:03 +00:00
Michael Vogel	e3fbc2d99f	Merge pull request #10701 from nupplaphil/bug/10699 ... Fixing #10699 (prohibits blocking and ignoreing from the photo menu)	2021-09-12 21:58:09 +02:00
Philipp	a65fbcebe7	Fixing #10699 (prohibits blocking and ignoreing from the photo menu)	2021-09-12 21:20:12 +02:00
Michael	3eea4b1130	Use "rel" for "self" instead of using a separate field	2021-09-12 19:04:27 +00:00
Michael	19c3e55ca8	Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact	2021-09-12 12:36:04 +00:00
Philipp	b7c262bee6	Fix test	2021-09-12 13:51:03 +02:00
Philipp	27e4586597	Move path determination logic into the ConfigFactory	2021-09-12 13:44:29 +02:00
Michael Vogel	5246b9c4b0	Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities ... Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses	2021-09-12 06:47:51 +02:00
Hypolite Petovan	e3a2f17f9f	Merge pull request #10696 from annando/photo-type ... Use post type "photo" for multiple photos as well	2021-09-12 00:19:47 -04:00
Hypolite Petovan	9ab217c6e5	Merge pull request #10695 from annando/commenting ... Fix commenting on public posts	2021-09-12 00:19:10 -04:00
Hypolite Petovan	8e99b7f775	Refine BBCode::expandTags regular expression ... - Now requires the tag to be preceded by either a non-word character or a start of a line - Added corresponding tests	2021-09-12 00:06:14 -04:00
Hypolite Petovan	5a93bb6eff	Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses ... - We never need to expand tags inside of an already existing BBCode url tag	2021-09-12 00:05:22 -04:00
Michael	6579a3a106	Use post type "photo" for multiple photos as well	2021-09-12 01:58:29 +00:00
Michael	9191daf12f	Fix commenting on public posts	2021-09-12 01:52:10 +00:00
Michael Vogel	8628bd5228	Merge pull request #10694 from nupplaphil/bug/drone_gzip ... Fix drone artifact compression parameter	2021-09-11 21:36:50 +02:00
Philipp	ee0b8a9e60	Fix drone artifact compression parameter	2021-09-11 20:00:13 +02:00
Michael	eeec6aaeb9	Removed unused "use"	2021-09-11 13:02:36 +00:00
Michael	1e123ace12	Only fetch, not probe	2021-09-11 13:00:12 +00:00
Michael	10cb52bc00	Only add user contacts, alternate way to fetch public contact id	2021-09-11 12:43:46 +00:00
Philipp	5702944116	Add the possibility to use a different configuration directory	2021-09-11 14:33:26 +02:00
Michael	5113987031	Added update function to add user-contact entry	2021-09-11 07:59:46 +00:00
Tobias Diekershoff	c40b3411a7	Merge pull request #10689 from MrPetovan/bug/fatal-errors ... [frio] Use correct admin endpoint for block/deletion in Admin\Users\Active	2021-09-11 07:51:11 +02:00
Michael	f33a98578d	Capitalization	2021-09-10 23:59:33 +00:00
Michael	b170dd765d	Insert and update some more fields	2021-09-10 20:53:10 +00:00