Commit graph

1349 commits

Author SHA1 Message Date
Stephen Ball 981e2a2b07 Fixed parse error..... Apparently I shouldn't be allowed near a computer today 2015-10-13 16:35:27 +01:00
Stephen Ball ffc3252fae Clean up PHPCS issue 2015-10-13 16:31:17 +01:00
Stephen Ball 6f4a18f0c8 Clean up PHPCS issue 2015-10-13 16:28:37 +01:00
Stephen Ball c42d2f3dad Added a fixed and broken stage 2015-10-13 16:22:39 +01:00
Dan Cryer efbd68a870 Merge pull request #1077 from GeneaLabs/feature/fix-arrangement-of-components
Fix Arrangement of Build Result Components
2015-10-13 15:33:33 +01:00
Dan Cryer e43a884016 Merge pull request #1078 from GeneaLabs/feature/fix-bootstrap-datepicker-locale
Fix Datepicker Locale File Include
2015-10-13 15:31:23 +01:00
Dan Cryer 94c2fab45a Merge pull request #1070 from cooperaj/master
Incorrect docblock
2015-10-13 15:26:57 +01:00
Dan Cryer 957c34ff26 Merge pull request #1025 from delormejonathan/patch-1
Fixed a css issue with Block8 logo
2015-10-13 15:14:59 +01:00
Dan Cryer fe21dd8bc3 Merge pull request #1021 from mrobinsonuk/cleanup/spelling-corrections
Corrected a number of minor spelling errors.
2015-10-13 15:14:44 +01:00
Dan Cryer 9a399f6638 Merge pull request #1019 from detain/mysql_plugin_host_support
Contribution Type: improvement / new feature
2015-10-13 15:13:55 +01:00
Dan Cryer 76f393e672 Merge pull request #998 from teemule11/bugfix-pdepend-1
Pdepend Module: make check for Pdepend output dir more robust.
2015-10-13 15:04:42 +01:00
Dan Cryer b57ed81779 Merge pull request #993 from corpsee/feature-phpcpd-fix
Fixed GithubBuild::getDiffLineNumber method for correct phpcpd work
2015-10-13 15:04:13 +01:00
Dan Cryer 5e99048213 Merge pull request #992 from corpsee/feature-phpunit-fixes
Fixed TapParser parse fail
2015-10-13 15:03:09 +01:00
Dan Cryer d8859e35d4 Merge pull request #972 from memnuniyetsizim/master
Fixes default value for PHP Cs Fixer ( #833 )
2015-10-13 14:45:20 +01:00
Dan Cryer 5b661e240e Merge pull request #942 from corpsee/feature-archived-fix
Separated strings for 'archived'/'archived_menu'
2015-10-13 14:33:07 +01:00
Dan Cryer df9d7e1e9b Merge pull request #939 from drydenmaker/master
adding windows batch file for console
2015-10-13 14:32:12 +01:00
Dan Cryer a2cdda1bf3 Merge pull request #1080 from GeneaLabs/feature/add-logo-icon-images
Add Logo Icons
2015-10-13 14:18:19 +01:00
Dan Cryer 7dcd8ec92a Merge branch 'master' of github.com:Block8/PHPCI 2015-10-13 10:00:17 +01:00
Dan Cryer 1bcdfbd2df Updating deps 2015-10-13 09:59:48 +01:00
Mike Bronner 6b953c601c Merge branch 'master' into feature/add-logo-icon-images 2015-10-12 12:26:42 -07:00
Mike Bronner be6ae868f4 Add logo icons 2015-10-12 12:23:55 -07:00
Dan Cryer c8b577acca Merge pull request #1079 from GeneaLabs/feature/fix-missing-sprintf-map-file
Add Missing sprintf.min.map File
2015-10-12 16:06:34 +01:00
Mike Bronner c3039c701e Add missing sprintf.min.map file 2015-10-10 10:07:31 -07:00
Mike Bronner 6545379b8c Check if datepicker locale file exists 2015-10-10 09:54:01 -07:00
Mike Bronner d446955629 Move id attribute to outer div to hide the result component completely
This will allow the other non-hidden components to properly reflow on the page.
2015-10-10 09:22:53 -07:00
Dan Cryer 024081c4b9 Fixing login stuff 2015-10-09 11:10:14 +01:00
Dan Cryer 1849aa922c Fixing ordering on projects for @REBELinBLUE 2015-10-09 10:58:18 +01:00
Dan Cryer 1745003f23 Merge pull request #1075 from Block8/dc/phpci-fixes
Fixing PHPCI Errors
2015-10-09 10:40:12 +01:00
Dan Cryer f7a20d8720 Fix 2015-10-09 10:37:50 +01:00
Dan Cryer df2ca2ee2a Fixing tests #2 2015-10-09 10:29:21 +01:00
Dan Cryer bb87c4d54c Fixing tests 2015-10-09 10:14:54 +01:00
Dan Cryer 42d6bce14c Docblocks 2015-10-09 09:38:55 +01:00
Dan Cryer 1e8e97ab6c Cleaning up BuildWorker #1 2015-10-09 09:27:45 +01:00
Dan Cryer 58f7d8a916 Cleanup of new executor changes. 2015-10-09 09:16:05 +01:00
Dan Cryer e5393e7e26 PHPMD Fix 2015-10-08 20:27:40 +01:00
Dan Cryer a5cd3cbd75 PHPMD Fixes 2015-10-08 20:24:32 +01:00
Dan Cryer a07d572399 PHPCS Fix 2015-10-08 20:22:43 +01:00
Dan Cryer e1717bf549 Fixing PHPCS error in HomeController 2015-10-08 20:20:42 +01:00
Dan Cryer a5f2182cf9 Restoring to login by email. 2015-10-08 20:15:20 +01:00
Dan Cryer d3211b2c47 Missing build bugfix. 2015-10-08 17:30:34 +01:00
Dan Cryer 79b81675de Adding the ability to run branch-specific stages 2015-10-08 16:54:01 +01:00
Dan Cryer 5da7739380 Updating deps. 2015-10-08 16:53:39 +01:00
Dan Cryer a9eeb69092 Updating builds to try database config first, and fall back to file config. 2015-10-08 16:52:44 +01:00
Dan Cryer dcfacfe717 General model / store cleanup 2015-10-08 16:52:19 +01:00
Dan Cryer 522eaef825 Adding project groups 2015-10-08 16:33:01 +01:00
Dan Cryer 70db830065 Removing the ability to install 'plugins' via the web interface. 2015-10-08 16:29:29 +01:00
Dan Cryer a15f1efda7 Merge branch 'master' of github.com:Block8/PHPCI 2015-10-08 09:49:20 +01:00
Dan Cryer f671b307d1 Build worker should delete jobs in its queue that are not recognised. 2015-10-08 09:49:16 +01:00
Dan Cryer 49578a0e4a Merge pull request #1073 from REBELinBLUE/add_commit_message_to_deploy_reason
Added the commit message to the BuildInterpolator
2015-10-07 15:08:52 +01:00
Stephen Ball dbc2ae97d6 Added the commit message to the BuildInterpolator so it can be used as the default reason passed to deployer 2015-10-07 15:06:07 +01:00