Code

Docker integration#1965

Code

Closed

Awk34 wants to merge 121 commits intocanaryangular-fullstack/generator-angular-fullstack:canaryfrom

docker-integrationangular-fullstack/generator-angular-fullstack:docker-integrationCopy head branch name to clipboard

Commits

Commits on Jun 6, 2016

• docker integration part 1

  JeremyMarshall

  committed
  0674ad0

  Copy full SHA for 0674ad0

Commits on Jun 7, 2016

• docker base image take 1

  JeremyMarshall

  committed
  d1ca75d

  Copy full SHA for d1ca75d

Commits on Jun 9, 2016

• moved docker submodule fixed docker from version

  JeremyMarshall

  committed
  c7f4fa5

  Copy full SHA for c7f4fa5

Commits on Jun 13, 2016

• feat(gen:docker): initial docker subgenerator

  

  JeremyMarshall

  authored and

  Awk34

  committed
  4fe344d

  Copy full SHA for 4fe344d

• feat(gen:docker): add docker base image

  

  JeremyMarshall

  authored and

  Awk34

  committed
  c4963fe

  Copy full SHA for c4963fe

• fix(gen:docker): move docker submodule, fixe docker FROM version

  

  JeremyMarshall

  authored and

  Awk34

  committed
  b33bc7b

  Copy full SHA for b33bc7b

• Merge branch 'docker-integration' of github.com:angular-fullstack/generator-angular-fullstack into docker-integration

  JeremyMarshall

  committed
  34fa10e

  Copy full SHA for 34fa10e

Commits on Jun 14, 2016

• refactor(gen:docker): refactor gen code, move template to root templates folder

  Awk34

  committed
  4ff8608

  Copy full SHA for 4ff8608

• fix(gen:docker): export Generator

  Awk34

  authored
  a124d26

  Copy full SHA for a124d26

• Merge branch 'docker-integration' of github.com:angular-fullstack/generator-angular-fullstack into docker-integration

  JeremyMarshall

  committed
  85c5b63

  Copy full SHA for 85c5b63

Commits on Jun 27, 2016

• fix(gen:docker): fix generator export

  Awk34

  committed
  b2112f5

  Copy full SHA for b2112f5

• Merge branch 'docker-integration' of github.com:angular-fullstack/generator-angular-fullstack into docker-integration

  JeremyMarshall

  committed
  7aee825

  Copy full SHA for 7aee825

Commits on Jul 5, 2016

• fix(gen:docker): import genBase

  Awk34

  committed
  89f8ca8

  Copy full SHA for 89f8ca8

Commits on Jul 6, 2016

• Merge branch 'docker-integration' of github.com:angular-fullstack/generator-angular-fullstack into docker-integration

  JeremyMarshall

  committed
  05ea698

  Copy full SHA for 05ea698

Commits on Jul 11, 2016

• fix(gen:docker): allow for grunt or gulp builds

  JeremyMarshall

  committed
  088267d

  Copy full SHA for 088267d

Commits on Jul 12, 2016

• fix(gen:docker): add docker.md

  JeremyMarshall

  committed
  d020cf5

  Copy full SHA for d020cf5

Commits on Jul 13, 2016

• fix(gen:docker): add update of docker image to ci

  JeremyMarshall

  committed
  1ed7426

  Copy full SHA for 1ed7426

• fix(gen:docker): fix circleci machine

  JeremyMarshall

  committed
  4d07449

  Copy full SHA for 4d07449

• fix(gen:docker): fix path to deployment step

  JeremyMarshall

  committed
  2cd903d

  Copy full SHA for 2cd903d

• fix(gen:docker): merge canary

  JeremyMarshall

  committed
  1b9d53a

  Copy full SHA for 1b9d53a

Commits on Jul 22, 2016

• Merge pull request #2081 from angular-fullstack/canary

  Show description for ea1caf2
  Awk34

  authored
  ea1caf2

  Copy full SHA for ea1caf2

Commits on Jul 27, 2016

• docs(getting-started): add getting-started/index.md

  Awk34

  authored
  d98e2dd

  Copy full SHA for d98e2dd

• docs(readme): add link to getting started

  Show description for 6ae049c
  Awk34

  authored
  6ae049c

  Copy full SHA for 6ae049c

• docs(readme): simplify usage section

  Show description for 5d7caf8
  Awk34

  authored
  5d7caf8

  Copy full SHA for 5d7caf8

• chore(package): pin sequelize to a higher version

  Show description for f11336d
  Awk34

  authored
  f11336d

  Copy full SHA for f11336d

• docs(readme): dont' specify exact node versions in generated readme

  Show description for fe34e78
  Awk34

  authored
  fe34e78

  Copy full SHA for fe34e78

• docs(getting-started): add step1-overview (stub)

  Show description for 13f20ba
  Awk34

  authored
  13f20ba

  Copy full SHA for 13f20ba

Commits on Jul 28, 2016

• Merge branch 'canary' into docker-integration

  JeremyMarshall

  committed
  b33a9c7

  Copy full SHA for b33a9c7

• docs(getting-started): write out the rest of the getting started page

  Show description for 13a4e4f
  Awk34

  authored
  13a4e4f

  Copy full SHA for 13a4e4f

Commits on Jul 30, 2016

• Merge branch 'master' into docker-integration

  JeremyMarshall

  committed
  8cc78cf

  Copy full SHA for 8cc78cf

Commits on Aug 2, 2016

• docs(readme): update configurations

  Show description for 065194d
  Awk34

  authored
  065194d

  Copy full SHA for 065194d

• docs(readme): add note about generator-ng-component

  Show description for a11c986
  Awk34

  authored
  a11c986

  Copy full SHA for a11c986

• docs(index): add note about generator-ng-component

  Show description for 23dc334
  Awk34

  authored
  23dc334

  Copy full SHA for 23dc334

• ci(circle): comment out sauce-connect

  Awk34

  authored
  e415041

  Copy full SHA for e415041

• Merge pull request #2095 from angular-fullstack/chore/sqli

  Show description for 649470f
  Awk34

  authored
  649470f

  Copy full SHA for 649470f

• chore(package): update mocha to version 3.0.0 (#2102)

  Show description for 318a04f
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  318a04f

  Copy full SHA for 318a04f

• chore(package): update gulp-mocha to version 3.0.0 (#2105)

  Show description for a8990d8
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  a8990d8

  Copy full SHA for a8990d8

Commits on Aug 3, 2016

• chore(package): update should to version 10.0.0 (#2072)

  Show description for 691ffac
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  691ffac

  Copy full SHA for 691ffac

• chore(package): update glob to version 7.0.5 (#1995)

  Show description for 616000c
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  616000c

  Copy full SHA for 616000c

Commits on Aug 4, 2016

• chore(package): update babel-register to version 6.11.6 (#2089)

  Show description for fd2514e
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  fd2514e

  Copy full SHA for fd2514e

• chore(package): update lodash to version 4.14.1 (#2098)

  Show description for bc8cd47
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  bc8cd47

  Copy full SHA for bc8cd47

• chore(package): update insight to version 0.8.3 (#2106)

  Show description for 1b02f47
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  1b02f47

  Copy full SHA for 1b02f47

• chore(server): replace compression with shrink-ray (#2114)

  Awk34

  authored
  ac0648f

  Copy full SHA for ac0648f

Commits on Aug 5, 2016

• fix(gulp:build): remove typings task from non-ts

  Show description for 022119a
  Koslun

  committed
  022119a

  Copy full SHA for 022119a

• fix(gulp:build): fix crash upon ts type errors

  Show description for 3707203
  Koslun

  committed
  3707203

  Copy full SHA for 3707203

• Merge pull request #2120 from angular-fullstack/typings-build

  Show description for f9c75e7
  Awk34

  authored
  f9c75e7

  Copy full SHA for f9c75e7

• chore(gulp): update imagemin

  Awk34

  committed
  da98690

  Copy full SHA for da98690

• chore(gulp): switch to new jpeg minifier

  

  Koslun

  authored and

  Awk34

  committed
  346b3be

  Copy full SHA for 346b3be

• Merge pull request #2007 from angular-fullstack/chore/gulp-imagemin-3

  Show description for 3375e27
  Awk34

  authored
  3375e27

  Copy full SHA for 3375e27

Commits on Aug 6, 2016

• fix(server): fix dev-only imports (#2124)

  Show description for 03c1cf5
  Awk34

  authored
  03c1cf5

  Copy full SHA for 03c1cf5

• chore(package): update node/npm versions in the generated package.json (#2126)

  Show description for 1a7100a
  

  kerimdzhanov

  authored and

  Awk34

  committed
  1a7100a

  Copy full SHA for 1a7100a

Commits on Aug 7, 2016

• chore(package): remove old unused deps

  Show description for f5988a2
  Awk34

  committed
  f5988a2

  Copy full SHA for f5988a2

• chore(package): exclude bootstrap-styl if !bootstrap

  Awk34

  committed
  244cca7

  Copy full SHA for 244cca7

• Merge pull request #2122 from angular-fullstack/chore/remove-old-deps

  Show description for 6243f0d
  Awk34

  authored
  6243f0d

  Copy full SHA for 6243f0d

Commits on Aug 8, 2016

• chore(package): set istanbul to 1.1.0-alpha.1 (#2035)

  Awk34

  authored
  3abd039

  Copy full SHA for 3abd039

• chore(gen): replace all instances of jade with pug (#2128)

  Show description for 65c7655
  Awk34

  authored
  65c7655

  Copy full SHA for 65c7655

• 4.0.0

  Awk34

  committed
  7348858

  Copy full SHA for 7348858

• fix(webpack): fix peerDependencies for css loaders (#2131)

  Show description for cd10954
  Awk34

  authored
  cd10954

  Copy full SHA for cd10954

Commits on Aug 9, 2016

• 4.0.1

  Awk34

  committed
  f37e214

  Copy full SHA for f37e214

Commits on Aug 10, 2016

• chore(package): update should to version 11.0.0 (#2134)

  Show description for 44084f3
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  44084f3

  Copy full SHA for 44084f3

• docs(readme): add note about node-gyp

  Show description for 4c12eca
  Awk34

  authored
  4c12eca

  Copy full SHA for 4c12eca

Commits on Aug 11, 2016

• chore(package): bump ui-bootstrap to v2 (#2138)

  Show description for f278ea5
  Awk34

  authored
  f278ea5

  Copy full SHA for f278ea5

• chore(package): bump bootstrap to 3.3.7

  Awk34

  authored
  a76034b

  Copy full SHA for a76034b

• feat(gen:gulp): add TODO tasks in gulpfile. rm 2 old grunt tasks

  Show description for 1e25de7
  Awk34

  committed
  1e25de7

  Copy full SHA for 1e25de7

• chore(package): update bootstrap-social to ^5.0.0 (#2139)

  Show description for 3c20ff0
  Awk34

  authored
  3c20ff0

  Copy full SHA for 3c20ff0

• chore(package): bump angular-validation-match to ^1.9.0 (#2140)

  Show description for da3f054
  Awk34

  authored
  da3f054

  Copy full SHA for da3f054

Commits on Aug 12, 2016

• fix(gulp:build): remove protractor typings (#2144)

  Show description for b9abc58
  Awk34

  authored
  b9abc58

  Copy full SHA for b9abc58

• chore(package): update lodash to version 4.15.0 (#2147)

  Show description for 82d4643
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  82d4643

  Copy full SHA for 82d4643

• chore(package): bump ui-router to ~0.3.1 (#2141)

  Show description for a9963b1
  Awk34

  authored
  a9963b1

  Copy full SHA for a9963b1

• chore(package): bump flow-bin to 0.30 (#2142)

  Show description for 03ccf56
  Awk34

  authored
  03ccf56

  Copy full SHA for 03ccf56

Commits on Aug 14, 2016

• chore(package): update should to version 11.1.0 (#2153)

  Show description for 86f9861
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  86f9861

  Copy full SHA for 86f9861

Commits on Aug 16, 2016

• feat(docs): add daux.io docs

  Awk34

  committed
  f1e7a87

  Copy full SHA for f1e7a87

Commits on Aug 17, 2016

• feat(gen:app): add eslint to the yo write stream

  Show description for 85921be
  Awk34

  committed
  85921be

  Copy full SHA for 85921be

• feat(gen:app): run eslint w/ fix on both client & server

  Awk34

  committed
  c5ab431

  Copy full SHA for c5ab431

• refactor(app): fix eslint errors for default gen

  Show description for 5023093
  Awk34

  committed
  5023093

  Copy full SHA for 5023093

• docs(examples): add Modal.md

  Show description for 331fb3d
  Awk34

  authored
  331fb3d

  Copy full SHA for 331fb3d

• docs(index): update root doc for 4.0.0

  Show description for c606b7b
  Awk34

  authored
  c606b7b

  Copy full SHA for c606b7b

• ci(circle): try adding docs deployment to circle config

  Awk34

  authored
  41724a4

  Copy full SHA for 41724a4

• docs(readme): strikethough systemjs + jspm

  Show description for 34457bb
  Awk34

  authored
  34457bb

  Copy full SHA for 34457bb

Commits on Aug 18, 2016

• fix(client:socket.service): import lodash named exports

  Awk34

  authored
  231e500

  Copy full SHA for 231e500

Commits on Aug 19, 2016

• Merge pull request #2158 from angular-fullstack/gen-run-eslint-fix

  Show description for 9f98f7c
  Awk34

  authored
  9f98f7c

  Copy full SHA for 9f98f7c

• docs(examples): add IIS.md

  

  Azayzel

  authored and

  Awk34

  committed
  d6fc5f2

  Copy full SHA for d6fc5f2

Commits on Aug 20, 2016

• ci(circle): ignore gh-pages

  Awk34

  committed
  fb38594

  Copy full SHA for fb38594

• docs(examples): add heroku deployment

  Awk34

  committed
  01418c5

  Copy full SHA for 01418c5

• clean up #2160

  Awk34

  committed
  ae4b3ce

  Copy full SHA for ae4b3ce

Commits on Aug 30, 2016

• chore(package): update generator-ng-component to version 1.0.2

  Show description for 3b695ca
  greenkeeperio-bot

  committed
  3b695ca

  Copy full SHA for 3b695ca

Commits on Aug 31, 2016

• chore(package): update generator-ng-component to version 1.0.2 (#2191)

  Show description for 90b5f8e
  Awk34

  authored
  90b5f8e

  Copy full SHA for 90b5f8e

• docs(readme): update media paths

  Show description for 8854469
  Awk34

  authored
  8854469

  Copy full SHA for 8854469

• docs(readme): remove 4.0.0 beta note

  Show description for cfd1534
  Awk34

  authored
  cfd1534

  Copy full SHA for cfd1534

• chore(package): update bluebird to version 3.4.5 (#2193)

  Show description for 52a2362
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  52a2362

  Copy full SHA for 52a2362

Commits on Sep 1, 2016

• 4.0.2

  Awk34

  committed
  6f534fe

  Copy full SHA for 6f534fe

• fix(gen): fix doc img generation\n\nAdd gulp task to copy images to gh-pages

  Awk34

  committed
  5bb43be

  Copy full SHA for 5bb43be

• docs(gettingStarted): fill-out Getting Started section more

  Awk34

  committed
  23d3738

  Copy full SHA for 23d3738

• fix(webpack): fix boostrap-sass import path

  

  antyrat

  authored and

  Awk34

  committed
  bae1c86

  Copy full SHA for bae1c86

• fix(gen:heroku): fix module export, gen base

  Show description for 8e50326
  Awk34

  committed
  8e50326

  Copy full SHA for 8e50326

• 4.0.3

  Awk34

  committed
  d3dec09

  Copy full SHA for d3dec09

• docs(contributing): add release steps

  Show description for 9806bcd
  Awk34

  committed
  9806bcd

  Copy full SHA for 9806bcd

• fix(webpack): fix webpack vendor import (#2177)

  Show description for aa32054
  Awk34

  authored
  aa32054

  Copy full SHA for aa32054

• fix(webpack): conditionally exclude ui-bootstrap

  Awk34

  committed
  dd131d9

  Copy full SHA for dd131d9

• 4.0.4

  Awk34

  committed
  d92cd67

  Copy full SHA for d92cd67

• chore(package): update babel-plugin-transform-flow-strip-types to version 6.14.0 (#2173)

  Show description for a6b5c3f
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  a6b5c3f

  Copy full SHA for a6b5c3f

Commits on Sep 2, 2016

• chore(package): bump some dev deps (#2201)

  Awk34

  authored
  de56f41

  Copy full SHA for de56f41

Commits on Sep 6, 2016

• fix(client:oauthButtons): add ngInject (#2209)

  Show description for 9ce58e8
  Awk34

  authored
  9ce58e8

  Copy full SHA for 9ce58e8

Commits on Sep 7, 2016

• fix(socket): add ngInject (#2208)

  Show description for b530695
  Awk34

  authored
  b530695

  Copy full SHA for b530695

Commits on Sep 8, 2016

• merge master

  JeremyMarshall

  committed
  8fb4aa5

  Copy full SHA for 8fb4aa5

Commits on Sep 13, 2016

• chore(package): update yeoman-test to version 1.5.0 (#2217)

  Show description for 118ddc4
  

  greenkeeperio-bot

  authored and

  Awk34

  committed
  118ddc4

  Copy full SHA for 118ddc4

• fix(heroku): Changed port variable to capital letters so heroku recognize it

  Show description for 44dccba
  

  amygdaloideum

  authored and

  Awk34

  committed
  44dccba

  Copy full SHA for 44dccba

• fix(server:twitter): make sure IDs are strings

  Show description for 5991a72
  Awk34

  committed
  5991a72

  Copy full SHA for 5991a72

• fix(karma): remove extra `require`

  Show description for c188229
  Awk34

  committed
  c188229

  Copy full SHA for c188229

• fix(endpoint:controller): fix findOneAndUpdate syntax

  Show description for 1c2a219
  Awk34

  committed
  1c2a219

  Copy full SHA for 1c2a219

Commits on Sep 14, 2016

• chore(package): switch around maintainers

  Awk34

  committed
  3fdf251

  Copy full SHA for 3fdf251

• Merge branch 'master' of github.com:angular-fullstack/generator-angular-fullstack

  Awk34

  committed
  83aab50

  Copy full SHA for 83aab50

• docs(prerequisites): add node-gyp info, etc

  Awk34

  committed
  6223187

  Copy full SHA for 6223187

• docs(gettingStarted:overview): make root section look like the others

  Awk34

  committed
  0911087

  Copy full SHA for 0911087

• docs(): set 'devloping' to 02 & 'deployment' to 03

  Awk34

  committed
  94ada70

  Copy full SHA for 94ada70

Commits on Sep 15, 2016

• fix(client:auth): fix hasOwnProperty instances, fix User usage (#2232)

  Show description for f41e420
  Awk34

  authored
  f41e420

  Copy full SHA for f41e420

• 4.0.5

  Awk34

  committed
  0ba3235

  Copy full SHA for 0ba3235

• docs(changelog): retrofit 3.8.0 changelog

  Show description for 2633497
  Awk34

  committed
  2633497

  Copy full SHA for 2633497

• chore(package): enforce higher babel plugin versions

  Awk34

  committed
  93b5371

  Copy full SHA for 93b5371

Commits on Sep 18, 2016

• Merge branch 'master' into docker-integration

  JeremyMarshall

  committed
  1919087

  Copy full SHA for 1919087

• fix(gen:docker) remove grunt

  JeremyMarshall

  committed
  ab38dd2

  Copy full SHA for ab38dd2