Daniel Hensby
2aa6433357
Merge branch '3.6' into 3
2017-05-31 00:06:39 +01:00
Daniel Hensby
2e29bf27fe
Merge branch '3.5' into 3.6
2017-05-31 00:06:19 +01:00
Daniel Hensby
c249173e48
Merge tag '3.6.0' into 3.6
...
Release 3.6.0
2017-05-31 00:06:19 +01:00
Daniel Hensby
be44c5e7df
Merge branch '3.4' into 3.5
2017-05-31 00:05:59 +01:00
Daniel Hensby
63bbc0bae4
Merge tag '3.5.4' into 3.5
...
Release 3.5.4
2017-05-31 00:05:59 +01:00
Daniel Hensby
d1764ffc08
Merge tag '3.4.6' into 3.4
...
Release 3.4.6
2017-05-31 00:05:32 +01:00
Daniel Hensby
a0fc3aa86f
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:30:58 +01:00
Daniel Hensby
c2e804ad72
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:04:35 +01:00
Daniel Hensby
c927870432
Merge branch '3.3' into 3.4
2017-05-28 21:37:05 +00:00
Daniel Hensby
3f112ecfcd
Merge pull request #71 from open-sausages/pulls/4.0/remove-toolbar-header
...
Remove empty toolbar header from reports list
2017-05-18 11:18:05 +01:00
Ingo Schommer
c37c69097d
Remove empty toolbar header from reports list
...
See https://github.com/silverstripe/silverstripe-cms/issues/981
2017-05-18 22:06:02 +12:00
Garion Herman
19974fe1f2
Fix PHPDoc for Report::add_excluded_reports method.
2017-05-11 09:30:15 +12:00
Aaron Carlino
664fa75a02
Reorganise i18n keys
2017-05-08 17:56:43 +12:00
Ingo Schommer
24afd61131
Merge pull request #70 from sminnee/drop-php55
...
FIX: Drop php5.5, add php7.1, simplify build
2017-05-04 16:13:54 +12:00
Sam Minnee
4332d2fa8e
FIX: Drop php5.5, add php7.1, simplify build
...
SS4 no longer supports PHP 5.5 so I’ve dropped it. In addition I’ve
reduced the double-up of builds as we don’t need so many. And I’ve
added PHP 7.1
2017-05-04 15:25:14 +12:00
Daniel Hensby
7172eecd08
Aliasing 3 as 3.7.x-dev
2017-04-21 16:13:40 +01:00
Loz Calver
c1d2696514
Merge pull request #65 from sminnee/fix-php-req
...
FIX: Relax PHP version requirement.
2017-04-04 00:03:05 +01:00
Sam Minnee
e5f51b14a3
FIX: Relax PHP version requirement.
...
PHP7 support for SS3 is currently under development and the safest
approach is to fix this module first.
2017-04-04 10:58:52 +12:00
Damian Mooyman
27b2037c68
Merge pull request #64 from sminnee/license-file
...
FIX: Rename license file to match module standard.
2017-03-29 17:34:30 +13:00
Sam Minnee
59a9ff8459
FIX: Rename license file to match module standard.
2017-03-29 12:58:41 +13:00
Damian Mooyman
5dace88830
Merge pull request #63 from open-sausages/pulls/add-admin-dep
...
Add silverstripe/admin dep
2017-03-15 14:24:46 +13:00
Ingo Schommer
02446a47a5
Add silverstripe/admin dep
2017-03-15 14:09:09 +13:00
Ingo Schommer
376d2bfbc1
Merge pull request #62 from open-sausages/pulls/4.0/admin-module-split
...
API move CMSPreviewable to ORM
2017-03-15 12:02:05 +13:00
Damian Mooyman
4599b2b52c
API move CMSPreviewable to ORM
2017-03-15 10:38:36 +13:00
Damian Mooyman
240723b378
Merge pull request #60 from silverstripe/fix-composer
...
FIX: Allow pre-release versions of SS4.
2017-02-27 14:39:07 +13:00
Sam Minnee
c9e2c249c2
FIX: Allow pre-release versions of SS4.
...
Since SS4 has not yet been released, and this module is used to test
pre-release versions of SS4, we need to have @dev on the requirement
to make it as flexible as possible.
As a general rule, modules that plug *into* SS4 rather than making *use*
of it should have @dev on the end of their dependencies.
2017-02-27 09:19:43 +11:00
Ingo Schommer
015b400fb7
Merge pull request #59 from open-sausages/pulls/4.0/i18n-locale
...
Remove unnecessary tinymce config
2017-02-16 10:56:51 +13:00
Damian Mooyman
b4e047b39f
Remove unnecessary tinymce config
2017-01-26 17:22:54 +13:00
Daniel Hensby
37a7e68f2d
Merge pull request #58 from open-sausages/pulls/4.0/i18n-symfony
...
BUG Fix missing default on _t(‘GridField.Filter’)
2017-01-24 12:19:07 +00:00
Damian Mooyman
3c8a56f904
BUG Fix missing default on _t(‘GridField.Filter’)
2017-01-24 12:30:06 +13:00
Damian Mooyman
3cadebf595
Merge pull request #57 from open-sausages/features/4.0/ui-button-refresh
...
Refresh CMS UI buttons to new flat style and bootstrap classes
2017-01-11 14:27:02 +13:00
Paul Clarke
d67aee56fe
Update icon
2016-12-20 16:13:46 +13:00
Paul Clarke
417fb81ae4
add font-icon to menu
2016-12-20 13:30:50 +13:00
Daniel Hensby
cb06593a65
Merge branch '3'
2016-11-30 11:22:46 +00:00
Daniel Hensby
b10955d985
Merge branch '3.5' into 3
2016-11-28 14:14:09 +00:00
Daniel Hensby
dcb8024158
Merge tag '3.5.0' into 3.5
...
Release 3.5.0
2016-11-28 14:13:29 +00:00
Daniel Hensby
9c5974a13b
Merge branch '3.4' into 3.5.0
2016-11-15 12:09:14 +00:00
Daniel Hensby
da4aeda90e
Merge branch '3.3' into 3.4
2016-11-15 12:08:32 +00:00
Daniel Hensby
65e0b6ef35
Merge branch '3.2' into 3.3
2016-11-15 12:08:05 +00:00
Daniel Hensby
8e5462794d
Merge pull request #1 from silverstripe-security/patch/3.2/SS-2016-012
2016-11-15 12:07:00 +00:00
Damian Mooyman
a0eda1edd1
Increment 3 alias to 3.6
2016-11-14 10:04:09 +13:00
Daniel Hensby
804ff7c247
FIX Fixing test errors
2016-11-10 13:01:37 +00:00
Daniel Hensby
537f4da88f
Merge branch '3'
2016-11-10 12:19:27 +00:00
Damian Mooyman
43462f1afa
Merge pull request #55 from open-sausages/features/4.0/jlayout-to-flexbox
...
Replace Layout CSS classes for flexbox classes
2016-10-11 17:36:26 +13:00
Damian Mooyman
8dd40b3c26
Merge pull request #50 from open-sausages/pulls/4.0/reports-filter-spacing
...
Add spacing below filter action
2016-10-05 19:42:45 +13:00
Paul Clarke
97eac2eb09
Replace Layout CSS classes for flexbox classes
2016-10-05 17:48:03 +13:00
Loz Calver
fa7e0825c5
Merge pull request #54 from sminnee/the-chrisening
...
MINOR: Make use of static::class
2016-09-28 09:22:40 +01:00
Sam Minnee
c813488412
MINOR: Make use of static::class
2016-09-28 11:36:52 +13:00
Daniel Hensby
2c7846cb72
Merge pull request #53 from sminnee/no-class-property
...
FIX: Remove referencies to Object::$class
2016-09-27 22:15:51 +01:00
Sam Minnee
fe0ca63c7a
FIX: Remove referencies to Object::$class
...
This property is being deprecated in SS4 and so this removes references
to it.
2016-09-28 10:00:51 +13:00
