tyrel
/
stagestatus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36 Commits 1 Branch 0 Tags 1.1 MiB
Commit Graph

36 Commits

Author SHA1 Message Date
Tyrel Souza 35bc7c9d15 Merge branch 'use_api' into 'master' 
Use api

See merge request !17
 2017-04-02 18:21:58 +00:00
Tyrel Souza e9d18b110d Use api 2017-04-02 18:21:57 +00:00
Tyrel Souza aa33f0892a Merge branch 'sbadmin' into 'master' 
Sb admin theme

See merge request !15
 2017-04-02 15:25:10 +00:00
Tyrel Souza 2df1841ca6 Sb admin theme 2017-04-02 15:25:09 +00:00
Tyrel Souza 0f9b5d90a5 Merge branch 'test_systems' into 'master' 
Test systems using tox

See merge request !16
 2017-04-02 15:24:48 +00:00
Tyrel Souza 5a5f374d00 Test systems using tox 2017-04-02 15:24:43 +00:00
Tyrel Souza bae3ef8b07 Merge branch 'remove_bower_hardcode_static' into 'master' 
remove bower, hardcode vendor

See merge request !14
 2017-04-02 04:10:36 +00:00
Tyrel Souza 7bbf5b4831
remove bower, hardcode vendor 2017-04-02 00:10:15 -04:00
Tyrel Souza 2533b43c56 Merge branch 'bower_stuff' into 'master' 
Bower stuff

See merge request !13
 2017-04-02 03:48:42 +00:00
Tyrel Souza 49cd11e1ab Bower stuff 2017-04-02 03:48:42 +00:00
Tyrel Souza 9257fbc5ab Merge branch 'nested_json' into 'master' 
nest the json

See merge request !12
 2017-04-01 20:42:47 +00:00
Tyrel Souza 6c97cee964
nest the json 2017-04-01 16:42:20 -04:00
Tyrel Souza beebe94a0d Merge branch 'rename_1t1_names' into 'master' 
rename related_names on one to one relationships

See merge request !11
 2017-04-01 20:39:56 +00:00
Tyrel Souza ee67c0f0a8
rename related_names on one to one relationships 2017-04-01 16:39:18 -04:00
Tyrel Souza 23d0cecb4a Merge branch 'rename_MachineNote_to_MachineReservation' into 'master' 
rename MachineNote to MachineReservation

See merge request !10
 2017-04-01 20:29:35 +00:00
Tyrel Souza def755b714
Rename model 2017-04-01 16:28:53 -04:00
Tyrel Souza 02b1f890fd Merge branch 'move_api_lower' into 'master' 
Move api lower

See merge request !9
 2017-04-01 20:22:25 +00:00
Tyrel Souza 4dff4b0c02 Move api lower 2017-04-01 20:22:25 +00:00
Tyrel Souza 4840445504 Merge branch 'rearrange_urls' into 'master' 
Rearrange the urls

See merge request !8
 2017-04-01 20:13:18 +00:00
Tyrel Souza 550f3ce59c
Rearrange the urls 2017-04-01 16:12:50 -04:00
Tyrel Souza e57e0100ea Merge branch 'basic_rest_framework' into 'master' 
first pass rest framework

See merge request !7
 2017-04-01 19:59:03 +00:00
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