20304 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	f256045020	Merge pull request #8158 from open-sausages/pulls/4.0/fix-cli-canonical-middleware ... BUG Prevent canonical URL causing a redirect on CLI unless explicitly enabled	2018-06-12 10:53:37 +12:00
Fred Condo	6d12deb4b9	Update nginx sample configuration for 4.1 ... - Remove unneeded denials (due to public folder) - Add caveats about public folder, error pages, and HTTPS	2018-06-11 09:32:40 -04:00
Daniel Hensby	ce58890baf	Merge branch '4.0' into 4.1	2018-06-11 09:27:42 +01:00
Aaron Carlino	23bf8d2b3c	add docs for new file extension process	2018-06-11 15:45:36 +12:00
Robbie Averill	27e24a4728	Merge pull request #8142 from open-sausages/pulls/4.0/fix-injector-empty ... BUG Safely handle empty injector factory responses	2018-06-11 15:20:24 +12:00
Damian Mooyman	2a51f34c3e	BUG Prevent canonical URL causing a redirect on CLI unless explicitly enabled ... Replaces #8157	2018-06-11 13:54:27 +12:00
Nicolaas	8f03c7df05	PATCH: removing duplicate key (SS_TRUSTED_PROXY_HOST_HEADER)	2018-06-11 13:35:27 +12:00
Damian Mooyman	77a45c0dbc	Merge remote-tracking branch 'origin/4.1' into 4 ... # Conflicts: # src/Forms/HTMLEditor/HTMLEditorSanitiser.php # src/ORM/DataObjectSchema.php # src/ORM/Queries/SQLSelect.php # src/View/Parsers/ShortcodeParser.php	2018-06-11 10:19:04 +12:00
Robbie Averill	d842225df6	FIX Codesniffer style violations with comments	2018-06-11 09:55:18 +12:00
Damian Mooyman	546c6c3e22	Merge pull request #8125 from open-sausages/pulls/4/date-field-tweaks ... Remove legacy logic from DateField_Disabled	2018-06-11 09:23:33 +12:00
Daniel Hensby	a8f14f96ed	Merge pull request #8153 from Juanitou/patch-3 ... Fix updateCMSFields example in documentation	2018-06-10 17:08:36 +01:00
Juan Molina	4e6f45c2ea	Fix updateCMSFields example	2018-06-09 19:41:33 +02:00
Daniel Hensby	e260319823	Merge branch '4.0' into 4.1	2018-06-08 23:05:24 +01:00
Daniel Hensby	cfe93b7f23	Merge branch '3.6' into 4.0	2018-06-08 14:41:04 +01:00
Daniel Hensby	1d6d601050	Use chaining syntax for setting up middleware	2018-06-08 14:00:59 +01:00
Maxime Rainville	582c69d32f	BUG Fix issue with Disabled DateField always display (not set).	2018-06-08 13:51:22 +01:00
Daniel Hensby	e1450b5e82	Merge pull request #8147 from kinglozzer/mysql-pdo-attr ... FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)	2018-06-08 13:06:03 +01:00
Ingo Schommer	48304fd6f0	Merge pull request #8102 from creative-commoners/pulls/4.1/response-assertion ... Add test assertion for response instance	2018-06-08 14:08:25 +12:00
Ingo Schommer	80c30c7b05	Merge pull request #8089 from creative-commoners/pulls/4.1/fix-maori-macron ... FIX Add macron to Māori language name	2018-06-08 14:07:05 +12:00
Ingo Schommer	510b0f7759	Merge pull request #8150 from open-sausages/pulls/4.0/fix-postgres-duplication-issue ... BUG Fix test that relies on implicit ID order breaking postgres	2018-06-08 12:58:43 +12:00
Damian Mooyman	29f9b1c18f	Fix linting issues	2018-06-08 11:38:36 +12:00
Damian Mooyman	e37e3e1746	BUG Fix test that relies on implicit ID order breaking postgres	2018-06-08 11:23:24 +12:00
Loz Calver	66f57bd4da	FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)	2018-06-07 10:26:00 +01:00
Daniel Hensby	ffc2eeea05	Merge pull request #8140 from open-sausages/pulls/4.1/through-belongs-issue ... BUG Backport bugfix for belongs_many_many with many_many through.	2018-06-06 11:18:07 +01:00
Aaron Carlino	31ad3cdaab	BUGFIX: Allow buttons to opt out of display (#8113) ... * Allow buttons to opt out of display * Linting * Remove redundant function call * Add test for group delete action * Add menu group check and test for delete action * Fix linting	2018-06-06 21:14:29 +12:00
Damian Mooyman	c070e989c4	BUG Safely handle empty injector factory responses ... Fixes issue with ImageBackendFactory returning null and breaking injector	2018-06-06 16:45:16 +12:00
Damian Mooyman	b20100c2f6	Merge pull request #8139 from jonom/4-httperror ... FIX: Make custom error messages available to extensions	2018-06-06 14:18:10 +12:00
Damian Mooyman	f77969e847	Merge pull request #8093 from open-sausages/pulls/4/versioned-cache-segmentation ... Remove versioned cache from core caches	2018-06-06 13:42:11 +12:00
Damian Mooyman	0aa13da0d9	BUG Backport bugfix for belongs_many_many with many_many through. ... Partial backport of #7928 Fixes #8131	2018-06-06 09:43:04 +12:00
Damian Mooyman	710a793d57	Merge pull request #8106 from creative-commoners/pulls/4/remove-broken-badges ... DOCS Remove broken badges from readme: versioneye and helpfulrobot	2018-06-06 09:28:56 +12:00
Damian Mooyman	f91c14551f	Merge branch '4' into pulls/4/remove-broken-badges	2018-06-06 09:27:07 +12:00
Damian Mooyman	2bceabe454	Merge pull request #8124 from creative-commoners/pulls/4.1/test-fixes ... FIX Minor updates to unit tests to pass with HTML5 parser and various themes	2018-06-06 09:21:01 +12:00
Jonathon Menz	bf07ba30f4	FIX: Make error messages available to extensions	2018-06-05 14:12:28 -07:00
Daniel Hensby	73c6c61ff7	Merge pull request #8137 from christopherdarling/patch-11 ... DOCS fix 4.0.0 changelog example code for findThemedResource	2018-06-05 17:18:47 +01:00
Christopher Darling	cab1ea0dbe	DOCS fix 4.0.0 changelog example code ... ThemeResourceLoader::inst()->findThemedResource() requires two arguments af2c3886b9/src/View/ThemeResourceLoader.php (L286-L294)	2018-06-05 16:58:37 +01:00
Daniel Hensby	801a51d0f7	Merge branch '3.5' into 3.6	2018-06-05 16:30:20 +01:00
Robbie Averill	13ea2f9b80	Merge pull request #8132 from dhensby/pulls/3.5/postgres-test-fix ... FIX Regression from #8009	2018-06-05 13:43:19 +12:00
Daniel Hensby	41e601a036	FIX Regression from #8009	2018-06-04 17:03:05 +01:00
Loz Calver	050018dba6	Merge pull request #8134 from dhensby/pulls/3.5/memory-limit ... Increase memory limit to 2G in Travis builds	2018-06-04 16:50:52 +01:00
Loz Calver	0a4e3fc716	Merge pull request #8133 from dhensby/pulls/3.5/php53-compat ... FIX PHP 5.3 compat for referencing $this in closures	2018-06-04 16:30:21 +01:00
Robbie Averill	c1b0c56788	Increase memory limit to 2G in Travis builds	2018-06-04 16:24:18 +01:00
Robbie Averill	1cbf27e0f4	FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason ... sdf	2018-06-04 16:05:49 +01:00
Daniel Hensby	0bec6e07dc	Merge pull request #8111 from open-sausages/pulls/4/7.2-is-just-out-of-each ... BUGFIX: Refactor difflib to not use each()	2018-06-04 12:47:59 +01:00
Daniel Hensby	1658fe7617	Merge pull request #8127 from jonom/4.0-read-only-currency ... Fix: negative values in read only currency field	2018-06-04 11:52:01 +01:00
Daniel Hensby	e67d947b26	Merge pull request #8130 from Juanitou/patch-2 ... Update 03_Requirements.md	2018-06-04 11:36:21 +01:00
Juan Molina	35943ac68a	Update 03_Requirements.md	2018-06-03 14:25:05 +02:00
Juan Molina	031f8b23ec	Update 03_Requirements.md ... Update Blocking section to reflect new vendor path	2018-06-02 19:30:12 +02:00
Jonathon Menz	5a5ba1e5c0	Fix: negative values in read only currency field ... Don’t strip out ‘-‘ character as this makes negative values appear to be positive (Fixes #8126)	2018-06-01 12:59:02 -07:00
Robbie Averill	8064ed8220	FIX Minor updates to unit tests to pass with HTML5 parser and various themes	2018-06-01 17:47:03 +12:00
Maxime Rainville	adb64c074a	✅ Making our diff unit test a bit more forgiving of spaces. ... #8053	2018-06-01 13:02:49 +12:00