Commit graph

Select branches

Hide pull requests

master

Mono Color

• e1b2259e85 Merge branch 'master' into mega-bug-fix Preston Doman 2019-02-14 17:48:20 -0800
• 04a742dec0 Merge branch 'master' into section_complete_boolean Rupika 2019-02-14 17:36:55 -0800
• 736f450013 extra changes for testing section complete Rupika 2019-02-14 17:36:33 -0800
• a4bf17ee71
  Merge pull request #78 from danieldupriest/implement-rules hui2018 2019-02-14 16:35:26 -0800
• 03a3bf9ce4 Simplify section id assignment Preston Doman 2019-02-14 15:58:27 -0800
• 8706f998f5 Fix non-unique id bug on forms, inputs, etc Preston Doman 2019-02-14 15:36:31 -0800
• 4704b86f2a Set section boolean values to default to False, and set field numerical values to default to 0. kououken 2019-02-14 14:23:05 -0800
• 5a4312305c Fix modalLabel global variable bug Preston Doman 2019-02-14 14:21:43 -0800
• f95bd9ecee Implemented rule_violations in json for GET report. kououken 2019-02-14 14:19:15 -0800
• f2f1a3399b Change checkbox to boolean select menu Preston Doman 2019-02-14 14:17:25 -0800
• 8164236513 added logic for section complete check Rupika 2019-02-14 13:26:26 -0800
• b052bfea3c
  Merge pull request #76: Section Update implemented Daniel Dupriest 2019-02-14 12:20:28 -0800
• a2deb2b1bd updated database with field_type Rupika 2019-02-13 23:36:29 -0800
• c69ad9d9ad fix db conflict? Rupika 2019-02-13 23:09:57 -0800
• 781d64a4e2
  Merge pull request #74 from danieldupriest/from-type-to-field-type rupikad 2019-02-13 22:57:37 -0800
• 91611a2fca commit Rupika 2019-02-13 22:52:24 -0800
• 614f7102ba altered data_date to accommodate null date values Rupika 2019-02-13 21:17:31 -0800
• ff3923d367 successfully updates all fields given front end data. PENDING 1) need to tweak DB to accommodate NULL dates 2) insert file logic Rupika 2019-02-13 21:07:53 -0800
• 9149abdacf Removed 'request.data' from section update api response due to file serialization bug. kououken 2019-02-13 17:46:00 -0800
• 75932daef1 fix merge conflict Rupika 2019-02-13 17:45:39 -0800
• e68e95e89c commiting db changes Rupika 2019-02-13 17:43:23 -0800
• 11b1de72b3 revamped update logic -- updated dummy JSON to mirror a full report Rupika 2019-02-13 17:41:28 -0800
• 70df4ec486 Changed 'type' references to 'field_type' in backend and a couple places in front end. kououken 2019-02-13 17:38:27 -0800
• 69b57ff45a
  Merge pull request #72 from danieldupriest/save-section Daniel Dupriest 2019-02-13 17:07:19 -0800
• b2088291df successfully updates section from the request.data -- dummy JSON in postman Rupika 2019-02-13 17:06:58 -0800
• 8d630bd351 hardcoded dummy json input and updated section Rupika 2019-02-13 16:24:17 -0800
• 74098cf80c Add frontend save section functionality Preston Doman 2019-02-13 00:48:35 -0800
• 60eddf7ca4
  Merge pull request #70 from danieldupriest/delete_file_db ppdom 2019-02-11 13:59:07 -0800
• e7161c7ff9 clean up code Rupika 2019-02-11 12:36:24 -0800
• c860ae7000 Merge branch 'master' into delete_file_db Rupika 2019-02-11 12:32:45 -0800
• 9a9afb85c3
  Merge pull request #69 from danieldupriest/delete-report-action rupikad 2019-02-11 12:30:51 -0800
• a419316608 Move rid attribute setting from event listener to createReportForm Preston Doman 2019-02-10 22:51:19 -0800
• 01e1d1ffee Fixed deleted report message Rupika 2019-02-10 19:59:28 -0800
• 7b2c58cb2d deleting the file in database if it exists in report Rupika 2019-02-10 19:23:12 -0800
• 6bafd5d115 Remove some more Preston Doman 2019-02-10 18:37:44 -0800
• c3c1b65094 Remove unused text-centering Preston Doman 2019-02-10 18:36:10 -0800
• 74d503c244 Refactor AJAX request code Preston Doman 2019-02-10 18:15:32 -0800
• ae743ffb1a Fix merge conflict Preston Doman 2019-02-10 15:57:05 -0800
• 3e058ac604 Add delete report functionality Preston Doman 2019-02-10 15:46:27 -0800
• 16dbd04ef4
  Merge pull request #65 from danieldupriest/new-report-form hui2018 2019-02-10 15:43:54 -0800
• 639fdcec8b
  Merge pull request #66 from danieldupriest/delete_report_api ppdom 2019-02-10 13:32:47 -0800
• 26aa235612 section 4 per diem link Rupika 2019-02-10 12:44:26 -0800
• 7c1c41e828 made per diem link visible Rupika 2019-02-10 12:25:45 -0800
• b0f489bfeb Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into delete_report_api Rupika 2019-02-10 12:14:17 -0800
• 93d99e13f6 added delete report SQL call in views.py Rupika 2019-02-10 12:13:22 -0800
• 57a22df879 Remove unused file Preston Doman 2019-02-09 23:04:43 -0800
• 5427c026cf Fix form event listener Preston Doman 2019-02-09 23:02:01 -0800
• da50627f51 Add loading message and modal fade Preston Doman 2019-02-09 22:23:08 -0800
• 9a20cf72a8 Fix merge conflict Preston Doman 2019-02-09 21:16:53 -0800
• c0768aaed3 added delete report SQL call Rupika 2019-02-09 15:39:48 -0800
• edb7339543
  Merge pull request #64 from danieldupriest/print_file_name ppdom 2019-02-09 15:35:41 -0800
• e315355e81 fixing db Rupika 2019-02-09 15:32:15 -0800
• 0ac8e5419e
  Merge pull request #62 from danieldupriest/CreateTitleBox ppdom 2019-02-09 15:29:33 -0800
• 7a52211ad2
  Merge pull request #63: Added View Report functionality Daniel Dupriest 2019-02-09 15:07:02 -0800
• d26b79c725 Tweaked database so 'Super Report' is submitted with some complete sections, for testing. kououken 2019-02-09 14:00:49 -0800
• 7c472bb917 moved the get_data_type and get_path_leaf to models.py from views.py to clean up Rupika 2019-02-09 13:41:39 -0800
• f3d76adf3c extracts just the file name from the file path Rupika 2019-02-09 13:23:01 -0800
• 8416c041d0 Add a condition to check if section is completed. If its complete it will display the information of that section if not it won't display Jack 2019-02-09 12:32:28 -0800
• bfef35a378 Create the title textarea in new report page sliang17 2019-02-09 12:27:09 -0800
• 4ed0b26811 Merge branch 'master' into ViewReport Jack 2019-02-08 17:31:36 -0800
• af2d748536 Display completed report. Login and go to report history and click on "view" button and the report will display Jack 2019-02-08 17:26:45 -0800
• 4c560062c7
  Merge pull request #60 from danieldupriest/field_to_json joe-arriaga 2019-02-07 18:33:45 -0800
• f8b6d665c7 changed the data_values to display as just "value" in the JSON data dict Rupika 2019-02-07 18:21:57 -0800
• f19781a682 added function that displays data values Rupika 2019-02-07 18:13:32 -0800
• 21440bf3dc
  Merge pull request #59: Implemented policy parsing Daniel Dupriest 2019-02-07 17:49:05 -0800
• 9552589e24 added filter by user_id -- now reports only display based on user id Rupika 2019-02-07 17:13:43 -0800
• ae12403a9d Merge branch 'policy-parser' of https://github.com/danieldupriest/reimbursinator Rupika 2019-02-07 16:10:45 -0800
• 38a9464870 Implemented policy parsing, applied policy to report creation, added field_name to fields. kououken 2019-02-07 15:32:21 -0800
• ca333a6047
  Merge pull request #58 from danieldupriest/frontend-registration Logan Miller 2019-02-06 21:14:44 -0800
• fc2d2e9e9d Fix formatting mistakes Preston Doman 2019-02-06 15:44:15 -0800
• 10c2a3e150 Add frontend registration functionality Preston Doman 2019-02-06 15:31:15 -0800
• 830509e8d4
  Merge pull request #57 from danieldupriest/user-registration rupikad 2019-02-06 15:09:49 -0800
• d683ea8839 Fixed user authentication backend to allow login with email. kououken 2019-02-06 13:22:40 -0800
• bdddb3cc03 Changed username frank to frank@frank.com. Password is still frank12345 kououken 2019-02-05 15:49:03 -0800
• 6e8478cf67 Changed to email instead of username, added first and last name. kououken 2019-02-05 15:38:34 -0800
• d4c972e5d9 successfully getting the correct report. still to do print report to modal Jack 2019-02-05 15:31:55 -0800
• 72ab00dd50 User registration endpoint working. kououken 2019-02-05 14:56:48 -0800
• 229acc0d7e Merge branch 'master' into user-registration kououken 2019-02-05 14:50:01 -0800
• eee1c11541
  Merge pull request #56 from danieldupriest/fix-login-logout hui2018 2019-02-05 14:46:25 -0800
• 1ec02e1d22 Added report_pk to reports api endpoint> kououken 2019-02-05 12:48:49 -0800
• 15d50a7c50 Display error message when login fails Jack 2019-02-05 11:28:58 -0800
• 5d12cb64e4 Remove error message display Preston Doman 2019-02-05 10:12:30 -0800
• efa342dc7f Fix token authentication Preston Doman 2019-02-05 01:05:04 -0800
• 68e2e29c73 Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into user-registration kououken 2019-02-04 18:29:19 -0800
• 99b5bd1ca9 Configure registration app kououken 2019-02-04 18:29:05 -0800
• 1af7c357e9
  Merge pull request #55 from danieldupriest/remove_serializer Logan Miller 2019-02-04 18:20:20 -0800
• 84aa01e008 1) added a user in the admin to change the user_id in report -- updated database! 2) removed double dictionary for fields in view.py Rupika 2019-02-04 18:02:32 -0800
• 08033fc117 fixed merge conflicts FINALLYgit add .! Rupika 2019-02-04 17:17:48 -0800
• ba1146f9fd replaced old db.sqlite3 with updated one from master Rupika 2019-02-04 17:16:50 -0800
• c2e3d3640c removed extra comments from dummy api Rupika 2019-02-04 17:14:29 -0800
• a81f637cf9
  Merge pull request #53 from danieldupriest/token-authentication rupikad 2019-02-04 16:51:36 -0800
• a16ff029e1
  Merge pull request #54 from danieldupriest/modal-edit-report rupikad 2019-02-04 14:27:26 -0800
• ae86657fcd Deleted serializer.py and committing final changes Rupika 2019-02-04 12:10:12 -0800
• eeac88a3ed Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into remove_serializer Rupika 2019-02-04 09:53:57 -0800
• ebed65f723 Committing my work from api-remove-endpoint to new branch Rupika 2019-02-04 09:51:36 -0800
• b076eae02b Add new report functionality Preston Doman 2019-02-04 01:39:42 -0800
• b423d23eb6 Deleted extraneous Pipfile kououken 2019-02-03 19:40:26 -0800
• 132ea38da3 Merge branch 'master' into token-authentication kououken 2019-02-03 19:30:53 -0800
• b5b65c3b9e Add modal popup to the edit report form Preston Doman 2019-02-03 19:03:20 -0800
• c8ae149510 CSRF backend issue fixed. If cookies are maintained, it seems to work. kououken 2019-02-03 18:30:42 -0800