Commit Graph

4558 Commits

Author SHA1 Message Date
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
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
3844f42a8b
Merge remote-tracking branch 'origin/4' 2017-10-25 17:16:06 +13: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
13d92fa5a4
Update dependencies 2017-10-12 13:32:42 +13:00
Damian Mooyman
6112ae6ac7
Merge 4 into master 2017-10-12 13:28:52 +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
Daniel Hensby
0383ab4801
Merge branch '4' 2017-09-28 17:25:20 +01: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