Merge canary into master #1011
Merged
Merge canary into master #1011
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - getCurrentUser, isLoggedIn, and isAdmin are now sync if no arg and async with an arg - Use Error first callback signature where applicable - Remove unused arguments from Auth service - Remove isLoggedInAsync - Switch use of isLoggedInAsync to isLoggedIn - Add/Improve comments - Fix client/app/account(auth)/settings/settings.controller(js).js Breaking Changes: - Callbacks that return Errors, use 'Error first' signature Closes #456
Changes:
- Use `ui-sref` instead of `href` or `ng-href` when ui-router is chosen
- Use `ui-sref-active` instead of `ng-class='{active: isActive()}'` when ui-router is chosen
- Use `$state.go()` where applicable, when ui-router is chosen
- Use `$scope.menu[n].state` instead of `$scope.menu[n].link` when ui-router is chosen (attempt to remove possible confusion)
- Omit `$scope.isActive` when ui-router is chosen
- Simplify `navbar(jade).jade` templating (remove extra `<% if (filters.auth) %>` tag)
- Add `/logout` route for both ng-route and ui-router
- Use `$routeChangeStart` or `$stateChangeStart` to pass refering route or state to `/logout`
- Add `stateMock` for testing `$state` transitions
- Use `stateMock` in main.controller for expecting template requests from state transistions
Closes #331
Changes: - add protractor tests for auth related pages - add `onPrepare` and `params` to `protractor.conf.js`
test(app): add protractor tests for account pages
fix(app-signup): switch button classes
fix(app-logout): add blank templates to logout route/state
Changes: * `grunt-contrib-watch` now uses `spawn: false` instead of `nospawn: true` @see https://github.com/gruntjs/grunt-contrib-watch#optionsspawn * `grunt-contrib-imagemin` now minifies svg files, remove `grunt-svgmin` @see https://github.com/gruntjs/grunt-contrib-imagemin#imagemin-task
Chore: update grunt deps
Fix: update socketio info
fix(app): increase mocha default timeout to 5000
fix(app): babel watches all client (non-spec) js for changes
chore(gen): update generated .travis.yml node target to 0.12
chore(gen): bump node requirements to `>=0.12.0`
Refactor: remove migration code
fix(tests): only use livereload for development
fix(test): require `server` instead of `server/app.js`
|
I've made another branch off of master that we can use to update the 2.x.x code. I think we should go ahead with this PR. Sound good @kingcody ? |
Awesome! Do we want to complete milestone/3.0.0 first? |
|
I'd say we merge it now. Bug fixes for 2.x.x will go on the branch I mentioned earlier, bug fixes for 3.x.x will go on master, and new features for 3.x.x can go on canary. |
|
Yeah, we'll still want to wait to do the release of |
|
Ah, that makes sense. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.