Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
200 commits 1 branch 0 tags 1.9 MiB
Commit graph

200 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rupika
9552589e24 added filter by user_id -- now reports only display based on user id 2019-02-07 17:13:43 -08:00
Rupika
ae12403a9d Merge branch 'policy-parser' of https://github.com/danieldupriest/reimbursinator 2019-02-07 16:10:45 -08:00
kououken
38a9464870 Implemented policy parsing, applied policy to report creation, added field_name to fields. 2019-02-07 15:32:21 -08:00
Logan Miller
ca333a6047
Merge pull request #58 from danieldupriest/frontend-registration 
Frontend registration
 2019-02-06 21:14:44 -08:00
Preston Doman
fc2d2e9e9d Fix formatting mistakes 2019-02-06 15:44:15 -08:00
Preston Doman
10c2a3e150 Add frontend registration functionality 2019-02-06 15:31:15 -08:00
rupikad
830509e8d4
Merge pull request #57 from danieldupriest/user-registration 
User registration
 2019-02-06 15:09:49 -08:00
kououken
d683ea8839 Fixed user authentication backend to allow login with email. 2019-02-06 13:22:40 -08:00
kououken
bdddb3cc03 Changed username frank to frank@frank.com. Password is still frank12345 2019-02-05 15:49:03 -08:00
kououken
6e8478cf67 Changed to email instead of username, added first and last name. 2019-02-05 15:38:34 -08:00
kououken
72ab00dd50 User registration endpoint working. 2019-02-05 14:56:48 -08:00
kououken
229acc0d7e Merge branch 'master' into user-registration 2019-02-05 14:50:01 -08:00
hui2018
eee1c11541
Merge pull request #56 from danieldupriest/fix-login-logout 
Fix login logout
 2019-02-05 14:46:25 -08:00
kououken
1ec02e1d22 Added report_pk to reports api endpoint> 2019-02-05 12:48:49 -08:00
Jack
15d50a7c50 Display error message when login fails 2019-02-05 11:28:58 -08:00
Preston Doman
5d12cb64e4 Remove error message display 2019-02-05 10:12:30 -08:00
Preston Doman
efa342dc7f Fix token authentication 2019-02-05 01:05:04 -08:00
kououken
68e2e29c73 Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into user-registration 2019-02-04 18:29:19 -08:00
kououken
99b5bd1ca9 Configure registration app 2019-02-04 18:29:05 -08:00
Logan Miller
1af7c357e9
Merge pull request #55 from danieldupriest/remove_serializer 
Remove serializer
 2019-02-04 18:20:20 -08:00
Rupika
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
 2019-02-04 18:02:32 -08:00
Rupika
08033fc117 fixed merge conflicts FINALLYgit add .! 2019-02-04 17:17:48 -08:00
Rupika
ba1146f9fd replaced old db.sqlite3 with updated one from master 2019-02-04 17:16:50 -08:00
Rupika
c2e3d3640c removed extra comments from dummy api 2019-02-04 17:14:29 -08:00
rupikad
a81f637cf9
Merge pull request #53 from danieldupriest/token-authentication 
Token authentication
 2019-02-04 16:51:36 -08:00
rupikad
a16ff029e1
Merge pull request #54 from danieldupriest/modal-edit-report 
Add modal popup to the edit report form
 2019-02-04 14:27:26 -08:00
Rupika
ae86657fcd Deleted serializer.py and committing final changes 2019-02-04 12:10:12 -08:00
Rupika
eeac88a3ed Merge branch 'master' of https://github.com/danieldupriest/reimbursinator into remove_serializer 2019-02-04 09:53:57 -08:00
Rupika
ebed65f723 Committing my work from api-remove-endpoint to new branch 2019-02-04 09:51:36 -08:00
kououken
b423d23eb6 Deleted extraneous Pipfile 2019-02-03 19:40:26 -08:00
kououken
132ea38da3 Merge branch 'master' into token-authentication 2019-02-03 19:30:53 -08:00
Preston Doman
b5b65c3b9e Add modal popup to the edit report form 2019-02-03 19:03:20 -08:00
kououken
c8ae149510 CSRF backend issue fixed. If cookies are maintained, it seems to work. 2019-02-03 18:30:42 -08:00
kououken
20d0c48839 Token authentication, api endpoints and 'BearerAuthentication' working. 2019-02-03 16:56:34 -08:00
sliang17
f8f8094275
Merge pull request #52 from danieldupriest/bug-fixes 
Bug fixes
 2019-02-03 14:25:28 -08:00
Preston Doman
b273d9ca26 Fix url switching for MacOS 2019-02-03 13:47:12 -08:00
Preston Doman
b26d71c23a Fix bug on Mac for real this time 2019-02-03 12:43:31 -08:00
Preston Doman
174cb9b0dd Fix bug on Mac 2019-02-03 12:39:36 -08:00
Rupika
e0611793f6 Printing the data from the database - need to update the functionality to prevent overwriting 2019-02-03 00:47:04 -08:00
Preston Doman
f55bcebee1 Fix report form display 2019-02-02 19:05:39 -08:00
Preston Doman
1066e50cc7 Refactor event handlers and include classList polyfill 2019-02-02 15:02:09 -08:00
Preston Doman
2a2f8011b9 Refactor table display 2019-02-02 14:22:18 -08:00
hui2018
78c9ec522d
Merge pull request #50 from danieldupriest/edit-report-form 
Edit report form
 2019-02-02 08:43:51 -08:00
Preston Doman
a838a589c6 Fix bug in login.js 2019-02-01 22:29:11 -08:00
Preston Doman
04083269ee Removed all template strings to make IE happy 2019-02-01 22:24:18 -08:00
Logan Miller
9edf870a27
Merge pull request #49 from danieldupriest/database-merge-fields 
Merged data fields into Field table, added 'required' and 'auto_submi…
 2019-02-01 19:29:53 -08:00
Daniel Dupriest
da878aedb4
Merge pull request #51 from danieldupriest/cors-fix 
Reordered apps and middleware in settings.py, fixing CORS issue. I think Preston and I were the only ones to experience this issue, so I'm closing the PR. Feel free to test if you have access to Debian.
 2019-02-01 19:12:50 -08:00
kououken
b3ea00e135 Reordered apps and middleware in settings.py 2019-02-01 14:10:02 -08:00
kououken
0f12774c49 Fixed example data. 2019-02-01 12:09:52 -08:00
Preston Doman
4ae03de53b Clean up formatting 2019-02-01 00:07:08 -08:00