Commit graph

Select branches

Hide pull requests

master

Mono Color

• 20d0c48839 Token authentication, api endpoints and 'BearerAuthentication' working. kououken 2019-02-03 16:56:34 -0800
• f8f8094275
  Merge pull request #52 from danieldupriest/bug-fixes sliang17 2019-02-03 14:25:28 -0800
• b273d9ca26 Fix url switching for MacOS Preston Doman 2019-02-03 13:47:12 -0800
• b26d71c23a Fix bug on Mac for real this time Preston Doman 2019-02-03 12:43:31 -0800
• 174cb9b0dd Fix bug on Mac Preston Doman 2019-02-03 12:39:36 -0800
• e0611793f6 Printing the data from the database - need to update the functionality to prevent overwriting Rupika 2019-02-03 00:47:04 -0800
• f55bcebee1 Fix report form display Preston Doman 2019-02-02 19:05:39 -0800
• 1066e50cc7 Refactor event handlers and include classList polyfill Preston Doman 2019-02-02 15:02:09 -0800
• 2a2f8011b9 Refactor table display Preston Doman 2019-02-02 14:22:18 -0800
• 78c9ec522d
  Merge pull request #50 from danieldupriest/edit-report-form hui2018 2019-02-02 08:43:51 -0800
• a838a589c6 Fix bug in login.js Preston Doman 2019-02-01 22:29:11 -0800
• 04083269ee Removed all template strings to make IE happy Preston Doman 2019-02-01 22:24:18 -0800
• 9edf870a27
  Merge pull request #49 from danieldupriest/database-merge-fields Logan Miller 2019-02-01 19:29:53 -0800
• da878aedb4
  Merge pull request #51 from danieldupriest/cors-fix Daniel Dupriest 2019-02-01 19:12:50 -0800
• b3ea00e135 Reordered apps and middleware in settings.py kououken 2019-02-01 14:10:02 -0800
• 0f12774c49 Fixed example data. kououken 2019-02-01 12:09:52 -0800
• 4ae03de53b Clean up formatting Preston Doman 2019-02-01 00:07:08 -0800
• a7d48c1208 Enable section collapse/show based off section completed flag Preston Doman 2019-01-31 23:49:36 -0800
• fc4141eaaf Fix styling Preston Doman 2019-01-31 17:48:36 -0800
• 6ae79194d0 Merged data fields into Field table, added 'required' and 'auto_submit' fields to Section. kououken 2019-01-31 16:55:11 -0800
• 74ce7f5c73 Fix Bootstrap styling for form groups Preston Doman 2019-01-31 16:27:29 -0800
• 41f0b78aa5 Add accordion and collapsible card creation functions Preston Doman 2019-01-31 15:48:33 -0800
• 5abc6cb87a Update createEditReportForm to populate form Preston Doman 2019-01-30 23:54:27 -0800
• 635edf83b6 Merge conflict resolved Preston Doman 2019-01-30 20:35:44 -0800
• bd9ba06bba
  Merge pull request #47 from danieldupriest/condense-pages hui2018 2019-01-30 17:02:48 -0800
• 9e6f08675d
  Merge pull request #46 from danieldupriest/show-report-history hui2018 2019-01-30 17:02:01 -0800
• 546b0730da Add edit report form function Preston Doman 2019-01-30 15:42:09 -0800
• 9ecbc6eb27 Change navbar brand from an anchor to a div Preston Doman 2019-01-30 10:14:49 -0800
• 1b2dab0632 Condense pages, rename html files, and update navbar Preston Doman 2019-01-30 09:03:11 -0800
• c569993f75
  Merge pull request #45 from danieldupriest/rework-policy-files ppdom 2019-01-30 01:16:02 -0800
• 41a4ab6c8b Update endpoint url Preston Doman 2019-01-30 00:48:04 -0800
• f1da66abcc Merge branch 'master' into show-report-history Preston Doman 2019-01-30 00:27:29 -0800
• 4eeb7bb5ae Change formatting Preston Doman 2019-01-30 00:25:45 -0800
• 5aebef7be4 Refactor code Preston Doman 2019-01-29 22:17:44 -0800
• 0b04057da2
  Merge pull request #43 from danieldupriest/api-endpoint-rework rupikad 2019-01-29 17:03:12 -0800
• 72dd3d9900 Add form-building function Preston Doman 2019-01-29 17:01:39 -0800
• 875641fbe4 Fixed policy file spacing. kououken 2019-01-29 16:56:56 -0800
• a70d9aa6bc Moved policy files into 'backend/' and fixed (most) formatting issues. kououken 2019-01-29 16:39:35 -0800
• 3fe22134fd Refactor using callback functions Preston Doman 2019-01-29 16:21:22 -0800
• 9c633d6ac5 Add modal popup for the edit button Preston Doman 2019-01-29 14:59:28 -0800
• d8aee961ca Add buttons and more responsive styling to report table Preston Doman 2019-01-29 01:27:38 -0800
• 88a09e5816
  Merge pull request #44 from danieldupriest/show-report-history Logan Miller 2019-01-28 14:02:22 -0800
• 0a930a21ed
  Merge pull request #39 from danieldupriest/example_policy Logan Miller 2019-01-28 13:53:44 -0800
• c665a83729
  Merge pull request #37 from danieldupriest/model-string-representations Logan Miller 2019-01-28 13:49:52 -0800
• 1ff30226f9 Added 'report_pk' to report list json. kououken 2019-01-28 13:23:49 -0800
• d4b569187e Remove setRequestHeaders line Preston Doman 2019-01-27 21:40:49 -0800
• d3acce9b78 Change endpoint url depending on detected OS Preston Doman 2019-01-27 21:39:48 -0800
• 1691392b43 Add list report history functionality to view_history.html Preston Doman 2019-01-27 16:21:51 -0800
• a4dbb3f644 Reworked API endpoints with correct types and some sample JSON. kououken 2019-01-27 14:22:42 -0800
• a4628c5f3c
  Merge pull request #42 from danieldupriest/site-redesign Daniel Dupriest 2019-01-27 11:13:12 -0800
• 546c83f6f8
  Merge pull request #41 from danieldupriest/validate-email Daniel Dupriest 2019-01-27 11:09:37 -0800
• 37f50409d7 Add new pages for each user action Preston Doman 2019-01-26 23:31:59 -0800
• ad3e1f7ea4 Validat email in the pattern of 'string@string.string' Jack 2019-01-26 18:18:59 -0800
• 0f7d844dda
  Update hasher.py joe-arriaga 2019-01-26 12:05:07 -0800
• 19bbc409f9
  Merge pull request #38 from danieldupriest/dashboard-nav-card sliang17 2019-01-26 11:40:47 -0800
• 368bc0964c Replaced tabs with spaces in simple_poicy.py. Joe Arriaga 2019-01-25 21:29:38 -0800
• e1cb44be72 Add card with nav pills to dashboard Preston Doman 2019-01-25 21:18:23 -0800
• fbe95aac0b
  Merge pull request #29 from danieldupriest/example_policy Daniel Dupriest 2019-01-25 19:45:29 -0800
• 1a68176f80 Gave all models string representations and set up file storage. kououken 2019-01-25 14:37:03 -0800
• 71c1208bfa
  Merge pull request #36 from danieldupriest/create_api_serializer Daniel Dupriest 2019-01-25 13:01:26 -0800
• c9fbe8d60e adding model = models.report Rupika 2019-01-25 12:45:34 -0800
• 496ec5626e fix errors Rupika 2019-01-23 18:18:19 -0800
• fe516ec96b Got serializer code to work, need to fix submitting null "date submitted" fields in report Rupika 2019-01-23 13:40:37 -0800
• 4bc54d5dcc fixed merge conflict in settings.py? Rupika 2019-01-23 10:25:50 -0800
• c2f1899e20 updating my code Rupika 2019-01-22 23:11:41 -0800
• acc2a6ecc2
  Merge pull request #35 from danieldupriest/create-custom-user Logan Miller 2019-01-22 18:40:55 -0800
• 05f612ab06
  Merge pull request #34 from danieldupriest/BootstrapSignupForm Logan Miller 2019-01-22 18:17:02 -0800
• ab3366529b
  Merge branch 'master' into create-custom-user joe-arriaga 2019-01-22 17:56:02 -0800
• f299e3a24e
  Merge pull request #33 from danieldupriest/enable-cors-support joe-arriaga 2019-01-22 17:33:39 -0800
• d7bc7cda09
  Merge pull request #32 from danieldupriest/docker-compose-fix joe-arriaga 2019-01-22 17:23:07 -0800
• 63f3465ca4 Created initial user and some sample report objects. Initialized superuser to admin/admin Daniel Dupriest 2019-01-22 17:03:07 -0800
• bd1bf44059 Created CustomUser and tweaked backend models. Daniel Dupriest 2019-01-22 16:38:09 -0800
• 6a5f5ec2c2 Update form and navbar formatting and remove extra index.html links Preston Doman 2019-01-22 15:02:06 -0800
• 9e9e85919c Merge branch 'master' into BootstrapSignupForm Preston Doman 2019-01-22 14:51:54 -0800
• 0add4e59ba Fix favicon bug Preston Doman 2019-01-22 14:51:46 -0800
• 64b47c3345 Enabled cors headers for django Daniel Dupriest 2019-01-22 13:34:47 -0800
• 1a63d006df Removed duplicate 'image:' line in docker-compose, trying to fix bug. Daniel Dupriest 2019-01-22 12:31:30 -0800
• 5175646e51
  Merge pull request #31 from danieldupriest/FixLoginLogoutFaviconBugs sliang17 2019-01-22 11:36:15 -0800
• 9366120871 Merge branch 'master' into FixLoginLogoutFaviconBugs Preston Doman 2019-01-22 10:48:17 -0800
• ad0afab699 Fix the logging in/out and favicon bugs Preston Doman 2019-01-22 10:46:11 -0800
• 1afcb1dda6
  Merge pull request #30 from danieldupriest/ResponsivePageInDashboard sliang17 2019-01-22 10:45:24 -0800
• a6807a4d57 Making the tabs in dashboard responsive Jack 2019-01-22 09:37:48 -0800
• eb1df00620
  Merge pull request #28 from danieldupriest/BootstrapLoginForm hui2018 2019-01-22 08:31:24 -0800
• b08e5adf92
  Merge pull request #27 from danieldupriest/update-django sliang17 2019-01-22 00:02:05 -0800
• 77f99eb180 Add Bootstrap styling to the signup form Preston Doman 2019-01-21 21:18:34 -0800
• e88cb95010 Added policy file. Joe Arriaga 2019-01-21 16:34:58 -0800
• 457fae09aa Update Bootstrap styling to login form Preston Doman 2019-01-20 21:50:19 -0800
• b93e889923 Add Bootstrap styling to login form Preston Doman 2019-01-20 21:45:42 -0800
• b3177b906b Updated django version to fix vulnerability. Daniel Dupriest 2019-01-20 15:16:56 -0800
• c3611737e8
  Merge pull request #26 from danieldupriest/database-models joe-arriaga 2019-01-20 15:06:39 -0800
• 36252079d7 Database models all implemented. Migrations made. Daniel Dupriest 2019-01-20 14:39:11 -0800
• 609eab2ca0 Created example policy config files. Added my name to the README. Joe Arriaga 2019-01-20 13:59:03 -0800
• 7bfe8a44ea
  Merge pull request #24 from danieldupriest/stub_api_call Logan Miller 2019-01-20 13:20:15 -0800
• 19a6df89db
  Merge pull request #23 from danieldupriest/CenterSignUpPage2 hui2018 2019-01-20 12:39:31 -0800
• f18d36e42d Removed database migration Rupika 2019-01-20 12:33:19 -0800
• 6f9543c63d Fixed header for signup page, and fix the tag alignment Jack 2019-01-20 12:31:48 -0800
• b7706501f1 Removed pipfile/pipfile.lock from reimbursinator folder Rupika 2019-01-20 12:18:35 -0800
• 96a3067a61 Re-committing after adding Rupika 2019-01-20 12:00:45 -0800
• 5d55d9d66f Fixed functionality and added JSON responses for corresponding views. Rupika 2019-01-20 11:58:30 -0800
• 76c4e033c6 fix signup page with "duplicate navbar" Jack 2019-01-20 11:49:59 -0800