Skip to content

fix(directive): angular-validation-match integration issue 2457 #2516

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

Merged
merged 5 commits into from
Mar 9, 2017
Merged

fix(directive): angular-validation-match integration issue 2457 #2516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
675e976
Fixed angular-validation-match integration
stherrienaspnet Mar 7, 2017
1c20d05
Merge remote-tracking branch 'upstream/master' into fix-match
stherrienaspnet Mar 7, 2017
52d0fcd
Fixed last commit
stherrienaspnet Mar 7, 2017
0ee708f
Removed comment
stherrienaspnet Mar 9, 2017
e6b24b3
Display Generator Version
stherrienaspnet Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class Generator extends Base {
},
info: function () {
this.log(this.yoWelcome);
this.log('Angular Fullstack v' + this.rootGeneratorVersion() +'\n');
this.log('Out of the box I create an AngularJS app with an Express server.\n');
},
checkForConfig: function() {
Expand Down
4 changes: 3 additions & 1 deletion templates/app/client/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import angular from 'angular';
import ngCookies from 'angular-cookies';
import ngResource from 'angular-resource';
import ngSanitize from 'angular-sanitize';
import ngValidationMatch from 'angular-validation-match';
<%_ if(filters.socketio) { _%>
import 'angular-socket-io';<% } %>
<%_ if(filters.ngroute) { _%>
Expand All @@ -14,7 +15,7 @@ import uiRouter from 'angular-ui-router';<% } %>
import uiBootstrap from 'angular-ui-bootstrap';<% } %>
// import ngMessages from 'angular-messages';
<%_ if(filters.auth) { _%>
// import ngValidationMatch from 'angular-validation-match';<% } %>
<% } %>


import {routeConfig} from './app.config';
Expand All @@ -38,6 +39,7 @@ angular.module('<%= scriptAppName %>', [
ngCookies,
ngResource,
ngSanitize,
'validation.match',
<%_ if(filters.socketio) { %>
'btford.socket-io',<% } %>
<%_ if(filters.ngroute) { %>
Expand Down