summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-151-1/+0
|\
| * change how pagination component is loadedpipelines_missing_paginationRegis2017-01-151-1/+0
* | add dependency license approvalsMike Greiling2017-01-141-10/+111
* | more post-merge fixesMike Greiling2017-01-131-1/+1
* | Added gzip compressionPhil Hughes2017-01-131-1/+5
* | add phantomJS to karma configMike Greiling2017-01-131-0/+1
* | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-133-1/+9
|\ \ | |/
| * Add basic searchClement Ho2017-01-091-0/+1
| * Merge branch 'master' into auto-pipelines-vueRegis2017-01-092-0/+5
| |\
| | * Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+1
| | |\
| | | * Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+1
| | * | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-0/+4
| | |\ \
| | | * | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-031-0/+4
| * | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-051-0/+6
| |\ \ \ \ | | |/ / /
| * | | | fix pipelines/index.html.haml merge conflictRegis2017-01-022-3/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merge master and fix application.rb conflictRegis2016-12-234-5/+32
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2111-7/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-163-1/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-151-7/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge masterRegis2016-12-132-2/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-092-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-071-11/+11
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove all files related to Vue SVG rendering - use dynamic svg loadingRegis2016-12-061-2/+0
| * | | | | | | | | | | fix conflictRegis2016-12-023-1/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-299-158/+184
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-216-10/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ merge masterRegis2016-11-185-2/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-154-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into avatar-vueRegis2016-11-143-24/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ vue full conflict fixRegis2016-11-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-11-0911-225/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | extract pagination into own folder and precompile in application.rbRegis2016-11-061-0/+1
| * | | | | | | | | | | | | | | | | | | making reusable status and status icons componentsRegis2016-11-051-0/+2
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-11-025-1/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | page specific js - remove inline js - refactorRegis2016-10-311-0/+1
* | | | | | | | | | | | | | | | | | | | | prevent karma from reloading on save until webpack is readyMike Greiling2017-01-101-1/+1
* | | | | | | | | | | | | | | | | | | | | improve sourcemap generationMike Greiling2017-01-102-2/+3
* | | | | | | | | | | | | | | | | | | | | use ~ to reference non-local scripts instead of resolve.rootMike Greiling2017-01-101-4/+2
* | | | | | | | | | | | | | | | | | | | | migrate all tests into a single webpack bundleMike Greiling2017-01-101-2/+1
* | | | | | | | | | | | | | | | | | | | | include spec_helper within karma config rather than each individual testMike Greiling2017-01-101-2/+3
* | | | | | | | | | | | | | | | | | | | | include common libraries within spec_helperMike Greiling2017-01-101-1/+1
* | | | | | | | | | | | | | | | | | | | | simplify and combine karma file patternsMike Greiling2017-01-101-10/+3
* | | | | | | | | | | | | | | | | | | | | Swapped out teaspoon for karmaLuke "Jared" Bennett2017-01-102-2/+32
* | | | | | | | | | | | | | | | | | | | | precompile webpack assets when testingMike Greiling2017-01-102-0/+4
* | | | | | | | | | | | | | | | | | | | | disable "use strict" in babel config as it was broken in sprocketsMike Greiling2017-01-101-1/+7
* | | | | | | | | | | | | | | | | | | | | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-102-19/+22
* | | | | | | | | | | | | | | | | | | | | replace application.js sprockets output with webpack-generated equivalentMike Greiling2017-01-061-2/+18
* | | | | | | | | | | | | | | | | | | | | temporarily regress to babel 5 for parity with sprockets-es6 gemMike Greiling2017-01-061-4/+1
* | | | | | | | | | | | | | | | | | | | | conditionally apply webpack-dev-server configMike Greiling2017-01-061-1/+4
* | | | | | | | | | | | | | | | | | | | | optimize production output and generate sourcemapsMike Greiling2017-01-061-1/+15
View Lorry Controller Status