Commit Graph

4685 Commits

Author SHA1 Message Date
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
Daniel Hensby
b406d8724f
Loosen PHPUnit constraints 2017-11-17 11:41:43 +00:00
Damian Mooyman
cd94e99d89
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-16 10:28:01 +13:00
Daniel Hensby
ece79fd2b2
Merge pull request #90 from creative-commoners/pulls/4.0/filter-button-class
FIX Add primary button class to 'Filter' button
2017-11-07 15:59:47 +00:00
Damian Mooyman
ec40ffb2cf
Merge pull request #89 from dhensby/pulls/3.5/composer-autoload
Add composer autoloading support to 3.x
2017-11-02 11:42:04 +13:00
Robbie Averill
26dc7373ba FIX Add primary button class to 'Filter' button 2017-10-30 11:51:00 +13:00
Daniel Hensby
a548f0290e
Add composer autoloading support to 3.x 2017-10-25 18:44:03 +01:00
Damian Mooyman
f7815b52e5
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-25 17:15:18 +13:00
Daniel Hensby
0f387ad6a1 Merge pull request #87 from open-sausages/pulls/4.0/i-smith-thee-with-my-css-hammer
BUG align heading properly
2017-10-12 08:33:14 +01:00
Christopher Joe
6fe1e2c5b2 BUG align heading properly 2017-10-12 16:48:08 +13:00
Damian Mooyman
8020e36409
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-12 12:58:30 +13:00
Damian Mooyman
c5ca89a173
Update editorconfig 2017-10-12 12:57:05 +13:00
Damian Mooyman
7a2344117e Remove obsolete branch-alias 2017-10-11 17:31:46 +13:00
Chris Joe
4a80bd9166 Merge pull request #85 from open-sausages/pulls/4.0/vendor-phpunit
BUG Fix vendor bootstrap path
2017-10-05 10:06:15 +13:00
Damian Mooyman
ca60b94f2e
BUG Fix vendor bootstrap path 2017-10-05 09:50:04 +13:00
Damian Mooyman
418ac59e90 Merge pull request #84 from open-sausages/pulls/4/vendorise-me-baby
Expose as vendor module
2017-10-03 16:22:47 +13:00
Ingo Schommer
9ce1eedf2f Expose as vendor module 2017-09-27 18:09:56 +13:00
Chris Joe
04e4c7d1a4 Merge pull request #82 from open-sausages/pulls/1.0/toolbar-style-layout
FIX toolbar title layout
2017-09-21 16:47:51 +12:00
Damian Mooyman
9afcf7780a Merge pull request #83 from dhensby/pulls/4/travis-composer-updates
Make composer installs on travis more efficient
2017-09-21 00:23:47 +12:00
Daniel Hensby
448955d82f
Make composer installs on travis more efficient 2017-09-19 11:56:55 +01:00
Saophalkun Ponlu
cda78e2d88 FIX add space below report filter form 2017-09-19 10:15:08 +12:00
Saophalkun Ponlu
5351ba670f FIX toolbar title layout 2017-09-15 15:44:31 +12:00
Damian Mooyman
e9c7273bb4 Update translations 2017-08-07 14:34:14 +12:00
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