Merge 4.0.0 into master #2081

Awk34 · 2016-07-21T21:08:59Z

No description provided.

Fix a few places that uses ui-router instead of ngRoute for ngRoute scaffolds. Also changed from es6 imports to using requires.

add fast-json-patch dep

Closes #1955

feat(project): replace livereload with browser-sync

Put patch

…. Add 'ngRoute' to list of modules to fix for TS

generator-ng-component 1.0.0

…ar-fullstack into canary

Awk34 and others added 30 commits June 6, 2016 11:44

feat(gen:app): remove bower, initial webpack support

f9e64e2

refactor(gen/test): use gulp for all tests

0f73fac

test(gen:pre): remove bower pre-tests

5151127

test(gen:get-expected-files): fix expected files

af7a6e6

refactor(gen:test): don't symlink bower_components anymore

97cc341

fix(e2e): get e2e tests running

1327d0b

fix(jscs):

445435e

fix(gulp): uncomment open(...)

dd73e59

fix(e2e): fix some webpack config for e2e

f7cae15

fix(webpack): fix ng-annotate for e2e

536e9a1

fix(e2e): fix some async quirks

4e3f59f

fix(gen:test): index.html -> _index.html

c94f5f2

chore(package): add jade-loader

da9a1ee

fix(gen:app): don't run bower after scaffold

e1b2b7e

chore(package): replace jade-loader with pug-html-loader

f5302a7

fix(jade): fix navbar jade template

ee1a4b1

fix(client): fix template requires

57a16dd

fix(webpack): fix jade/html config

3e65d90

fix(gulp-protractor): throw on error

0f4abd9

fix(client): exclude oauthButtons import if !oauth

1e2311e

chore(circle): remove grunt-cli, wiredep; add sauce-connect

e3047a8

test(gen): comment e2e for now

b45af55

chore(package): remove wiredep things

c67572e

fix(test:client): fix client tests for TS

881d170

fix(gulp): process.exit on karma errors, remove wiredep import

03d1c95

fix(client): fix ngRoute imports

2274545

Fix a few places that uses ui-router instead of ngRoute for ngRoute scaffolds. Also changed from es6 imports to using requires.

fix(client): fix css/font paths

9d95083

fix(webpack): use raw loader with jade

c3b41ef

feat(client:karma): add karma-sourcemap-loader

718bbd6

fix(test:client): require angular in mocks

523abf4

Awk34 and others added 23 commits July 19, 2016 17:34

test(gen): skip server test on sequelize... 💩

329351f

fix(gen:test): don't run gulp test:server on sequelize at all

2727cc6

feat(gen:endpoint): change PUT to do an upsert instead of an update

78e179e

feat(gen:endpoint): change PATCH to do a patch

da19380

add fast-json-patch dep

fix(endpoint:test): fix PUT test for upsert

185a47e

test(endpoint): add integration test for PATCH

efb69f3

style(endpoint): lint fixes

3fd494c

fix(gen:test): increase exec maxBuffer to 500KB

69dc2a0

feat(project): replace livereload with browser-sync

5700de6

Closes #1955

Merge pull request #2073 from angular-fullstack/browser-sync

e0ab407

feat(project): replace livereload with browser-sync

Merge pull request #2033 from angular-fullstack/put-patch

f8ce5cb

Put patch

refactor(gen:test): .skip e2e instead of commenting them out

7c03fa5

chore(package): update generator-ng-component to 1.0.0

12aeafb

chore(gen): use modules in ng-component

38d1541

fix(gen): replace ng-component 'modules' filter with 'webpack' filter…

9b9d1a0

…. Add 'ngRoute' to list of modules to fix for TS

chore(package): use pug-html-loader ^1.0.8

2f9b188

feat(webpack): allow for .jade || .pug

6cf2fbd

refactor(server): exclude lusca import if noModels

08ff3c7

chore(package): enforce ng-component 1.0.1+

5854b78

Merge pull request #2078 from angular-fullstack/canary-ng-component-1

2740a23

generator-ng-component 1.0.0

4.0.0-rc.0

0ec0737

Merge branch 'canary' of github.com:angular-fullstack/generator-angul…

1b37da3

…ar-fullstack into canary

Merge branch 'master' into canary

41c806e

Awk34 added major semver-major labels Jul 21, 2016

Awk34 added this to the 4.0.0 milestone Jul 21, 2016

Awk34 added 3 commits July 21, 2016 17:31

fix(gen): return a promise

215f7a1

chore(test): update .yo-rc.json fixture

ace0b66

fix(gen): remove dockerfile subproject reference

8260519

Awk34 merged commit ea1caf2 into master Jul 22, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge 4.0.0 into master #2081

Merge 4.0.0 into master #2081

Uh oh!

Awk34 commented Jul 21, 2016

Uh oh!

Uh oh!

Merge 4.0.0 into master #2081

Merge 4.0.0 into master #2081

Uh oh!

Conversation

Awk34 commented Jul 21, 2016

Uh oh!

Uh oh!