Skip to content

Merge 4.0.0 into master #2081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 133 commits into from
Jul 22, 2016
Merged

Merge 4.0.0 into master #2081

merged 133 commits into from
Jul 22, 2016

Conversation

Awk34
Copy link
Member

@Awk34 Awk34 commented Jul 21, 2016

No description provided.

Awk34 and others added 30 commits June 6, 2016 11:44
@Awk34
feat(gen:app): remove bower, initial webpack support
f9e64e2
@Awk34
refactor(gen/test): use gulp for all tests
0f73fac
@Awk34
test(gen:pre): remove bower pre-tests
5151127
@Awk34
test(gen:get-expected-files): fix expected files
af7a6e6
@Awk34
refactor(gen:test): don't symlink bower_components anymore
97cc341
@Awk34
fix(e2e): get e2e tests running
1327d0b
@Awk34
fix(jscs):
445435e
@Awk34
fix(gulp): uncomment open(...)
dd73e59
@Awk34
fix(e2e): fix some webpack config for e2e
f7cae15
@Awk34
fix(webpack): fix ng-annotate for e2e
536e9a1
@Awk34
fix(e2e): fix some async quirks
4e3f59f
@Awk34
fix(gen:test): index.html -> _index.html
c94f5f2
@Awk34
chore(package): add jade-loader
da9a1ee
@Awk34
fix(gen:app): don't run bower after scaffold
e1b2b7e
@Awk34
chore(package): replace jade-loader with pug-html-loader
f5302a7
@Awk34
fix(jade): fix navbar jade template
ee1a4b1
@Awk34
fix(client): fix template requires
57a16dd
@Awk34
fix(webpack): fix jade/html config
3e65d90
@Awk34
fix(gulp-protractor): throw on error
0f4abd9
@Awk34
fix(client): exclude oauthButtons import if !oauth
1e2311e
@Awk34
chore(circle): remove grunt-cli, wiredep; add sauce-connect
e3047a8
@Awk34
test(gen): comment e2e for now
b45af55
@Awk34
chore(package): remove wiredep things
c67572e
@Awk34
fix(test:client): fix client tests for TS
881d170
@Awk34
fix(gulp): process.exit on karma errors, remove wiredep import
03d1c95
@Koslun
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.
@Awk34
fix(client): fix css/font paths
9d95083
@Awk34
fix(webpack): use raw loader with jade
c3b41ef
@Awk34
feat(client:karma): add karma-sourcemap-loader
718bbd6
@Awk34
fix(test:client): require angular in mocks
523abf4
Awk34 and others added 23 commits July 19, 2016 17:34
@Awk34
test(gen): skip server test on sequelize... 💩
329351f
@Awk34
fix(gen:test): don't run gulp test:server on sequelize at all
2727cc6
@Awk34
feat(gen:endpoint): change PUT to do an upsert instead of an update
78e179e
@Awk34
feat(gen:endpoint): change PATCH to do a patch
da19380 
add fast-json-patch dep
@Awk34
fix(endpoint:test): fix PUT test for upsert
185a47e
@Awk34
test(endpoint): add integration test for PATCH
efb69f3
@Awk34
style(endpoint): lint fixes
3fd494c
@Awk34
fix(gen:test): increase exec maxBuffer to 500KB
69dc2a0
@Koslun @Awk34
feat(project): replace livereload with browser-sync
5700de6 
Closes #1955
@Awk34
Merge pull request #2073 from angular-fullstack/browser-sync
e0ab407 
feat(project): replace livereload with browser-sync
@Awk34
Merge pull request #2033 from angular-fullstack/put-patch
f8ce5cb 
Put patch
@Awk34
refactor(gen:test): .skip e2e instead of commenting them out
7c03fa5
@Awk34
chore(package): update generator-ng-component to 1.0.0
12aeafb
@Awk34
chore(gen): use modules in ng-component
38d1541
@Awk34
fix(gen): replace ng-component 'modules' filter with 'webpack' filter…
9b9d1a0 
…. Add 'ngRoute' to list of modules to fix for TS
@Awk34
chore(package): use pug-html-loader ^1.0.8
2f9b188
@Awk34
feat(webpack): allow for .jade || .pug
6cf2fbd
@Awk34
refactor(server): exclude lusca import if noModels
08ff3c7
@Awk34
chore(package): enforce ng-component 1.0.1+
5854b78
@Awk34
Merge pull request #2078 from angular-fullstack/canary-ng-component-1
2740a23 
generator-ng-component 1.0.0
@Awk34
4.0.0-rc.0
0ec0737
@Awk34
Merge branch 'canary' of github.com:angular-fullstack/generator-angul…
1b37da3 
…ar-fullstack into canary
@Awk34
Merge branch 'master' into canary
41c806e
@Awk34 Awk34 added this to the 4.0.0 milestone Jul 21, 2016
@Awk34 Awk34 merged commit ea1caf2 into master Jul 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
major semver-major
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@Awk34 @Koslun @mtvs @blakemanzo