6514 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Joe	d14e000e66	Merge pull request #1793 from open-sausages/pulls/4.0/requirements-html-cleanup ... Update HTMLValue and FormField::create_tag usages	2017-06-16 15:13:51 +12:00
Damian Mooyman	93a185e44a	Update HTMLValue and FormField::create_tag usages	2017-06-16 11:44:36 +12:00
Daniel Hensby	8a426a40de	Merge pull request #1852 from AntonyThorpe/addForm_setStrictFormMethodCheck ... Bugfix: SS4 Right click, add page fails	2017-06-15 14:07:08 +01:00
Daniel Hensby	05bb2fef1b	Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update	2017-06-15 12:50:49 +01:00
Ingo Schommer	a5a8982af6	Revert "Update translations" ... This reverts commit 475b733579. It pulled updates from transifex *after* we switched translations to 4.x only mode - which resulted in a lot of translation keys being moved around. For example, asset-related translations went from framework to the asset-admin module. The removal of these translations in 3.x caused translations to go partially missing, since these new modules are 4.x only. See https://github.com/silverstripe/silverstripe-framework/issues/7002	2017-06-15 14:50:56 +12:00
Antony Thorpe	fdbe38d444	Bugfix: SS4 Right click, add page fails ... `addForm` receives both POSTs and GETs. Set the form's `strictFormMethodCheck` to false to avoid `405 Method Not Allowed` error response. Issue #1846.	2017-06-15 13:53:38 +12:00
Daniel Hensby	6b9e48aad1	Merge branch '3.6' into 3	2017-06-14 12:14:53 +01:00
Daniel Hensby	54e438fb9e	Merge branch '3.5' into 3.6	2017-06-14 12:14:02 +01:00
Damian Mooyman	d88a7ba54f	Merge pull request #1847 from open-sausages/pulls/4.0/retain-your-compose ... Fix composer requirements	2017-06-10 08:55:16 +12:00
Christopher Joe	10196e4f75	Fix composer requirements	2017-06-09 23:44:28 +12:00
Chris Joe	1af5957433	Merge pull request #1842 from Firesphere/authenticator-refactor ... [WIP] Make CMS Compatible with Authentication Refactor work	2017-06-09 22:14:55 +12:00
Simon Erkelens	b2fd014216	Make CMS Compatible with Authentication Refactor work ... Move Member::currentUser() to Security::getCurrentUser()	2017-06-09 21:07:20 +12:00
Damian Mooyman	1c195230bd	Merge pull request #1845 from mfendeksilverstripe/3.5 ... Count children time / memory issues fix	2017-06-08 14:59:57 +12:00
Mojmir Fendek	b442bad767	Children of the site tree are no longer listed only for the purpose of counting them. count($this->Children()) creates an array list of children which has serious performance consequences if there are lot of children present. On the other hand $this->numChildren() runs a count query which is much faster and eat’s less memory.	2017-06-08 12:19:27 +12:00
Damian Mooyman	8d717c81b9	Merge pull request #1839 from open-sausages/pulls/4.0/we-put-the-file-to-the-motion ... Enhancement Translation strings updated	2017-06-06 16:50:32 +12:00
Damian Mooyman	69114126f4	Upgrade webpack-config	2017-06-06 16:22:40 +12:00
Ingo Schommer	4bacd35fc4	List "view/edit all" groups in group permission field ... See https://github.com/silverstripe/silverstripe-cms/issues/794	2017-06-02 11:40:51 +12:00
Christopher Joe	844420df40	Enhancement Translation strings updated	2017-05-31 16:08:54 +12:00
Daniel Hensby	a0bf0abe1b	Merge branch '3.6' into 3	2017-05-31 00:08:53 +01:00
Daniel Hensby	729b388d22	Merge branch '3.5' into 3.6	2017-05-31 00:08:33 +01:00
Daniel Hensby	79aadf7ae3	Merge tag '3.6.0' into 3.6 ... Release 3.6.0	2017-05-31 00:08:32 +01:00
Daniel Hensby	a24a3af1b1	Merge branch '3.4' into 3.5	2017-05-31 00:08:11 +01:00
Daniel Hensby	a8e343b85b	Merge tag '3.5.4' into 3.5 ... Release 3.5.4	2017-05-31 00:08:11 +01:00
Daniel Hensby	df95066e50	Merge tag '3.4.6' into 3.4 ... Release 3.4.6	2017-05-31 00:07:35 +01:00
Daniel Hensby	08093ea308	Merge pull request #1838 from dhensby/pulls/3.6.0/fix-mobius-hierachy	2017-05-30 22:52:22 +01:00
Daniel Hensby	5116476875	FIX Issue where CMS SiteTree can result in infinite recursion if parent and child relation is swapped	2017-05-30 22:23:55 +01:00
Damian Mooyman	e31b09fef3	Merge pull request #1837 from open-sausages/pulls/4.0/do-not-temp-me ... Fix remove temp external entries	2017-05-30 12:45:01 +12:00
Christopher Joe	3c7c639901	Fix remove temp external entries	2017-05-30 12:32:18 +12:00
Chris Joe	d8924cabc6	Merge pull request #1834 from open-sausages/pulls/4.0/insert-page-link ... API Add insert internal link modal	2017-05-30 12:05:05 +12:00
Damian Mooyman	f82f0844c1	API Add insert internal link modal	2017-05-30 11:00:32 +12:00
Damian Mooyman	eb06646aa8	Rename json lang source files to .json extension	2017-05-29 17:27:41 +12:00
Chris Joe	d2a5d073e2	Upgrade to webpack2 and cleanup config file (#1833) ... * Enhancement switch to the shared webpack config * upgrade to new webpack-config	2017-05-29 17:24:48 +12:00
Daniel Hensby	eaee3b6a8b	Merge remote-tracking branch 'security/3.5.4' into 3.6.0	2017-05-29 01:21:22 +01:00
Daniel Hensby	11e2175ec8	Merge remote-tracking branch 'security/3.4.6' into 3.5.4	2017-05-29 01:02:55 +01:00
Daniel Hensby	02b5e6ea92	Merge pull request #5 from silverstripe-security/patch/3.4/SS-2017-003 ... [SS-2017-003] Only allow HTTP(S) links for external redirector pages	2017-05-28 21:36:33 +00:00
Daniel Hensby	911e491236	Merge pull request #4 from silverstripe-security/patch/3.4/SS-2017-004 ... [SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()	2017-05-28 22:18:35 +01:00
Daniel Hensby	c3a6595bb8	Merge branch '3.6' into 3	2017-05-26 14:56:15 +01:00
Daniel Hensby	779a20de02	Merge branch '3.6.0' into 3.6	2017-05-26 14:56:03 +01:00
Daniel Hensby	9d76c15eb5	Merge branch '3.5' into 3.6	2017-05-26 14:55:06 +01:00
Chris Joe	af1b2fc37f	Merge pull request #1827 from fspringveldt/new/issue-1756 ... FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage	2017-05-26 15:29:29 +12:00
Franco Springveldt	c034ead6df	FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage ... References #1756	2017-05-26 13:21:51 +12:00
Daniel Hensby	14a855ed97	Merge pull request #1804 from dnadesign/doArchiveFix ... fixing doArchive	2017-05-25 23:13:14 +01:00
Daniel Hensby	61cf72c08d	[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()	2017-05-25 17:22:04 +01:00
Daniel Hensby	41270fcf99	[SS-2017-003] Only allow HTTP(S) links for external redirector pages	2017-05-24 23:02:41 +01:00
Daniel Hensby	3d238f7f65	Merge pull request #1830 from wernerkrauss/patch-1 ... ErrorPage not remapping to namespaced class	2017-05-23 19:10:07 +01:00
wernerkrauss	44308edfb1	ErrorPage not remapping to namespaced class	2017-05-23 15:33:22 +02:00
Chris Joe	cf80adcea8	Merge pull request #1825 from open-sausages/pulls/4.0/remove-object ... Remove object class	2017-05-23 11:00:33 +12:00
Damian Mooyman	72e46a8fc1	Merge branch 'master' into pulls/4.0/remove-object	2017-05-22 21:17:40 +12:00
Damian Mooyman	b1c194467d	Merge pull request #1828 from robbieaverill/pulls/4.0/remove-create-function ... Remove create_function implementations, replace with closures	2017-05-22 19:06:32 +12:00
Robbie Averill	b394718b42	Remove create_function implementations, replace with closures	2017-05-22 17:36:19 +12:00