Commit graph

1349 commits

Author SHA1 Message Date
Stephen Ball 8f8009c30c Fixed parse error..... Apparently I shouldn't be allowed near a computer today 2015-10-13 16:35:27 +01:00
Stephen Ball 3f71695013 Clean up PHPCS issue 2015-10-13 16:31:17 +01:00
Stephen Ball 4a5b1afb47 Clean up PHPCS issue 2015-10-13 16:28:37 +01:00
Stephen Ball 8e0122f6a0 Added a fixed and broken stage 2015-10-13 16:22:39 +01:00
Dan Cryer 6aea2bdb88 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 3aeef0650d 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 5216270416 Merge pull request #1070 from cooperaj/master
Incorrect docblock
2015-10-13 15:26:57 +01:00
Dan Cryer ad27ca9037 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 1385379f1a 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 10720656f9 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 0fbae60f52 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 3d21ad24e9 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 d8cbe68705 Merge pull request #992 from corpsee/feature-phpunit-fixes
Fixed TapParser parse fail
2015-10-13 15:03:09 +01:00
Dan Cryer 6591ada85b 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 bee77a25c8 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 351b24c91d Merge pull request #939 from drydenmaker/master
adding windows batch file for console
2015-10-13 14:32:12 +01:00
Dan Cryer c49821adf1 Merge pull request #1080 from GeneaLabs/feature/add-logo-icon-images
Add Logo Icons
2015-10-13 14:18:19 +01:00
Dan Cryer ed35dee322 Merge branch 'master' of github.com:Block8/PHPCI 2015-10-13 10:00:17 +01:00
Dan Cryer 156c635af5 Updating deps 2015-10-13 09:59:48 +01:00
Mike Bronner a504789bd4 Merge branch 'master' into feature/add-logo-icon-images 2015-10-12 12:26:42 -07:00
Mike Bronner dc6e4ed6b4 Add logo icons 2015-10-12 12:23:55 -07:00
Dan Cryer c9f6946189 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 21b59ab4d4 Add missing sprintf.min.map file 2015-10-10 10:07:31 -07:00
Mike Bronner c474a5c73a Check if datepicker locale file exists 2015-10-10 09:54:01 -07:00
Mike Bronner 8845fe63d9 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 97216b0f41 Fixing login stuff 2015-10-09 11:10:14 +01:00
Dan Cryer 725ce70ae9 Fixing ordering on projects for @REBELinBLUE 2015-10-09 10:58:18 +01:00
Dan Cryer edcff1030d Merge pull request #1075 from Block8/dc/phpci-fixes
Fixing PHPCI Errors
2015-10-09 10:40:12 +01:00
Dan Cryer fbc3da59dd Fix 2015-10-09 10:37:50 +01:00
Dan Cryer f747371c6d Fixing tests #2 2015-10-09 10:29:21 +01:00
Dan Cryer 07b92fecf3 Fixing tests 2015-10-09 10:14:54 +01:00
Dan Cryer e61ce203a3 Docblocks 2015-10-09 09:38:55 +01:00
Dan Cryer a008358056 Cleaning up BuildWorker #1 2015-10-09 09:27:45 +01:00
Dan Cryer 68249d2f5d Cleanup of new executor changes. 2015-10-09 09:16:05 +01:00
Dan Cryer 4375c524a9 PHPMD Fix 2015-10-08 20:27:40 +01:00
Dan Cryer af90b94a3c PHPMD Fixes 2015-10-08 20:24:32 +01:00
Dan Cryer 2f859be369 PHPCS Fix 2015-10-08 20:22:43 +01:00
Dan Cryer 370eebd227 Fixing PHPCS error in HomeController 2015-10-08 20:20:42 +01:00
Dan Cryer ada9e33204 Restoring to login by email. 2015-10-08 20:15:20 +01:00
Dan Cryer 4e0325e887 Missing build bugfix. 2015-10-08 17:30:34 +01:00
Dan Cryer e871df80c2 Adding the ability to run branch-specific stages 2015-10-08 16:54:01 +01:00
Dan Cryer a7473eb250 Updating deps. 2015-10-08 16:53:39 +01:00
Dan Cryer 7ad1d317cd Updating builds to try database config first, and fall back to file config. 2015-10-08 16:52:44 +01:00
Dan Cryer 31165a6bfa General model / store cleanup 2015-10-08 16:52:19 +01:00
Dan Cryer 74d313862c Adding project groups 2015-10-08 16:33:01 +01:00
Dan Cryer e186874eba Removing the ability to install 'plugins' via the web interface. 2015-10-08 16:29:29 +01:00
Dan Cryer cf415a7c78 Merge branch 'master' of github.com:Block8/PHPCI 2015-10-08 09:49:20 +01:00
Dan Cryer 2380d2e472 Build worker should delete jobs in its queue that are not recognised. 2015-10-08 09:49:16 +01:00
Dan Cryer 69cd4789be 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 6f0945fb97 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