19200 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	bec46d7b01	Remove content warning processing in put_item_in_cache	2018-04-04 23:08:48 -04:00
Hypolite Petovan	180f7d8218	Add disabled_cw user setting	2018-04-04 23:08:47 -04:00
Hypolite Petovan	92332932c6	Merge pull request #4746 from annando/img-alt-text ... Added support of alt texts in images	2018-04-04 19:20:42 -04:00
Michael	08c85c425b	Added support of alt texts in images	2018-04-04 22:23:17 +00:00
Hypolite Petovan	1e6a4eb861	Merge pull request #4745 from annando/register-mess ... Fix: The register mail contained variables in a wrong order	2018-04-04 16:07:23 -04:00
Michael	1e8dd96938	Fix: The register mail contained variables in a wrong order	2018-04-04 19:56:34 +00:00
Hypolite Petovan	31cae67614	Merge pull request #4744 from annando/queue-improvements ... Queue: Better handling of return values of transmissions	2018-04-04 15:13:57 -04:00
Hypolite Petovan	16650733b6	Merge pull request #4742 from annando/negative-dates ... Avoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)"	2018-04-04 15:08:01 -04:00
Michael	3e6507441e	Queue: Better handling of return values of transmissions	2018-04-04 19:03:05 +00:00
Michael	211ba75b22	Avoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)"	2018-04-04 18:58:25 +00:00
Tobias Diekershoff	d5969c5e7d	Merge pull request #4740 from ben-utzer/systemd-example ... Systemd example unit files and readme	2018-04-04 12:07:23 +02:00
utzer	2bb4f2b57e	comment about user	2018-04-04 14:54:07 +05:30
utzer	9fdcc28fe1	systemd timer unit	2018-04-04 14:51:51 +05:30
utzer	630c808319	Merge pull request #8 from ben-utzer/patch-1 ... Patch 1	2018-04-04 14:48:03 +05:30
utzer	da40c96e9a	Merge pull request #7 from ben-utzer/patch-3 ... Patch 3	2018-04-04 14:46:45 +05:30
utzer	29f7ebe307	Merge pull request #2 from friendica/master ... Master	2018-04-04 14:36:32 +05:30
ben-utzer	00ceb4acd2	Readme extended for systemd unit files	2018-04-04 14:28:26 +05:30
ben-utzer	eb5404740a	.service file for systemd unit	2018-04-04 14:24:28 +05:30
ben-utzer	8a63fc5ca7	Addition of systemd timer/service	2018-04-04 14:16:05 +05:30
Tobias Diekershoff	64ea49788e	Merge pull request #4737 from annando/fix-public-comment ... Commenting on public posts from Friendica users is now possible again	2018-04-04 09:29:06 +02:00
Michael Vogel	46216190cf	Merge pull request #4736 from tobiasd/20180404-service ... consistent use of terms in heading in the admin panel	2018-04-04 08:11:48 +02:00
Michael	c16ae0bacb	Fix: Commenting on public posts from Friendica users is now possible again	2018-04-04 06:06:38 +00:00
Tobias Diekershoff	421517c611	consistent use of terms in heading in the admin panel	2018-04-04 07:22:05 +02:00
Hypolite Petovan	580b7f4e81	Merge pull request #4733 from tobiasd/20180403-pl ... update for PL translation THX waldis	2018-04-03 11:27:13 -04:00
Tobias Diekershoff	59fe47ccee	update for PL translation THX waldis	2018-04-03 17:19:18 +02:00
Hypolite Petovan	2cf35cd8f9	Merge pull request #4727 from tobiasd/20180402-register ... added TOS module	2018-04-03 10:39:53 -04:00
Tobias Diekershoff	0af5e54ef1	added hint about naming the class and filename	2018-04-03 16:33:39 +02:00
Tobias Diekershoff	4b7014d367	move the tos module to src/Module	2018-04-03 16:33:10 +02:00
Tobias Diekershoff	297ade6981	removed leftover from the used template	2018-04-03 15:49:54 +02:00
Hypolite Petovan	5a9cacb754	Merge pull request #4732 from annando/improve-delivery ... DFRN: Improvements to delivery. Logging and marking as not reachable	2018-04-03 08:39:59 -04:00
Michael	e7fb8c04dd	Don't always queue messages	2018-04-03 12:27:22 +00:00
Michael	1a2c771f24	DFRN: Improvements to delivery. Logging and marking as not reachable	2018-04-03 12:18:05 +00:00
Hypolite Petovan	b2a9fbc249	Merge pull request #4731 from tobiasd/20180403-lostpwd ... pass uid to notification system so securemail addon can pick it up	2018-04-03 07:14:01 -04:00
Tobias Diekershoff	03ed5e5649	forgot the 2nd mail	2018-04-03 12:47:38 +02:00
Tobias Diekershoff	d10cdfe942	pass uid to notofication system so securemail addon can pick it up	2018-04-03 12:45:27 +02:00
Michael Vogel	f7190ce971	Merge pull request #4729 from MrPetovan/task/4604-add-password-exposed-check ... [Composer] Bump divineomega/password_exposed version to 2.5.1	2018-04-03 07:56:36 +02:00
Hypolite Petovan	50f91862de	[Composer] Bump divineomega/password_exposed version to 2.5.1	2018-04-03 01:04:46 -04:00
Tobias Diekershoff	ca0b0e92c8	indentation	2018-04-03 06:58:21 +02:00
Tobias Diekershoff	4f221d6334	indentation	2018-04-03 06:57:27 +02:00
Tobias Diekershoff	3ec4e28af6	updated the privacy statement text and added some headers to the functions	2018-04-03 06:55:25 +02:00
Hypolite Petovan	933042f26d	Merge pull request #4728 from annando/dfrn-send ... The Diaspora transport layer is now the default for DFRN	2018-04-02 18:08:42 -04:00
Michael	d668b967c9	Misspelling	2018-04-02 22:06:31 +00:00
Michael	becc86a960	Changed logging text	2018-04-02 22:02:43 +00:00
Michael	8ff6a31512	Sending does now work	2018-04-02 21:59:30 +00:00
Michael	eeadd2f9d6	The Diaspora transport layer is now the default for DFRN	2018-04-02 21:46:10 +00:00
Tobias Diekershoff	01a1e1b451	regenerated master messages.po file	2018-04-02 18:50:27 +02:00
Tobias Diekershoff	6f5b6a073a	register template may link to the TOS as well	2018-04-02 18:41:16 +02:00
Tobias Diekershoff	6cef0fbaeb	added link to delete the account to the registration mail text	2018-04-02 18:40:52 +02:00
Tobias Diekershoff	6c20b4507d	Added /tos module	2018-04-02 18:40:30 +02:00
Hypolite Petovan	4972b82807	Merge pull request #4725 from annando/dfrn-2 ... DFRN payload can now be transported via the Diaspora transport layer	2018-04-02 09:47:31 -04:00