18778 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael	0ccb29c4df	Only compare the HTML when we forcefully ignore the cache	2018-04-06 16:52:01 +00:00
Tobias Diekershoff	0a47f73685	regenerated master messages.po file	2018-04-06 16:59:56 +02:00
Michael	297784880e	Update the cached rendered html when it changed	2018-04-06 14:01:52 +00:00
Tobias Diekershoff	f0590145b9	Merge pull request #4758 from annando/fix-regexp ... Fixes warning "missing terminating ] for character class"	2018-04-06 11:13:42 +02:00
Michael	8d68e865c1	Fixes warning "missing terminating ] for character class"	2018-04-06 09:11:10 +00:00
Michael Vogel	2d9719f9ff	Merge pull request #4757 from tobiasd/20180406-lng ... core translations	2018-04-06 10:02:05 +02:00
Tobias Diekershoff	a787f80bbd	added FI translation as core translation is now over 50% THX Kris	2018-04-06 09:27:39 +02:00
Tobias Diekershoff	13470cbd75	update to the NL translation THX Karel	2018-04-06 09:25:21 +02:00
Michael Vogel	05cff59f70	Merge pull request #4722 from MrPetovan/task/add-content_filter-hook ... Add content_filter hook	2018-04-06 06:42:52 +02:00
Hypolite Petovan	738f780dda	Merge pull request #4754 from annando/frio-accessibility ... Improved accessibility for "Frio"	2018-04-05 17:57:01 -04:00
Michael	3792012723	Improved accessibility for "Frio"	2018-04-05 21:50:34 +00:00
Hypolite Petovan	4d0fb02226	Merge pull request #4747 from annando/img-alt-text ... Bugfix: The rendering with images with width and height was broken	2018-04-05 08:06:20 -04:00
Hypolite Petovan	972d610bdf	Merge pull request #4751 from friendica/revert-4750-revert-4746-img-alt-text ... Revert "Revert "Added support of alt texts in images""	2018-04-05 08:05:25 -04:00
Hypolite Petovan	6301b83d7f	Revert "Revert "Added support of alt texts in images""	2018-04-05 08:05:09 -04:00
Hypolite Petovan	00d158350a	Merge pull request #4750 from friendica/revert-4746-img-alt-text ... Revert "Added support of alt texts in images"	2018-04-05 08:00:47 -04:00
Hypolite Petovan	4997ccd3df	Revert "Added support of alt texts in images"	2018-04-05 07:59:57 -04:00
Michael Vogel	f65023a9f3	Merge pull request #4748 from tobiasd/220180405-de ... update for DE translation THX Andreas	2018-04-05 09:07:32 +02:00
Tobias Diekershoff	909d542c4a	update for DE translation THX Andreas	2018-04-05 08:36:16 +02:00
Michael	4a909fcfcf	Bugfix: The rendering with images with width and height was broken	2018-04-05 06:01:36 +00:00
Hypolite Petovan	a88e5e3742	Updated messages.po	2018-04-04 23:11:17 -04:00
Hypolite Petovan	9403e614aa	Update system.disable_cw help text	2018-04-04 23:08:48 -04:00
Hypolite Petovan	34fd442821	Rename social.disable_cw pconfig to system.disable_cw	2018-04-04 23:08:48 -04:00
Hypolite Petovan	41db5f0912	Display content warning as title if collapsing is deactivated	2018-04-04 23:08:48 -04:00
Hypolite Petovan	296f561878	Rename hook to "prepare_body_content_filter"	2018-04-04 23:08:48 -04:00
Hypolite Petovan	d38b86dabf	Fix disabled content filter for own posts	2018-04-04 23:08:48 -04:00
Hypolite Petovan	f26c99d17b	Disable content filter for preview and own posts	2018-04-04 23:08:48 -04:00
Hypolite Petovan	d603bf062d	Add CSS classes to content-filter wrapper	2018-04-04 23:08:48 -04:00
Hypolite Petovan	2d1942a1fa	Update hook documentation	2018-04-04 23:08:48 -04:00
Hypolite Petovan	b755e808df	Add new content_filter hook in prepare_body ... - Add content warning processing to prepare_body with use of disable_cw setting - Add filter_reasons params to prepare_body hook	2018-04-04 23:08:48 -04:00
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