Skip to content

Loads of changes, most of them trying to automate the upgrade process. #4

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
magmax wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Loads of changes, most of them trying to automate the upgrade process. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8ece08
Loads of changes, most of them trying to automate the upgrade process.
magmax Feb 20, 2014
33961dd
Reformating
magmax Feb 21, 2014
e6a2ecc
Creating a virtual environment with all requirements
magmax Feb 21, 2014
a4fa860
Some fixes (working)
magmax Feb 24, 2014
e6d5aa3
Minor visual improvements
magmax Feb 24, 2014
1357a16
Adding test runners and splitting tests in unit/integration/acceptance
magmax Mar 24, 2014
a22b0e5
Removing merge marks
magmax Apr 13, 2014
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
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Angular/node_modules
Angular/app/bower_components
*~
\#*
.\#*
*.pyc
Django/venv/
Django/db.sqlite3
Django/.coverage
3 changes: 3 additions & 0 deletions Angular/.bowerrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "app/bower_components"
}
9 changes: 0 additions & 9 deletions Angular/app/css/bootstrap-responsive.min.css
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions Angular/app/css/bootstrap.min.css
View file
Open in desktop

This file was deleted.

20 changes: 11 additions & 9 deletions Angular/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@
<head>
<meta charset="utf-8">
<title>Angular Seed Project</title>
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"/>
<link rel="stylesheet" href="css/app.css"/>
<link rel="stylesheet" href="css/bootstrap.min.css"/>
<link rel="stylesheet" href="css/bootstrap-responsive.min.css"/>
</head>
<body auth-application>

<script src="lib/angular/angular.js"></script>

<!-- Login Form -->
<div id="login-holder">
<div login></div>
Expand All @@ -20,16 +17,21 @@
<div ng-view ></div>
</div>

<script src="bower_components/jquery/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>

<script src="lib/http-auth-interceptor.js"></script>

<script src="js/constants.js"></script>
<script src="js/app.js"></script>
<script src="js/services.js"></script>
<script src="js/controllers.js"></script>
<script src="js/filters.js"></script>
<script src="js/directives.js"></script>
<script src="js/ui-bootstrap-tpls-0.3.0.js"></script>
<script src="lib/http-auth-interceptor.js"></script>
<script src="lib/angular/angular-resource.js"></script>
<script src="lib/angular/angular-cookies.js"></script>

</body>
</html>
13 changes: 9 additions & 4 deletions Angular/app/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
'use strict';

angular.module('angularProject', ['ui.bootstrap']);


// Declare app module and Appendages
angular.module('angularProject', ['angularProject.filters', 'angularProject.services', 'angularProject.directives', 'angularProject.controllers', 'ngCookies'])
angular.module('angularProject', [
'angularProject.filters',
'angularProject.services',
'angularProject.directives',
'angularProject.controllers',
'ngCookies',
'ngRoute',
'ui.bootstrap'
])
.config(['$routeProvider', function($routeProvider) {
$routeProvider
.when('/home', {
Expand Down
Loading