Commit Graph

309 Commits

Author SHA1 Message Date
Robbie Averill
8e8c1db7bf Merge branch '3' 2018-01-26 12:06:24 +13:00
Robbie Averill
e67065a780 Update branch alias for 3.2.x-dev 2018-01-26 12:05:25 +13:00
Martin Portevin
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
Robbie Averill
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
Robbie Averill
f540f247bb
Merge pull request #235 from DrMartinGonzo/patch-1
Fix stopPropagation on click if no GridFieldEditableColumns
2018-01-26 11:54:36 +13:00
Robbie Averill
14c0080853 Update branch alias for 3.x-dev 2018-01-18 11:45:47 +13:00
Robbie Averill
eee01960e8 Merge branch '3.1' 2018-01-18 11:45:08 +13:00
Robbie Averill
692b9df70c Merge branch '3.0' into 3.1 2018-01-18 11:43:46 +13:00
Robbie Averill
38c1168bea Remove obsolete branch alias 2018-01-18 11:43:27 +13:00
Robbie Averill
84241738b6 Remove obsolete branch alias 2018-01-18 11:42:59 +13:00
Martin Portevin
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
Robbie Averill
dc34dbe781
Merge pull request #234 from nspyke/css-typo-fix
FIX CSS typo's
2018-01-11 14:54:11 +13:00
Nik Spijkerman
6bcb983605 FIX CSS typo's 2018-01-11 12:52:57 +13:00
Robbie Averill
6096a5ae53
Merge pull request #197 from flamytwista/patch-1
Russian Translation
2018-01-10 13:55:37 +13:00
Taras Yemtsov
102768763a Russian Translation 2018-01-10 13:50:08 +13:00
Dylan Wagstaff
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
Robbie Averill
ade9bb50f4 FIX Update template classes and styles for configurable paginator 2017-12-01 10:41:17 +13:00
Dylan Wagstaff
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
Robbie Averill
4580d0b913 FIX Minor UX tweak to add new multi class button, removing empty space and padding 2017-11-08 12:59:14 +13:00
Robbie Averill
da67666c22
Merge pull request #220 from christopherdarling/patch-1
DOCS fix removeComponentsByType example
2017-11-08 12:43:44 +13:00
Christopher Darling
d5960b5efb
DOCS fix removeComponentsByType example
missing namespace
2017-11-06 12:06:00 +00:00
Dylan Wagstaff
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
Dylan Wagstaff
a7c5283bdd Merge branch 'master' into pulls/3.0/fix-closure-import 2017-10-26 14:34:43 +13:00
Robbie Averill
834547e5c0 Merge pull request #219 from martinduparc/patch-1
Fixed link to SS3 compatible branch
2017-10-26 09:13:45 +13:00
Martin D
931e014a0e Fixed link to SS3 compatible branch 2017-10-25 13:22:35 -04:00
Daniel Hensby
091954d987 Merge pull request #218 from creative-commoners/pulls/3.0/vendorise
API Install GridFieldExtensions to vendor folder, remove get_module_dir
2017-10-11 15:52:29 +01:00
Robbie Averill
efdf9dcc13 API Install GridFieldExtensions to vendor folder, remove get_module_dir 2017-10-11 09:34:02 +13:00
Robbie Averill
c120dc23ce Merge pull request #217 from creative-commoners/pulls/vendorise-ci
FIX convert CI bootstrap references to new their new locations in vendor
2017-10-05 12:44:54 +13:00
Dylan Wagstaff
e98226fe3d FIX convert CI bootstrap references to new their new locations in vendor 2017-10-05 10:07:55 +13:00
Daniel Hensby
ab28212d86 Merge pull request #204 from creative-commoners/pulls/3.0/fix-editable-columns-js
FIX Update selector for editable columns Javascript handler to match GridField.js in core
2017-09-28 16:53:34 +01:00
Robbie Averill
ee9bd6b234
FIX Update selector for editable columns Javascript handler to match GridField.js in core 2017-09-28 16:45:39 +01:00
Daniel Hensby
f764303ed0 Merge pull request #209 from creative-commoners/pulls/3.0/new-travis-config
FIX New Travis configuration, linting and updating existing skipped unit tests
2017-09-18 21:10:28 +01:00
Robbie Averill
cb94bbe5e0
FIX Update remaining unit tests, separate stubs, add PSR-4 autoloader 2017-09-18 21:06:17 +01:00
Robbie Averill
0ad1fc367e
MINOR Apply PSR-2 linting 2017-09-18 21:06:16 +01:00
Robbie Averill
3ee4ff4cb7
Update Travis configuration, add codecov.io and PHPUnit config 2017-09-18 21:06:16 +01:00
Daniel Hensby
9e26e38d75
Merge branch '2' 2017-09-18 17:39:41 +01:00
Daniel Hensby
fbc7278378
Merge branch '2.0' into 2 2017-09-18 14:45:58 +01:00
Daniel Hensby
09f6cdf299
Merge branch '1.5' into 2.0 2017-09-18 14:45:40 +01:00
Robbie Averill
39dddc4c91 Merge pull request #214 from open-sausages/pulls/2.0/better-casting
BUG Fix casting for ‘$Attributes’
2017-09-15 17:35:17 +12:00
Damian Mooyman
b7b3678b26
BUG Fix casting for ‘$Attributes’ 2017-09-15 17:03:20 +12:00
Robbie Averill
46b792b27f FIX Import Closure class for type checking, and only set sort if the sort field exists 2017-09-15 16:32:38 +12:00
Robbie Averill
37b35f6a46 Merge pull request #213 from open-sausages/pulls/2.0/fix-inline-editable
BUG Fix inline editing / sortable
2017-09-15 16:30:45 +12:00
Damian Mooyman
9421e85483 BUG Fix inline editing / sortable 2017-09-15 16:08:13 +12:00
Marcus
b07079d758 Merge pull request #211 from creative-commoners/pulls/2.0/add-button
FIX Upgrade button to use bootstrap classes
2017-09-12 09:42:15 +10:00
Sacha Judd
99f59c4efe FIX Upgrade button to use bootstrap classes 2017-09-08 15:19:15 +12:00
Robbie Averill
0404b305c7 Merge pull request #206 from open-sausages/pulls/2.0/fix-css-drag
BUG Fix incorrect drag-drop handle
2017-09-07 10:02:53 +12:00
Damian Mooyman
973f524b41
BUG Fix incorrect drag-drop handle
Update .editorconfig to match css / scss coding conventions
2017-09-06 09:13:56 +01:00
Marcus
db29e863f7 Merge pull request #210 from adrexia/feature/addnewcss
FIX: Add new multiclass UI
2017-09-06 10:47:27 +10:00
Jake B
04a07d505f FIX Backport and sanitiseClassName for the "Save" action URL 2017-09-04 14:59:38 +10:00
Naomi Guyer
da2e75f3c4 FIX: Add new multiclass UI
Visual fixes for add new multiclass button/selector
2017-09-01 23:05:02 +12:00