15941 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	2299b8e67a	Added 3.4.1-rc1 changelog	2016-08-05 18:52:14 +12:00
Damian Mooyman	eb11c47d1c	Update translations	2016-08-05 17:57:46 +12:00
Damian Mooyman	ca754eb887	Merge 3.3 into 3.4 ... # Conflicts: # admin/javascript/lang/fa_IR.js # admin/javascript/lang/it.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/it.js # lang/cs.yml # lang/eo.yml # lang/fa_IR.yml # lang/fi.yml # lang/it.yml # lang/sk.yml	2016-08-05 16:48:26 +12:00
Damian Mooyman	e1352b6494	Merge 3.3.3 into 3.3	2016-08-05 16:41:13 +12:00
Damian Mooyman	958344eb5d	Added 3.3.3-rc1 changelog	2016-08-05 16:33:22 +12:00
Damian Mooyman	0d5ae23f2b	Merge 3.2 into 3.3	2016-08-05 14:36:35 +12:00
Damian Mooyman	66668450ed	Merge 3.2.5 into 3.2	2016-08-05 14:33:10 +12:00
Damian Mooyman	6e6451fa71	Added 3.2.5-rc1 changelog	2016-08-05 13:24:35 +12:00
Damian Mooyman	cb39f2ef27	Merge 3.1 into 3.2 ... # Conflicts: # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # javascript/lang/fa_IR.js # javascript/lang/src/fa_IR.js	2016-08-05 11:41:04 +12:00
Damian Mooyman	3fb3a1bd7d	Merge 3.1.20 into 3.1	2016-08-05 11:31:56 +12:00
Damian Mooyman	ec969c21e6	Added 3.1.20-rc1 changelog	2016-08-05 11:17:57 +12:00
Damian Mooyman	9805544cee	Update translations	2016-08-05 11:06:51 +12:00
Damian Mooyman	e683c97f6e	Merge pull request #5867 from andrewandante/MINOR_getAuthenticator-returns-default ... Modify getAuthenticator to fall back to get_default_authenticator	2016-08-03 12:07:35 +12:00
Andrew Aitken-Fincham	66f2e6811b	modify getAuthenticator to fall back to get_default_authenticator	2016-08-03 10:36:43 +12:00
Daniel Hensby	d083c9622a	Merge pull request #4394 from simonwinter/patch-1 ... Update 05_Typography.md	2016-08-02 21:27:56 +01:00
Daniel Hensby	af3412a4c2	Merge pull request #5340 from dnadesign/fixToGridFieldLoadingWrongCurrentPage ... fix to grid field loading wrong current page id when using multiple tabs	2016-08-02 12:44:11 +01:00
Daniel Hensby	e7c6509196	Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3	2016-08-02 12:00:04 +01:00
Damian Mooyman	cd80d501f9	BUG Fix unset config options returning isset() = true ... Fixes #4791	2016-08-02 18:07:55 +12:00
Daniel Hensby	992413ef59	Merge pull request #5855 from tractorcow/pulls/3.4/fix-mysql-privileges ... BUG Fix permission checking code not correctly handling escaped SQL identifiers	2016-08-01 09:48:17 +01:00
Damian Mooyman	7d0b8e6520	BUG Fix permission checking code not correctly handling escaped SQL identifiers ... Fixes https://github.com/silverstripe/silverstripe-installer/issues/96	2016-08-01 18:15:30 +12:00
Jono Menz	6c37532a7a	FIX Gridfield delete action back link (#5848) ... Access backlink before the record is deleted	2016-07-29 10:51:53 +12:00
Loz Calver	12e32debc4	Merge pull request #5839 from tractorcow/pulls/3.4/fix-editor-js ... BUG Fix regression in missing require_js from #4259	2016-07-25 09:18:55 +01:00
Damian Mooyman	9c7c7f6aa9	BUG Fix regression in missing require_js from #4259	2016-07-25 17:50:56 +12:00
Daniel Hensby	cf247534d5	Merge branch '3.3' into 3.4	2016-07-20 19:43:41 +01:00
Daniel Hensby	96b061ffff	Merge branch '3.2' into 3.3	2016-07-20 19:41:46 +01:00
Damian Mooyman	319d6d293e	BUG Fix doclink (#5827) ... Fixes #5721	2016-07-20 10:12:42 +01:00
Daniel Hensby	c587059674	Merge pull request #5823 from madmatt/pulls/3.2-hierarchy-marking-fix ... FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded	2016-07-19 15:35:16 +01:00
madmatt	43dcde5197	FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded	2016-07-19 11:22:36 +12:00
Loz Calver	44d7919496	Merge branch '3.3' into 3.4	2016-07-15 14:34:18 +01:00
Loz Calver	de61551885	Merge branch '3.2' into 3.3	2016-07-15 14:33:38 +01:00
Loz Calver	6ee3e458b6	Merge branch '3.1' into 3.2	2016-07-15 14:32:35 +01:00
Daniel Hensby	a6f1544621	Merge pull request #5814 from kinglozzer/2534-form-actions ... FIX: Fixes support for "inline" form actions (fixes #2534)	2016-07-15 14:19:18 +01:00
Loz Calver	b3fea3723f	FIX: Fixes support for "inline" form actions (fixes #2534)	2016-07-15 10:11:47 +01:00
Daniel Hensby	a64a066bbf	Merge pull request #5665 from tractorcow/pulls/3.3/fix-button-clicked ... BUG Fix buttonClicked() error	2016-07-15 00:30:25 +01:00
Daniel Hensby	0b869254d5	Merge pull request #5809 from giankdm/5772-notifications ... Quick fix for HTTP/2.0 on OSX/Safari v9.1.1	2016-07-15 00:26:38 +01:00
Giancarlo Di Massa	8f2953f1a0	Quick fix for HTTP/2.0 on OSX/Safari v9.1.1	2016-07-14 16:35:51 +02:00
Daniel Hensby	d766c8559b	Merge branch '3.3' into 3.4	2016-07-14 11:57:15 +01:00
Daniel Hensby	a2581b9cf7	Merge branch '3.2' into 3.3	2016-07-14 11:56:35 +01:00
Daniel Hensby	2025d8c76f	Merge pull request #5805 from Zauberfisch/gridfield-detail-form-fix-3.2 ... only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX	2016-07-13 15:05:08 +01:00
zauberfisch	3482c98cce	only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX (fixes #5801)	2016-07-13 13:32:50 +00:00
Daniel Hensby	6824f0d1a7	Merge pull request #5799 from tractorcow/pulls/3.3/arraylist-sql-sort-compat ... BUG Fix sorting ArrayList with sql-like syntax	2016-07-12 13:49:52 +01:00
Damian Mooyman	24efc7edf8	BUG Fix sorting ArrayList with sql-like syntax ... Replaces #5726	2016-07-12 17:00:17 +12:00
Damian Mooyman	ce11c47d00	Merge pull request #5700 from Ironcheese/patch-1 ... Moving a field between tabs, wrong variable name	2016-07-12 13:58:54 +12:00
Daniel Hensby	f44c47eea1	Merge branch '3.3' into 3.4	2016-07-11 21:11:05 +01:00
Daniel Hensby	e1ccb3b379	Merge branch '3.2' into 3.3	2016-07-11 21:10:06 +01:00
Robbie Averill	04a4d7937e	DOCS Update 02_Relations (#5785) ... * Code formatting on some variable names * Add example for removing scaffolded parent relation fields	2016-07-07 22:32:43 +01:00
Ed Chipman	4aa1fc2d2c	BUGFIX: Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783)	2016-07-07 19:55:37 +01:00
Daniel Hensby	55e1fd8782	Merge branch '3.3' into 3.4	2016-07-07 10:28:17 +01:00
Daniel Hensby	ce47f8112b	Merge branch '3.2' into 3.3	2016-07-07 10:27:25 +01:00
Loz Calver	27cea80b15	FIX: SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781)	2016-07-07 10:23:38 +01:00