Commit Graph

16281 Commits

Author SHA1 Message Date
Daniel Hensby
51f98c973f
Merge branch '3.5' into 3 2017-04-03 22:57:58 +01:00
Daniel Hensby
203963199b Merge pull request #6762 from Quadra-Digital/login-hooks
Add Extension Hooks to Member Login Processes
2017-03-30 12:57:00 +01:00
Joe Harvey
0d0d18612d Adding extension hooks to Member isLockedOut() and registerSuccessfulLogin() 2017-03-30 11:07:51 +01:00
Damian Mooyman
75289b46e2 Merge pull request #6731 from kinglozzer/manymanyextrafields-order
FIX: many_many_extraFields breaks _SortColumn0 ordering (fixes #6730)
2017-03-28 12:07:18 +13:00
Loz Calver
b3d37880e9
FIX: many_many_extraFields breaks _SortColumn0 ordering (fixes #6730) 2017-03-27 09:16:13 +01:00
Daniel Hensby
a04d72c66f Merge pull request #6655 from robbieaverill/patch-6
DOCS Swap legacy code block syntax for GFM in "Requirements"
2017-03-24 21:55:48 +13:00
Damian Mooyman
ae03d18d91 Merge pull request #6696 from robbieaverill/bugfix/datetime-field-has-template
FIX Give DatetimeField its own template (which is extensible)
2017-03-13 13:05:32 +13:00
Robbie Averill
cc749d3a19 FIX Give DatetimeField its own template (which is extensible) 2017-03-13 11:36:53 +13:00
Ingo Schommer
a69ec2f847 Merge pull request #6677 from open-sausages/pulls/3/themed-grouped-dropdown
API Enable theming of GroupedDropdownField
2017-03-06 14:48:29 +13:00
Damian Mooyman
f1b99b6fa7
API Enable theming of GroupedDropdownField
Based on partial back-port of 4.0 code
2017-03-06 11:44:42 +13:00
Daniel Hensby
8aaa3e3a86
Merge branch '3.4' into 3.5 2017-03-03 14:54:29 +00:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2 2017-03-03 14:05:53 +00:00
Daniel Hensby
62e301bdba Merge pull request #6529 from timezoneone/3.5
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 12:45:05 +00:00
Daniel Hensby
e27a2b3dd4 Merge pull request #6669 from timkung/pulls/update-gridfield-sort-icon-direction
Updating GridField.scss to fix sort icon direction
2017-03-03 12:37:04 +00:00
Daniel Hensby
e8eb2f0fb0
Merge pull request #6668' from timkung/pulls/modeladmin-content-template-fix 2017-03-03 10:18:31 +00:00
Shawn
72b6fb49b6 Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns 2017-03-03 14:11:53 +13:00
Tim Kung
0b73039e6f switching the ascending and descending sprites for the grid field sort icon to be correct 2017-03-02 10:35:20 +13:00
Tim Kung
33054100ca updating title attribute on managed model tab list links to the actual title of each model 2017-03-01 16:32:30 +13:00
Robbie Averill
d47a4ef63f DOCS Swap legacy code block syntax for GFM
This page (currently) for example breaks the code block whenever you mix spaces and tabs for indentation (which is currently part of the 3.x style guideline) - it makes updating existing code examples in the docs quite difficult: https://docs.silverstripe.org/en/3/developer_guides/templates/requirements/

GFM isn't as picky - this PR replaces with it.
2017-02-27 16:54:43 +13:00
Daniel Hensby
0ddf3b4186
Merge branch '3.5' into 3 2017-02-20 21:33:31 +00:00
Daniel Hensby
5a6f784e42
Merge branch '3.4' into 3.5 2017-02-20 21:31:09 +00:00
Daniel Hensby
34f408aaba
Merge tag '3.5.3' into 3.5
Release 3.5.3
2017-02-20 21:31:05 +00:00
Daniel Hensby
8ca70b5b20
Merge tag '3.4.5' into 3.4
Release 3.4.5
2017-02-20 21:27:53 +00:00
Dan Hensby
a2580456bd Added 3.5.3 changelog 2017-02-20 17:01:16 +00:00
Dan Hensby
4d48548d89 Update translations 2017-02-20 17:01:16 +00:00
Dan Hensby
9cd480e47a Added 3.4.5 changelog 2017-02-20 16:41:59 +00:00
Dan Hensby
249b143edd Update translations 2017-02-20 16:41:56 +00:00
Juan van den Anker
30725916db FIX Array to string conversion message after CSV export (#6622)
* FIX Array to string conversion message after CSV export

* Removed invalid line endings
2017-02-15 22:20:00 +00:00
Daniel Hensby
7122e1fde7 FIX Comments ignored by classmanifest (#6619) 2017-02-15 10:46:04 +13:00
Daniel Hensby
24e4d91b88 Merge pull request #6620 from gregsmirnov/pulls/3/greek-transliteration
Added Greek transliteration
2017-02-14 18:23:00 +00:00
Gregory Smirnov
837ca480e4 Added Greek transliteration 2017-02-14 17:50:24 +01:00
Daniel Hensby
982ffeaf13 Merge pull request #6616 from flamytwista/patch-1
Cyrillic Transliteration
2017-02-14 13:32:55 +00:00
Taras Yemtsov
da7465d96a
Cyrillic Transliteration 2017-02-13 14:19:12 +00:00
Daniel Hensby
f3691eb2b3
Merge branch '3.4.5' into 3.5.3 2017-02-08 22:24:18 +00:00
Damian Mooyman
6fc0d3986e Merge pull request #6610 from dhensby/pulls/3.4/6606-fix
FIX JS Tree is whitespace sensitive
2017-02-09 11:22:44 +13:00
Daniel Hensby
1f3d46b832
FIX #6606 the JS SiteTree lib depends on whitespace 2017-02-08 21:56:52 +00:00
Daniel Hensby
4d3cd9d9a2
Merge branch '3.5' into 3 2017-02-08 10:40:40 +00:00
Daniel Hensby
6808e88d9c
Merge branch '3.4' into 3.5 2017-02-08 10:40:05 +00:00
Damian Mooyman
c25c443d95 BUG Fix minor mysql 5.7 warning in SQLQueryTest (#6608)
Fixes #5451
2017-02-08 15:44:55 +13:00
Damian Mooyman
bd3f21d32b Add changelog note 2017-02-08 13:33:57 +13:00
Damian Mooyman
043e9d538c Merge 3.5 into 3 2017-02-08 11:56:47 +13:00
Damian Mooyman
7633040646 Merge 3.4 into 3.5 2017-02-08 11:55:17 +13:00
Damian Mooyman
86a590fc9d Merge 3.4.5 into 3.4 2017-02-08 11:52:45 +13:00
Damian Mooyman
acf3c0aeaa Added 3.5.3-rc1 changelog 2017-02-08 11:20:44 +13:00
Damian Mooyman
9c040e10c4 Update translations 2017-02-08 11:05:29 +13:00
Damian Mooyman
b06ac1708b Add in changelog line 2017-02-08 10:49:08 +13:00
Damian Mooyman
e01a5f4523 Added 3.4.5-rc1 changelog 2017-02-08 10:44:18 +13:00
Damian Mooyman
60aa4bcfb9 Update translations 2017-02-08 10:29:07 +13:00
Damian Mooyman
971fd5fcbb Merge branch '3.5' into 3 2017-02-08 10:15:09 +13:00
Damian Mooyman
89a927d152 Merge 3.4 into 3.5 2017-02-08 10:01:14 +13:00