Commit Graph

  • 35bc7c9d15 Merge branch 'use_api' into 'master' master Tyrel Souza 2017-04-02 18:21:58 +0000
  • e9d18b110d Use api Tyrel Souza 2017-04-02 18:21:57 +0000
  • aa33f0892a Merge branch 'sbadmin' into 'master' Tyrel Souza 2017-04-02 15:25:10 +0000
  • 2df1841ca6 Sb admin theme Tyrel Souza 2017-04-02 15:25:09 +0000
  • 0f9b5d90a5 Merge branch 'test_systems' into 'master' Tyrel Souza 2017-04-02 15:24:48 +0000
  • 5a5f374d00 Test systems using tox Tyrel Souza 2017-04-02 15:24:43 +0000
  • bae3ef8b07 Merge branch 'remove_bower_hardcode_static' into 'master' Tyrel Souza 2017-04-02 04:10:36 +0000
  • 7bbf5b4831
    remove bower, hardcode vendor Tyrel Souza 2017-04-02 00:10:15 -0400
  • 2533b43c56 Merge branch 'bower_stuff' into 'master' Tyrel Souza 2017-04-02 03:48:42 +0000
  • 49cd11e1ab Bower stuff Tyrel Souza 2017-04-02 03:48:42 +0000
  • 9257fbc5ab Merge branch 'nested_json' into 'master' Tyrel Souza 2017-04-01 20:42:47 +0000
  • 6c97cee964
    nest the json Tyrel Souza 2017-04-01 16:42:20 -0400
  • beebe94a0d Merge branch 'rename_1t1_names' into 'master' Tyrel Souza 2017-04-01 20:39:56 +0000
  • ee67c0f0a8
    rename related_names on one to one relationships Tyrel Souza 2017-04-01 16:39:18 -0400
  • 23d0cecb4a Merge branch 'rename_MachineNote_to_MachineReservation' into 'master' Tyrel Souza 2017-04-01 20:29:35 +0000
  • def755b714
    Rename model Tyrel Souza 2017-04-01 16:28:53 -0400
  • 02b1f890fd Merge branch 'move_api_lower' into 'master' Tyrel Souza 2017-04-01 20:22:25 +0000
  • 4dff4b0c02 Move api lower Tyrel Souza 2017-04-01 20:22:25 +0000
  • 4840445504 Merge branch 'rearrange_urls' into 'master' Tyrel Souza 2017-04-01 20:13:18 +0000
  • 550f3ce59c
    Rearrange the urls Tyrel Souza 2017-04-01 16:12:50 -0400
  • e57e0100ea Merge branch 'basic_rest_framework' into 'master' Tyrel Souza 2017-04-01 19:59:03 +0000
  • 4059d5db46 first pass rest framework Tyrel Souza 2017-04-01 19:59:02 +0000
  • 49a866bcf9 Merge branch 'flake_migrations' into 'master' Tyrel Souza 2017-04-01 19:58:47 +0000
  • 3d5e35b744 ignore migrations. Tyrel Souza 2017-04-01 19:58:47 +0000
  • 98c57a0f30 Merge branch 'production_example' into 'master' Tyrel Souza 2017-04-01 18:27:00 +0000
  • c4723ddf64
    add production example Tyrel Souza 2017-04-01 14:26:34 -0400
  • f4c04becaa Merge branch 'nose_testing' into 'master' Tyrel Souza 2017-04-01 18:22:17 +0000
  • bc3fefb45a Add Nose Tests Tyrel Souza 2017-04-01 18:22:16 +0000
  • c416be64bd Merge branch 'machine_list_page' into 'master' Tyrel Souza 2017-04-01 18:06:55 +0000
  • a71bcd24f5
    Make machine Details List show information Tyrel Souza 2017-04-01 14:02:23 -0400
  • 23b8cce692 Merge branch 'organize_tests' into 'master' Tyrel Souza 2017-04-01 17:34:55 +0000
  • 89a676aeec
    Organize tests into directory, and fix import error with app_label Tyrel Souza 2017-04-01 13:34:26 -0400
  • 349c0c7c7b Merge branch 'fix_test_mommy' into 'master' Tyrel Souza 2017-04-01 17:20:07 +0000
  • 139abd7668
    Fix tests Tyrel Souza 2017-04-01 13:19:14 -0400
  • e8261ef423
    add default prod and local confs +x manage.py, add .env to gitignore initial page, tests, change settings Tyrel Souza 2017-03-29 22:46:32 -0400
  • 1bce26be09
    Initial commit Tyrel Souza 2017-03-29 22:43:40 -0400