Commit Graph

15 Commits

Author SHA1 Message Date
Tyrel Souza
4059d5db46 first pass rest framework 2017-04-01 19:59:02 +00:00
Tyrel Souza
49a866bcf9 Merge branch 'flake_migrations' into 'master'
ignore migrations.

See merge request !6
2017-04-01 19:58:47 +00:00
Tyrel Souza
3d5e35b744 ignore migrations. 2017-04-01 19:58:47 +00:00
Tyrel Souza
98c57a0f30 Merge branch 'production_example' into 'master'
Production settings empty

See merge request !5
2017-04-01 18:27:00 +00:00
Tyrel Souza
c4723ddf64
add production example 2017-04-01 14:26:34 -04:00
Tyrel Souza
f4c04becaa Merge branch 'nose_testing' into 'master'
Add Nose Tests

See merge request !4
2017-04-01 18:22:17 +00:00
Tyrel Souza
bc3fefb45a Add Nose Tests 2017-04-01 18:22:16 +00:00
Tyrel Souza
c416be64bd Merge branch 'machine_list_page' into 'master'
Make machine Details List show information

See merge request !3
2017-04-01 18:06:55 +00:00
Tyrel Souza
a71bcd24f5
Make machine Details List show information 2017-04-01 14:02:23 -04:00
Tyrel Souza
23b8cce692 Merge branch 'organize_tests' into 'master'
Organize tests into directory, and fix import error with app_label

See merge request !2
2017-04-01 17:34:55 +00:00
Tyrel Souza
89a676aeec
Organize tests into directory, and fix import error with app_label 2017-04-01 13:34:26 -04:00
Tyrel Souza
349c0c7c7b Merge branch 'fix_test_mommy' into 'master'
Fix tests

See merge request !1
2017-04-01 17:20:07 +00:00
Tyrel Souza
139abd7668
Fix tests 2017-04-01 13:19:14 -04:00
Tyrel Souza
e8261ef423
add default prod and local confs
+x manage.py, add .env to gitignore
initial page, tests, change settings
2017-04-01 13:09:47 -04:00
Tyrel Souza
1bce26be09
Initial commit 2017-03-29 22:43:40 -04:00