16642 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Loz Calver	4ad2cae864	FIX: Upload_Validator failed to fetch max size from PHP ini values (fixes #6999)	2017-06-06 14:28:03 +01:00
Damian Mooyman	057bfdae79	Merge pull request #6991 from jacobbuck/feature/3.6/extend-file-get-url ... NEW Add 'updateURL' extension hook to File::getURL()	2017-06-06 21:28:16 +12:00
Damian Mooyman	058ba813e6	Merge pull request #6986 from open-sausages/pulls/3.0/but-its-so-tinymce ... Fix tinymce image selection issue in newer versions of Chrome	2017-06-06 17:24:31 +12:00
Jacob	92b7341200	Call $this->extend('updateURL', $url); befor returning $url	2017-06-06 13:38:11 +12:00
Damian Mooyman	9b965ed5fa	Add in missing changelog notes	2017-06-06 11:08:05 +12:00
Christopher Joe	5f5bfa5e70	Fix create temp folder if it does not exist	2017-06-06 09:58:51 +12:00
Jacob Buck	2305255699	Add updateURL extension hook to File::getURL	2017-06-05 15:17:37 +12:00
Loz Calver	035a9b049e	Merge pull request #6990 from dhensby/pulls/3.6/constructor-fixes ... FIX Upgrade old style constructors that were missed	2017-06-02 12:47:21 +01:00
Daniel Hensby	a52ed03b49	FIX Upgrade old style constructors that were missed	2017-06-02 12:22:33 +01:00
Christopher Joe	4b9d5dceb8	Fix tinymce image selection issue in newer versions of Chrome	2017-06-02 15:06:16 +12:00
Daniel Hensby	bf8d4252e3	Merge pull request #6983 from JustinTBrown/patch-1 ... Update to 00_CSV_Import.md	2017-05-31 19:17:33 +01:00
Justin Brown	ac08e16720	Update to 00_CSV_Import.md ... Adding further explanation for using a custom CsvBulkLoader in ModelAdmin instead of the default one. I think some people might be able to guess at this, but others (like me) might benefit from making things a bit more explicit. This a follow up from my [question on StackOverflow](https://stackoverflow.com/questions/44271755/adding-custom-csvbulkuploader-to-modeladmin-in-silverstripe).	2017-05-31 09:05:05 -06:00
Daniel Hensby	21d2e5cad1	Merge branch '3.6' into 3	2017-05-31 00:12:14 +01:00
Daniel Hensby	becb769167	Merge branch '3.5' into 3.6	2017-05-31 00:11:48 +01:00
Daniel Hensby	653c891f38	Merge tag '3.6.0' into 3.6 ... Release 3.6.0	2017-05-31 00:11:47 +01:00
Daniel Hensby	294df1320f	Merge branch '3.4' into 3.5	2017-05-31 00:11:18 +01:00
Daniel Hensby	ff0bbce326	Merge tag '3.5.4' into 3.5 ... Release 3.5.4	2017-05-31 00:11:18 +01:00
Daniel Hensby	cf8f781238	Merge tag '3.4.6' into 3.4 ... Release 3.4.6	2017-05-31 00:10:48 +01:00
Daniel Hensby	143c4a63cf	Added 3.6.0 changelog	2017-05-30 22:11:03 +00:00
Daniel Hensby	2f7f761a9c	Added 3.5.4 changelog	2017-05-30 22:03:17 +00:00
Daniel Hensby	deca99a5fe	Added 3.4.6 changelog	2017-05-30 21:58:52 +00:00
Damian Mooyman	a017422817	Merge pull request #6972 from creative-commoners/pulls/3.5/plural-modeladmin-name ... FIX Use plural name for ModelAdmin tab name	2017-05-29 15:05:24 +12:00
Robbie Averill	b4368196d1	FIX Use plural name for ModelAdmin tab name	2017-05-29 14:02:58 +12:00
Daniel Hensby	659053a256	Added 3.6.0-rc1 changelog	2017-05-29 00:36:04 +00:00
Daniel Hensby	cda7e8dc39	Merge remote-tracking branch 'security/3.5.4' into 3.6.0	2017-05-29 01:29:05 +01:00
Daniel Hensby	9a38bedd18	Added 3.5.4-rc1 changelog	2017-05-29 00:08:27 +00:00
Daniel Hensby	24166700e8	Merge remote-tracking branch 'security/3.4.6' into 3.5.4	2017-05-29 01:02:35 +01:00
Daniel Hensby	b5ad4bdcc6	Added 3.4.6-rc2 changelog	2017-05-28 23:49:04 +00:00
Daniel Hensby	2b72c0f73b	Merge pull request #42 from silverstripe-security/patch/3.4/ss-2017-004 ... [SS-2017-004] FIX DataDifferencer doesnt correctly cast data	2017-05-29 00:41:59 +01:00
Daniel Hensby	16a74bc8a9	FIX DataDifferencer needs to expliclty cast HTMLText values	2017-05-29 00:10:32 +01:00
Daniel Hensby	eeb549faf3	Added 3.4.6-rc1 changelog	2017-05-28 21:34:38 +00:00
Daniel Hensby	f71efb5063	Merge pull request #40 from silverstripe-security/patch/3.4/ss-2017-002 ... [SS-2017-002] FIX Lock out users who dont exist in the DB	2017-05-28 22:18:56 +01:00
Daniel Hensby	66456138e7	Merge branch '3.6' into 3	2017-05-26 14:58:16 +01:00
Daniel Hensby	02bb308ad5	Merge branch '3.5' into 3.6	2017-05-26 14:57:33 +01:00
Daniel Hensby	24a768ae14	Merge branch '3.4' into 3.5	2017-05-26 14:57:15 +01:00
Daniel Hensby	447ce0f84f	[SS-2017-002] FIX Lock out users who dont exist in the DB	2017-05-25 16:14:52 +01:00
Daniel Hensby	25b77a2ff8	[SS-2017-017] FIX SVG uploads disabled by default	2017-05-25 13:07:53 +01:00
Damian Mooyman	9c2b9d7e98	Merge pull request #6961 from dhensby/pulls/3.4/test-nesting ... Remove unnecessary nesting of config/injector in tests	2017-05-25 10:18:59 +12:00
Daniel Hensby	85f0650796	Remove unnecessary nesting of config/injector in tests	2017-05-24 16:05:39 +01:00
Daniel Hensby	283e3279be	Merge branch '3.6' into 3	2017-05-18 13:55:07 +01:00
Daniel Hensby	db33c8a37c	Merge branch '3.6.0' into 3.6	2017-05-18 13:54:48 +01:00
Daniel Hensby	9f6e0cdc8f	Merge branch '3.5' into 3.6	2017-05-18 13:54:11 +01:00
Daniel Hensby	cc70d893bc	Merge branch '3.4' into 3.5	2017-05-18 13:53:49 +01:00
Damian Mooyman	3883878c13	Merge pull request #6797 from halkyon/broken-group-search ... Fixing broken search in SecurityAdmin Groups field	2017-05-18 14:28:53 +12:00
Damian Mooyman	8f7e7ae1de	Merge pull request #6130 from lekoala/patch-3 ... Allow filtering if a relation is defined or a formatting	2017-05-18 13:11:16 +12:00
Daniel Hensby	49a0354998	Make sure that nested relations dont break	2017-05-17 23:01:42 +01:00
Thomas Portelange	efbf14be63	Allow filtering if a relation is defined or a formatting	2017-05-17 21:05:21 +01:00
Damian Mooyman	7b9c8afeb9	Merge pull request #6777 from robbieaverill/bugfix/image-pad-transparency ... FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad	2017-05-16 23:43:03 +12:00
Robbie Averill	197bc53c49	FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad	2017-05-16 21:20:21 +12:00
Daniel Hensby	9bdce9790d	Added 3.6.0-beta2 changelog	2017-05-10 21:55:25 +01:00