Commit Graph

4581 Commits

Author SHA1 Message Date
Daniel Hensby
8847981a3d
Merge branch '4' 2018-07-30 17:11:06 +01:00
Daniel Hensby
c316c6bb7e
Merge pull request #110 from open-sausages/pulls/4/display-report-title-full-width
FIX Apply missing class to report header.
2018-07-30 16:58:55 +01:00
Daniel Hensby
284368797e
Merge branch '4' 2018-07-30 11:12:38 +01:00
Daniel Hensby
e9e5cdcc22
Merge branch '4.2' into 4 2018-07-30 11:11:39 +01:00
Maxime Rainville
3bbcfdde85 FIX Apply missing class to report header. 2018-07-27 17:06:38 +12:00
Daniel Hensby
e9c73e9332
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-24 23:57:44 +01:00
root
8c7acb3d24 Update translations 2018-07-24 19:07:49 +00:00
Daniel Hensby
94e177b4eb
Merge branch '4' 2018-07-23 17:17:17 +01:00
Daniel Hensby
46de3d8f19
Merge branch '4.2' into 4 2018-07-23 17:15:27 +01:00
Daniel Hensby
a3768f5f60
Merge branch '4.1' into 4.2 2018-07-23 17:15:05 +01:00
Daniel Hensby
c90f1ed47c
Merge pull request #106 from creative-commoners/pulls/4.3/injection
NEW Use Injector to create new class instances and pass $params
2018-07-16 10:06:02 +01:00
Robbie Averill
693889cb3e NEW Use Injector to create new class instances and pass $params
Also adds a couple of missing PHPDoc annotations for IDE hints
2018-07-16 17:07:00 +12:00
Maxime Rainville
26fb4643c8 Install 5.x-dev recipe when testing master.
Parent issue silverstripeltd/open-sourcerers#31
2018-06-29 16:41:59 +12:00
Robbie Averill
dce7df600b
Merge pull request #103 from open-sausages/pulls/4.3/increment-travis-to-4.3.x-dev
Increment travis root version to 4.3.x-dev
2018-06-27 09:45:15 +12:00
Maxime Rainville
650e17b3fd Increment travis root version to 4.3.x-dev 2018-06-26 17:39:51 +12:00
Damian Mooyman
745fdf87cf Update translations 2018-06-19 16:50:07 +12:00
Damian Mooyman
fd62136c8f
Merge pull request #102 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:12:51 +12:00
Dylan Wagstaff
326e19ac8e Add supported module badge to readme 2018-06-15 17:46:23 +12:00
Damian Mooyman
9b239fd9a3
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-15 16:32:48 +12:00
Damian Mooyman
75dfeb2b47 Update translations 2018-06-15 15:39:16 +12:00
Damian Mooyman
2a36be9bed Remove obsolete branch-alias 2018-06-15 15:29:59 +12:00
Ingo Schommer
86850eefb7
Merge pull request #101 from open-sausages/pulls/4/update-recipe-branch
Update recipe branching
2018-06-14 16:44:39 +12:00
Damian Mooyman
7eacd8a3c3
Update recipe branching 2018-06-14 13:55:46 +12:00
Damian Mooyman
fd4b305607
Update build config for master 2018-02-14 14:16:19 +13:00
Damian Mooyman
13f088ee4a
Merge remote-tracking branch 'origin/4'
# Conflicts:
#	composer.json
2018-02-07 18:08:26 +13:00
Damian Mooyman
cb14e856ff
Update travis.yml 2018-02-07 18:04:32 +13:00
Damian Mooyman
dee598eb0e
Update travis.yml 2018-02-07 18:01:05 +13:00
Damian Mooyman
ac23686777
Update alias 2018-02-07 17:59:11 +13:00
Damian Mooyman
00cff693a6
Merge remote-tracking branch 'origin/4.0' into 4 2018-02-05 18:07:25 +13:00
Daniel Hensby
4c549d653a
Merge pull request #98 from open-sausages/pulls/4.0/update-ci
Update CI to use recipe
2018-01-25 13:19:39 +00:00
Damian Mooyman
7c0795eb68
Update CI to use recipe 2018-01-25 11:57:16 +13:00
Daniel Hensby
45745d6a4b
Merge branch '4' 2018-01-16 12:19:05 +00:00
Daniel Hensby
7e927aed74
Merge branch '3' into 4 2018-01-16 12:18:34 +00:00
Daniel Hensby
b7b1b4d024
Merge branch '4.0' into 4 2018-01-16 12:18:32 +00:00
Daniel Hensby
2f59965515
Merge branch '3.6' into 4.0 2018-01-16 12:17:40 +00:00
Daniel Hensby
01fd709d74
Merge branch '3.6' into 3 2018-01-16 12:13:58 +00:00
Daniel Hensby
5ddb796d15
Merge branch '3.5' into 3.6 2018-01-16 12:01:55 +00:00
Damian Mooyman
8443529646
Merge pull request #97 from creative-commoners/pulls/4.1/remove-report-heading
NEW Remove duplicated report heading
2017-12-18 14:14:46 +13:00
Robbie Averill
8a29918ac5 NEW Remove duplicated report heading 2017-12-17 21:25:19 +13:00
Damian Mooyman
4d3ad97a69
Merge pull request #95 from open-sausages/pulls/4.1/composer-does-prefer-dist
Feature Set .gitattributes to ignore docs and tests folder, and …
2017-12-14 17:54:35 +13:00
Damian Mooyman
a9db6dee3a
Merge pull request #88 from creative-commoners/pulls/dynamic-link
NEW Add support for callable link formatting
2017-12-14 13:44:58 +13:00
Damian Mooyman
b006a9968a Linting, phpdoc and code style fixes 2017-12-14 13:38:15 +13:00
Robbie Averill
b4a3529339 FIX Minor linting violation in Report 2017-12-14 13:32:50 +13:00
Christopher Joe
4d8053611d Feature Set .gitattributes to ignore docs and tests folder, and some source asset files which are not needed 2017-12-13 12:32:55 +13:00
Damian Mooyman
ed16d96842 Update translations 2017-12-07 11:08:26 +13:00
Christopher Joe
86f845972f BUG Actioned feedback 2017-11-27 14:46:05 +13:00
Will Rossiter
5b335ad511 NEW Add support for callable link formatting 2017-11-27 14:46:05 +13:00
Damian Mooyman
6ac1dea913
Merge pull request #93 from dhensby/pulls/3.5/phpunit-loosen-constraint
Loosen PHPUnit constraints
2017-11-20 13:57:13 +13:00
Damian Mooyman
e575bff1af
Merge pull request #94 from dhensby/pulls/3.5/remove-php7-test
Remove php7 test suite as its pointless
2017-11-20 13:56:54 +13:00
Daniel Hensby
14eeb10d31
Remove php7 test suite as its pointless 2017-11-17 12:07:34 +00:00