Commit Graph

282 Commits

Author SHA1 Message Date
Daniel Hensby
be7cae29bf
Merge branch '2' into 3.0 2022-05-19 10:08:22 +01:00
Daniel Hensby
ef197ecd36
Merge branch '2.1' into 2 2022-05-19 09:31:46 +01:00
Daniel Hensby
fc485bd317
Merge branch '2.0' into 2.1 2022-05-19 09:30:58 +01:00
Daniel Hensby
5739a7b05a
Merge branch '1.5' into 2.0 2022-05-19 09:29:51 +01:00
Robbie Averill
670b88ee79 Merge branch '2.1' into 2 2019-07-24 12:45:32 +02:00
Robbie Averill
8eb66bc2eb Update Travis builds to include PHP 7, update PHPUnit to 5.7 2019-07-24 12:37:26 +02:00
Nathan
ce4d579e67
FIX(Composer): The 1.5 branch should now resolve correctly.
This affects older versions running `silverstripe-australia/` modules.
2018-12-12 15:49:25 +11:00
Robbie Averill
4821e9ef74
Merge pull request #276 from chrometoasters/bug/uploadfield-template
FIX: Prevent tmpl.js include on ajax request
2018-11-14 14:54:51 +02:00
Mohamed Alsharaf
aef80e1aec FIX: Prevent tmpl.js include on ajax request
Including tmpl.js from the framework third party directory interfere
with an upload field within a grid field edit form.
2018-11-14 09:23:48 +13:00
Robbie Averill
d88b60a7c2 Remove branch alias for 2.x 2018-09-20 17:06:52 +02:00
Robbie Averill
f81712b243 Merge branch '2.1' into 2 2018-09-20 17:06:31 +02:00
Robbie Averill
4346fd57e6 Remove obsolete branch alias 2018-09-20 17:05:45 +02:00
Robbie Averill
1ba0e644d4
Merge pull request #270 from zemiacsik/2
added support for PHP 7.2
2018-09-07 10:26:30 +02:00
zemiacsik
1cd4d99b6c
indent with 4 spaces instead of tab 2018-09-07 10:17:01 +02:00
zemiacsik
299086ea99
updated styling to follow PSR-2 2018-09-07 10:12:01 +02:00
matej
b28ded715c added support for PHP 7.2 2018-09-07 09:46:43 +02:00
Daniel Hensby
51dd4cab65
Merge branch '2.0' into 3.0 2018-02-21 11:25:09 +00:00
Daniel Hensby
30ae7e4037
Merge branch '2.0' into 2 2018-02-21 09:25:13 +00:00
Daniel Hensby
5945ce105f
Merge branch '1.5' into 2.0 2018-02-21 09:24:30 +00:00
Daniel Hensby
e20ead2624
Merge branch '1.4' into 1.5 2018-02-21 09:23:34 +00:00
Robbie Averill
e2bfcd1d9f Merge branch '2.0' into 2 2018-02-21 16:23:28 +13:00
Robbie Averill
38c1168bea Remove obsolete branch alias 2018-01-18 11:43:27 +13:00
Robbie Averill
fdbac60300
Remove PHP 5.3 from Travis builds 2017-11-08 15:22:13 +13:00
Robbie Averill
ab6dfabb8a Merge pull request #215 from dhensby/pulls/lastedit-bug
TEST Cover base table last edited update
2017-09-26 00:05:58 +13:00
Daniel Hensby
23c0a58e48
TEST Cover base table last edited update 2017-09-25 11:56:34 +01:00
Robbie Averill
b6f03225d0 Merge pull request #216 from dhensby/pulls/2.0/decouple-db-now
Use Datetime::now() for last edited updates in OrderableRows
2017-09-23 07:58:58 +12:00
Daniel Hensby
9d4ac960a7
Use Datetime::now() for last edited updates in OrderableRows 2017-09-22 13:55:14 +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
Jake B
04a07d505f FIX Backport and sanitiseClassName for the "Save" action URL 2017-09-04 14:59:38 +10:00
Robbie Averill
9ccd300629 Merge branch '2.0' into 2 2017-08-31 14:53:12 +12:00
Robbie Averill
730f7a13ea Merge branch '1.5' into 2.0 2017-08-31 14:52:32 +12:00
Robbie Averill
58200f847f FIX When setting the page sizes, reset items per page to the first value 2017-08-31 14:47:19 +12:00
Robbie Averill
a34d6242a5 Update branch alias 2017-08-31 14:45:42 +12:00
Robbie Averill
a36c96e692 Remove obsolete branch alias 2017-08-31 14:44:40 +12:00
Franco Springveldt
bb4bb62be3 Merge pull request #207 from creative-commoners/pulls/1.5/reset-page-size
FIX When setting the page sizes, reset items per page to the first value
2017-08-31 14:43:19 +12:00
Robbie Averill
320a6198e5 FIX When setting the page sizes, reset items per page to the first value 2017-08-31 14:35:52 +12:00
Damian Mooyman
e14ed0b47a Update vendor and create new major 2.x branch 2017-08-28 14:04:20 +12:00
Marcus
f80fc03bbb Merge pull request #201 from creative-commoners/pulls/1.5/configurable-page-length-component
NEW Add paginator with configurable page sizes
2017-08-24 16:31:10 +10:00
Robbie Averill
719b906460 DOCS Add use examples for GridFieldConfigurablePaginator 2017-08-23 14:07:42 +12:00
Marcus
d6f2df0700 Merge pull request #200 from dhensby/pulls/1.4/field-callback-saved-record
FIX Forms now instantiate fields with correct record context on save
2017-08-03 11:53:19 +10:00
Robbie Averill
36d9711a47 Use precise distro for Travis builds to allow PHP 5.3 to work 2017-08-02 10:03:00 +12:00
Robbie Averill
403900f1fd FIX Ensure selected page size is retained when deleting records 2017-08-02 09:31:59 +12:00
Robbie Averill
f0d2ec7733 FIX Always show page size dropdown when page size is greater than number of records 2017-08-01 16:44:12 +12:00
Robbie Averill
e95c92a168 NEW Add paginator with configurable page sizes 2017-08-01 14:09:15 +12:00
Daniel Hensby
ef354511d7
FIX Forms now instantiate fields with correct record context on save 2017-07-28 16:09:48 +01:00
Daniel Hensby
ff12337e6e
Merge branch '1.1' into 1.4 2017-07-05 15:26:38 +01:00
Nathan Glasl
315cb0b1c1 FIX, #195, the template folder required a vendor change. 2017-07-05 10:12:12 +10:00
Marcus
87cd8ffc6d Merge pull request #194 from dnadesign/fix-multi-class-injector
fix to multi-class for ss4 support
2017-07-03 10:28:57 +10:00
Nik Rolls
755cafa754 Enable namespace support for GridFieldAddNewMultiClass 2017-07-01 23:28:41 +10:00