From a548f0290e1f573ee75aa5aa5eafb2e2c773095c Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Wed, 25 Oct 2017 18:00:23 +0100 Subject: [PATCH 1/4] Add composer autoloading support to 3.x --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index f585dfce..9e1c8f0b 100644 --- a/composer.json +++ b/composer.json @@ -26,5 +26,8 @@ }, "require-dev": { "phpunit/PHPUnit": "~3.7" + }, + "autoload": { + "classmap": ["code"] } } From b406d8724fe276da61214137adc49b07c797d2b5 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 17 Nov 2017 11:41:43 +0000 Subject: [PATCH 2/4] Loosen PHPUnit constraints --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9e1c8f0b..2c22111b 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ } }, "require-dev": { - "phpunit/PHPUnit": "~3.7" + "phpunit/phpunit": "^3 || ^4 || ^5" }, "autoload": { "classmap": ["code"] From 14eeb10d31beb013f047b55ff3149fd3bb8e89ec Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 17 Nov 2017 12:07:34 +0000 Subject: [PATCH 3/4] Remove php7 test suite as its pointless --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3894944..212be62c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ php: - 5.4 - 5.5 - 5.6 - - 7.0 env: - DB=MYSQL CORE_RELEASE=3.3 @@ -22,8 +21,6 @@ matrix: env: DB=PGSQL CORE_RELEASE=3 - php: 5.6 env: DB=PGSQL CORE_RELEASE=3.2 - allow_failures: - - php: 7.0 before_script: - composer self-update || true From ed16d968427aa9106b7748e475635a7ad81924ff Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 7 Dec 2017 11:08:26 +1300 Subject: [PATCH 4/4] Update translations --- lang/hr.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lang/hr.yml diff --git a/lang/hr.yml b/lang/hr.yml new file mode 100644 index 00000000..1e3accd4 --- /dev/null +++ b/lang/hr.yml @@ -0,0 +1,6 @@ +hr: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: IzvjeĆĄtaji + ReportTitle: Naslov + SilverStripe\Reports\SideReport: + OtherGroupTitle: Drugi