Damian Mooyman
66a9694011
Merge branch '3.5' into dblib-pdo
2017-03-20 11:49:02 +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
Andrew O'Neil
9492a8b92f
Error should be checked on the db connection, not on the result
2017-03-01 10:41:06 +11: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
Andrew O'Neil
6af3289f43
Remove negation of condition to make the code easier to read.
2017-02-10 10:54:15 +11:00
Andrew O'Neil
6e2797ffc0
Fixes for using dblib PDO driver.
...
These fixes allow *nix environments to connect to SQL Server using
the dblib PDO driver and the silverstripe mssql module.
- Only set MYSQL_ATTR_INIT_COMMAND when using the mysql driver, this
constant isn't defined if the mysql pdo driver isn't installed
- Supress warnings on getting the server version, attributes aren't
supported by the dblib driver
- Explicitly check for errors on sql exec, checking the return
value isn't reliable for statements with no return value (e.g.
USE database)
2017-02-10 10:20:16 +11: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
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
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
89a927d152
Merge 3.4 into 3.5
2017-02-08 10:01:14 +13:00
Damian Mooyman
5b200d92f6
Merge pull request #6605 from dhensby/pulls/3.4/revert-treenode-fix
...
Partial revert of LeftAndMain_TreeNode::forTemplate()
2017-02-08 09:03:55 +13:00
Daniel Hensby
0fe4ec4537
Partial revert of c6c6c13fc2
2017-02-07 15:33:20 +00:00
Daniel Hensby
9bd85ac773
Merge branch '3.4' into 3.5
2017-02-01 00:55:35 +00:00
Daniel Hensby
d54f2b35c5
Merge tag '3.5.2' into 3.5
...
Release 3.5.2
2017-02-01 00:55:31 +00:00
Daniel Hensby
8b1af9f0c0
Merge tag '3.4.4' into 3.4
...
Release 3.4.4
2017-02-01 00:54:02 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5
2017-01-31 13:33:00 +00:00
Daniel Hensby
73a83954ea
Merge branch '3.4.4' into 3.4
2017-01-31 13:32:31 +00:00
Dan Hensby
00cdc33845
Added 3.5.2 changelog
2017-01-31 12:07:13 +00:00
Dan Hensby
2e61655715
Update translations
2017-01-31 12:07:13 +00:00
Dan Hensby
02a87d4ed1
Added 3.4.4 changelog
2017-01-31 11:39:09 +00:00
Dan Hensby
56653cb5e2
Update translations
2017-01-31 11:39:08 +00:00
Damian Mooyman
609b0a612c
Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
...
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Dan Hensby
578f12204d
Added 3.5.2-rc1 changelog
2017-01-26 21:47:37 +00:00
Dan Hensby
247ddd5d46
Update translations
2017-01-26 21:47:36 +00:00
Daniel Hensby
3a6d41042f
Merge branch '3.4' into 3.5
2017-01-26 21:25:14 +00:00
Dan Hensby
c5a8963d32
Added 3.4.4-rc1 changelog
2017-01-26 18:57:28 +00:00
