Daniel Hensby
|
d0f65850fa
|
Merge branch '3' into 4
|
2017-07-26 10:45:44 +01:00 |
|
Daniel Hensby
|
6025de29cc
|
Merge branch '3.6' into 3
|
2017-07-26 10:45:27 +01:00 |
|
Daniel Hensby
|
e8fef7ebdd
|
Merge branch '3.5' into 3.6
|
2017-07-26 10:45:00 +01:00 |
|
Daniel Hensby
|
28b79c88ff
|
Stay on travis precise for now
|
2017-07-26 10:43:43 +01:00 |
|
Marco Hermo
|
09bd6fc231
|
Adds missing PreviewPanel template file to the main reports folder (#75)
See Issue 1841 - BUG Navigating to a page from reports section loads broken CMSMain view
|
2017-07-21 09:16:28 +12:00 |
|
Daniel Hensby
|
879ce3086c
|
Merge pull request #80 from robbieaverill/pulls/4.0/make-excluded-reports-configurable
API Remove Report::add_excluded_report() and make excluded_reports configurable
|
2017-07-17 14:06:12 +01:00 |
|
Daniel Hensby
|
36d745ab24
|
Add .codecov.yml file
|
2017-07-17 14:04:44 +01:00 |
|
Daniel Hensby
|
92ffc87e97
|
Merge pull request #81 from robbieaverill/pulls/4.0/enable-code-coverage
FIX Re-enable code coverage runs with phpdbg
|
2017-07-17 14:04:05 +01:00 |
|
Robbie Averill
|
85c79d4e66
|
FIX Re-enable code coverage runs with phpdbg
|
2017-07-16 16:42:16 +12:00 |
|
Robbie Averill
|
4aefa50087
|
Remove unused test report stubs
|
2017-07-16 16:37:08 +12:00 |
|
Robbie Averill
|
c3d2ba06c6
|
Update SilverStripe version requirement in readme
|
2017-07-16 16:36:22 +12:00 |
|
Robbie Averill
|
f4af1fab77
|
API Remove Report::add_excluded_report() and make excluded_reports configurable
|
2017-07-16 16:36:12 +12:00 |
|
Christopher Joe
|
bf4e7224e0
|
Update composer alias
|
2017-07-06 09:20:17 +12:00 |
|
Damian Mooyman
|
fdbd6015d8
|
Fix dependencies
|
2017-07-04 09:18:21 +12:00 |
|
Damian Mooyman
|
62419d748d
|
Update translations
|
2017-07-03 17:17:41 +12:00 |
|
Damian Mooyman
|
614ebcfcd9
|
Remove obsolete branch-alias
|
2017-07-03 16:53:55 +12:00 |
|
Chris Joe
|
e532d01821
|
Merge pull request #79 from open-sausages/pulls/4.0/upgrader-tweaks
Add extra upgrade rules
|
2017-07-03 15:59:12 +12:00 |
|
Damian Mooyman
|
b1ec225246
|
Add extra upgrade rules
|
2017-07-03 14:32:26 +12:00 |
|
Daniel Hensby
|
84fb64bf8f
|
Merge branch '3'
|
2017-06-28 11:18:15 +01:00 |
|
Ingo Schommer
|
9e7108420b
|
Merge pull request #78 from sminnee/resource-loading
API: Remove REPORTS_DIR and its use.
|
2017-06-28 21:00:19 +12:00 |
|
Sam Minnee
|
cf5115624d
|
API : Remove REPORTS_DIR and its use.
Relies on
https://github.com/silverstripe/silverstripe-framework/pull/7065
|
2017-06-28 16:39:18 +12:00 |
|
Daniel Hensby
|
76b59e7464
|
Merge branch '3.6' into 3
|
2017-06-27 13:17:31 +01:00 |
|
Daniel Hensby
|
108869841c
|
Merge pull request #77 from open-sausages/pulls/4.0/namespace-in-docs
FIX namespaces in docs
|
2017-06-27 12:47:32 +01:00 |
|
Saophalkun Ponlu
|
ab0b3d8a2f
|
FIX namespaces in docs
|
2017-06-27 15:52:13 +12:00 |
|
Damian Mooyman
|
1e386c83f6
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# composer.json
|
2017-06-27 13:41:28 +12:00 |
|
Ingo Schommer
|
a58416b6f6
|
New style travis tests
- Removed PHP 5.5. build (no longer supported)
- Removed PG and SQLite tests (tested through installer nightly)
- Added code coverage and linting tests
- Fixed linting errors
|
2017-06-26 21:45:56 +12:00 |
|
Ingo Schommer
|
19fa5355ce
|
Merge pull request #76 from creative-commoners/pulls/3.6/add-php7-build
Add PHP 7.1 and SS 3.6 build to Travis configuration
|
2017-06-26 15:16:01 +12:00 |
|
Robbie Averill
|
83dae0fbac
|
Add PHP 7.1 and SS 3.6 build to Travis configuration
|
2017-06-23 16:01:58 +12:00 |
|
Ingo Schommer
|
179310e457
|
Merge pull request #74 from open-sausages/pulls/4.0/app-object
[WIP] Upgrade module for app object refactor
|
2017-06-22 23:00:52 +12:00 |
|
Damian Mooyman
|
7bab717c8d
|
Update phpunit
|
2017-06-21 21:05:12 +12:00 |
|
Damian Mooyman
|
8dbdc98cc2
|
Upgrade module for app object refactor
|
2017-06-21 16:30:14 +12:00 |
|
Simon Erkelens
|
03125b8c6c
|
API Changes for Authenticator refactor
|
2017-06-09 16:48:30 +12:00 |
|
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 |
|