19797 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Loz Calver	97ce336409	Merge pull request #7834 from dhensby/pulls/4.0/fix-nightly ... FIX Regex range identifier correctly escaped	2018-02-05 17:07:56 +00:00
Daniel Hensby	28ca11dd7e	FIX Regex range identifier correctly escaped	2018-02-05 15:17:20 +00:00
Damian Mooyman	e359948eb3	Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # src/Core/CoreKernel.php	2018-02-05 17:52:38 +13:00
Chris Joe	21da1bc317	Merge pull request #7832 from open-sausages/pulls/4/fix-getter-regression ... BUG Fix regression in has_one getters breaking DataDifferencer	2018-02-05 17:45:49 +13:00
Damian Mooyman	e967ab09a2	Added 4.0.3 changelog	2018-02-05 17:10:00 +13:00
Damian Mooyman	e111da2769	Update translations	2018-02-05 16:58:21 +13:00
Damian Mooyman	02ec0b8375	Merge pull request #7829 from Firesphere/patch-3 ... [bugfix] $request == null breaks	2018-02-05 16:43:40 +13:00
Damian Mooyman	d0f8f3ac53	Merge pull request #7831 from scott1702/patch-3 ... Add Robbie to core committers doc	2018-02-05 16:38:55 +13:00
Damian Mooyman	db9aa2c5c7	BUG Fix regression in has_one getters breaking DataDifferencer	2018-02-05 16:16:07 +13:00
Damian Mooyman	a805aabecd	Added 3.6.5 changelog	2018-02-05 15:19:24 +13:00
Damian Mooyman	96ec6e9181	Merge remote-tracking branch 'origin/3.5' into 3.6	2018-02-05 15:07:21 +13:00
Scott Hutchinson	496ca4457a	Update 09_Core_committers.md	2018-02-05 14:45:50 +13:00
Damian Mooyman	abbc4b72be	Added 3.5.7 changelog	2018-02-05 14:30:53 +13:00
Damian Mooyman	6fe5c37d6a	Merge pull request #7795 from kinglozzer/uploadfield-height ... FIX: Fix UploadField cuts off “Save” button (closes #2862)	2018-02-05 14:24:30 +13:00
Chris Joe	80072f01a7	Merge pull request #7819 from open-sausages/pulls/4/duplicates-is-easy ... API Implement cascade_duplications	2018-02-05 14:22:26 +13:00
Damian Mooyman	fa44d22058	Merge pull request #6744 from d-rivera-c/dev/pharmac-fork ... fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE	2018-02-05 14:22:08 +13:00
Damian Mooyman	aca1e16b8e	Merge pull request #6211 from jason-zz/patch-3 ... BUG Fix : relObject() should return null if one of the node is null	2018-02-05 14:18:44 +13:00
Damian Mooyman	98907b3ba4	Merge pull request #4096 from patricknelson/issue-4095-tinymce-embed ... FIX for #4095, TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2)	2018-02-05 14:14:44 +13:00
Simon Erkelens	a071672b48	[bugfix] $request == null breaks ... The $request incoming as null was not properly detected by the if/elseif structure.	2018-02-05 13:02:07 +13:00
Robbie Averill	209635b467	Merge pull request #7828 from open-sausages/pulls/4.0/fix-debug-string-class ... BUG Fix issue with DebugView failing on class name of existing class	2018-02-05 12:08:58 +13:00
Damian Mooyman	aa2c71424d	API Implement cascade_duplications ... API Add DataObject::setComponent() API Support unary components as getter and setter fields API ManyManyList::add() now supports unsaved records ENHANCEMENT Animal farm	2018-02-05 12:04:57 +13:00
Damian Mooyman	288aaf083c	BUG Fix issue with DebugView failing on class name of existing class ... Fixes #7827	2018-02-05 10:45:49 +13:00
Chris Joe	b81ac41b5d	Merge pull request #7825 from open-sausages/pulls/4.0/fix-session-unsaved ... BUG Fix critical issue with incorrectly saved session data	2018-02-02 16:14:26 +13:00
Damian Mooyman	740c3326e9	BUG Fix critical issue with incorrectly saved session data	2018-02-02 15:08:52 +13:00
Damian Mooyman	9faf1e7f77	Merge pull request #7823 from open-sausages/pulls/4.0/ehh-whats-up-doc ... Cleanup upgrade docs and 4.0 change logs	2018-02-02 14:26:07 +13:00
Chris Joe	628c5caad3	Merge pull request #7821 from open-sausages/pulls/4.0/update-message ... Update reference from $databaseConfig to .env	2018-02-01 22:57:46 +13:00
Robbie Averill	b07babb9da	Merge pull request #7824 from open-sausages/pulls/4/fix-password-validation ... BUG Prevent invalid members being written to database if validation_enabled is false	2018-02-01 18:24:29 +13:00
Damian Mooyman	217cb93b25	Merge pull request #7730 from dhensby/pulls/4.0/ssviewer-requirements-backend ... FIX `SSViwer::execute_template` should allow requirements to be included	2018-02-01 16:42:40 +13:00
Damian Mooyman	bc2fc7f2db	BUG Prevent invalid members being written to database if validation_enabled is false	2018-02-01 16:24:31 +13:00
Christopher Joe	78a6b4b4c3	Cleanup upgrade docs and 4.0 change logs	2018-02-01 15:27:02 +13:00
Damian Mooyman	cb30e09130	Update reference from $databaseConfig to .env	2018-02-01 12:58:55 +13:00
Damian Mooyman	1c9660d20e	Merge pull request #7800 from open-sausages/pulls/4.1/you-shall-not-password--boom ... Enhancement Updated PasswordValidator to fallback to config options (ss4)	2018-02-01 12:44:41 +13:00
Daniel Hensby	212178bb0d	FIX SSViwer::execute_template should allow requirements to be included	2018-01-31 11:10:26 +00:00
Damian Mooyman	11f4693648	Merge pull request #7816 from creative-commoners/pulls/4.0/setrighttitle-phpdoc ... Update phpdoc for FormField::setRightTitle regarding escaped HTML	2018-01-31 16:48:17 +13:00
Damian Mooyman	4da99efd5d	Merge remote-tracking branch 'origin/3.5' into 3.6	2018-01-31 16:03:42 +13:00
Robbie Averill	c0ffe2797a	Update phpdoc for FormField::setRightTitle regarding escaped HTML	2018-01-31 11:03:35 +13:00
Christopher Joe	456871fd91	Enhancement Updated PasswordValidator to fallback to config options - still retains instance variables	2018-01-31 10:54:43 +13:00
Damian Mooyman	ab6428ef59	Merge pull request #7808 from creative-commoners/pulls/4.0/fix-html5-parsing-embeds ... FIX Allow cleanup marker regex to handle self closing HTML5 tags	2018-01-31 10:24:34 +13:00
Fred Condo	8d6d985a7c	Port nginx configuration changes from 3	2018-01-30 20:35:54 +00:00
Daniel Hensby	cf373ad53b	Merge pull request #7804 from beerbohmdo/bugfix/composite_field_missing_table ... BUG $this->tableName in CompositeDBField->addToQuery is blank.	2018-01-30 16:52:02 +00:00
Daniel Hensby	231de43e3a	Merge pull request #7784 from spaceship-operators/bugfix/gridfield-overflow ... FIX: Gridfields with dropdowns having lots of overflow	2018-01-30 16:36:27 +00:00
Scott Hutchinson	7384e3fc25	FIX: Gridfields with dropdowns having lots of overflow	2018-01-30 14:45:08 +00:00
Robbie Averill	8a6686bc0f	Merge pull request #7814 from raissanorth/patch-1 ... FIX Fix typo in error message	2018-01-30 16:24:34 +13:00
Raissa North	cd6faac7a9	FIX Fix typo in error message	2018-01-30 15:48:42 +13:00
Robbie Averill	3d7ecc5240	FIX Allow cleanup marker regex to handle self closing HTML5 tags	2018-01-30 11:16:21 +13:00
Robbie Averill	dac247b58d	Merge pull request #7809 from open-sausages/pulls/4/docs-module-list ... Remove module-specific docs instructions	2018-01-30 10:13:18 +13:00
Ingo Schommer	26c3e224db	Remove module-specific docs instructions ... We have too many docs to list these out now, even in 3.x this was a bit of a stopgap solution. Point to a centrally managed URL on silverstripe.org instead, where we can update the list of "core modules" regularly without breaking URLs in the docs etc Note that these URLs are also used internally by the Open Sourcerers team.	2018-01-30 09:08:49 +13:00
Chris Joe	f1628e3252	Docs updated injector docs to reflect inject() changes (#7768) ... * Docs updated injector docs to reflect inject() changes and added example for the change * Minor docs revision * Added notes about context	2018-01-27 09:18:45 +13:00
Dominik Beerbohm	416915b082	BUG tableName is blank in CompositeDBField->addToQuery ... Added call to setTable() to ensure tableName is provided inside addToQuery method.	2018-01-26 14:58:46 +01:00
Loz Calver	861112bd31	Merge pull request #7803 from open-sausages/pulls/3.5/fix-ping-reqs ... BUG Fix ping including requirements	2018-01-26 09:16:20 +00:00