cbffc5b935
Merge branch '3'
2018-02-21 13:30:39 +00:00
8c82965e7e
Merge branch '2' into 3
2018-02-21 13:28:13 +00:00
96af48a2fe
Merge branch '3.1' into 3
2018-02-21 11:55:43 +00:00
0974e36d57
Merge branch '3.0' into 3.1
2018-02-21 11:49:19 +00:00
51dd4cab65
Merge branch '2.0' into 3.0
2018-02-21 11:25:09 +00:00
30ae7e4037
Merge branch '2.0' into 2
2018-02-21 09:25:13 +00:00
5945ce105f
Merge branch '1.5' into 2.0
2018-02-21 09:24:30 +00:00
e20ead2624
Merge branch '1.4' into 1.5
2018-02-21 09:23:34 +00:00
e2bfcd1d9f
Merge branch '2.0' into 2
2018-02-21 16:23:28 +13:00
b192551f30
Merge branch '3'
2018-02-12 11:13:37 +13:00
ed51125b91
Merge branch '3.1' into 3
2018-02-12 11:12:12 +13:00
6d8b41ee5a
Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many ( #243 )
...
* Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many
* just compare table names rather than updating existing getSortTable() func
2018-02-12 11:08:47 +13:00
37a206cf46
Merge pull request #244 from zanderwar/patch-1
...
Added installation instruction
2018-02-11 14:43:22 +13:00
9d4c87f5c7
Added installation instruction
2018-02-11 05:48:09 +10:00
d1021ace51
Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many ( #243 )
...
* Fixed GridFieldOrderableRows issue when data class is Versioned and relation is has_many
* just compare table names rather than updating existing getSortTable() func
2018-01-30 20:40:59 +00:00
509abf1532
Merge pull request #233 from silverstripe-terraformers/feature/SS4_upgrade_fixes
2018-01-26 16:34:31 +00:00
64b6fd04f3
Merge pull request #238 from creative-commoners/pulls/3.1/fix-searchbutton
...
FIX Update GridFieldAddExistinSearchButton and dialog to use Bootstrap classes
2018-01-26 16:31:31 +00:00
4955b9c4b9
Merge pull request #239 from creative-commoners/pulls/3.1/add-7.2
...
Add PHP 7.2 to Travis build matrix, add individual phpcs ruleset
2018-01-26 13:48:10 +00:00
6ef71280d1
Merge pull request #240 from creative-commoners/pulls/3.1/add-new-multi-class-width
...
FIX Remove excessive width on add new multi class dropdown
2018-01-26 13:47:15 +00:00
cd1fdada5d
FIX Remove excessive width on add new multi class dropdown
...
This removes a width definition added in da2e75f
2018-01-26 14:05:16 +13:00
24db0da047
Fix PSR-2 rule violations and incorrect docblock return type
2018-01-26 13:40:06 +13:00
b29db7a4e7
Add PHP 7.2 to Travis build matrix, add individual phpcs ruleset
2018-01-26 13:37:44 +13:00
6bf1a05975
Update branch alias for 4.x-dev
2018-01-26 12:06:49 +13:00
8e8c1db7bf
Merge branch '3'
2018-01-26 12:06:24 +13:00
e67065a780
Update branch alias for 3.2.x-dev
2018-01-26 12:05:25 +13:00
af0f342c3b
Fix stopPropagation on click if no GridFieldEditableColumns
...
stopPropagation shouldn't fire if no GridFieldEditableColumns was added. It forces user to click on edit button on the far right instead of directly being able to click anywhere on the row.
2018-01-26 12:02:29 +13:00
978fda31d4
Merge pull request #129 from helpfulrobot/add-standard-code-of-conduct-file
...
Added standard code of conduct file
2018-01-26 11:55:52 +13:00
f540f247bb
Merge pull request #235 from DrMartinGonzo/patch-1
...
Fix stopPropagation on click if no GridFieldEditableColumns
2018-01-26 11:54:36 +13:00
eb9093a3ac
Update translations
2018-01-26 11:53:55 +13:00
0a16566471
FIX Convert broken add-existing-search-form styles to use Bootstrap lists and pagination
2018-01-26 11:53:40 +13:00
8ba5c3435e
FIX Switch Add Existing from jQuery UI to use Bootstrap styles
2018-01-26 11:01:24 +13:00
14c0080853
Update branch alias for 3.x-dev
2018-01-18 11:45:47 +13:00
eee01960e8
Merge branch '3.1'
2018-01-18 11:45:08 +13:00
692b9df70c
Merge branch '3.0' into 3.1
2018-01-18 11:43:46 +13:00
38c1168bea
Remove obsolete branch alias
2018-01-18 11:43:27 +13:00
84241738b6
Remove obsolete branch alias
2018-01-18 11:42:59 +13:00
30a4f34fbf
Fix stopPropagation on click if no GridFieldEditableColumns
...
stopPropagation shouldn't fire if no GridFieldEditableColumns was added. It forces user to click on edit button on the far right instead of directly being able to click anywhere on the row.
2018-01-14 08:44:17 +01:00
735cc01270
SS4 upgrade fixes.
2018-01-12 12:00:20 +13:00
dc34dbe781
Merge pull request #234 from nspyke/css-typo-fix
...
FIX CSS typo's
2018-01-11 14:54:11 +13:00
6bcb983605
FIX CSS typo's
2018-01-11 12:52:57 +13:00
6096a5ae53
Merge pull request #197 from flamytwista/patch-1
...
Russian Translation
2018-01-10 13:55:37 +13:00
102768763a
Russian Translation
2018-01-10 13:50:08 +13:00
18b7032211
Merge pull request #231 from creative-commoners/pulls/3.0/fix-configurable-paginator-styles
...
FIX Update template classes and styles for configurable paginator
2017-12-01 10:50:33 +13:00
ade9bb50f4
FIX Update template classes and styles for configurable paginator
2017-12-01 10:41:17 +13:00
0203e33117
Merge pull request #224 from creative-commoners/pulls/3.0/multiclass-ux-updates
...
FIX Minor UX tweak to add new multi class button, removing empty space and padding
2017-11-09 10:21:05 +13:00
fdbac60300
Remove PHP 5.3 from Travis builds
2017-11-08 15:22:13 +13:00
4580d0b913
FIX Minor UX tweak to add new multi class button, removing empty space and padding
2017-11-08 12:59:14 +13:00
da67666c22
Merge pull request #220 from christopherdarling/patch-1
...
DOCS fix removeComponentsByType example
2017-11-08 12:43:44 +13:00
d5960b5efb
DOCS fix removeComponentsByType example
...
missing namespace
2017-11-06 12:06:00 +00:00
40ed8c7f49
Merge pull request #205 from creative-commoners/pulls/3.0/fix-closure-import
...
FIX Import Closure class for type checking, and only set sort if the sort field exists
2017-10-26 14:37:52 +13:00
Daniel Hensby
Robbie Averill
Priyashantha
Robbie Averill
Reece Alexander
Daniel Hensby
Martin Portevin
Mojmir Fendek
Nik Spijkerman
Taras Yemtsov
Dylan Wagstaff
Christopher Darling