Skip to content

updated angular #11

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated angular #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f47138
Merge pull request #1 from shea256/master
jstacoder Apr 21, 2015
42f3aab
updated angular to latest version, moved static dependencys to bower
jstacoder Jun 14, 2015
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
3 changes: 3 additions & 0 deletions .bowerrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory":"angular_flask/static/lib"
}
7 changes: 6 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
venv
*~
.DS_Store
ignore
ignore
*.map
*.min.js
*i18n
*/docs/
angular_flask/static/lib/*
4 changes: 2 additions & 2 deletions angular_flask/static/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

angular.module('AngularFlask', ['angularFlaskServices'])
angular.module('AngularFlask', ['angularFlaskServices','ngRoute'])
.config(['$routeProvider', '$locationProvider',
function($routeProvider, $locationProvider) {
$routeProvider
Expand Down Expand Up @@ -32,4 +32,4 @@ angular.module('AngularFlask', ['angularFlaskServices'])

$locationProvider.html5Mode(true);
}])
;
;
Loading