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

231 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Preston Doman
b076eae02b Add new report functionality 2019-02-04 01:39:42 -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
Preston Doman
a7d48c1208 Enable section collapse/show based off section completed flag 2019-01-31 23:49:36 -08:00
Preston Doman
fc4141eaaf Fix styling 2019-01-31 17:48:36 -08:00
kououken
6ae79194d0 Merged data fields into Field table, added 'required' and 'auto_submit' fields to Section. 2019-01-31 16:55:11 -08:00
Preston Doman
74ce7f5c73 Fix Bootstrap styling for form groups 2019-01-31 16:27:29 -08:00
Preston Doman
41f0b78aa5 Add accordion and collapsible card creation functions 2019-01-31 15:48:33 -08:00
Preston Doman
5abc6cb87a Update createEditReportForm to populate form 2019-01-30 23:54:27 -08:00
Preston Doman
635edf83b6 Merge conflict resolved 2019-01-30 20:35:44 -08:00
hui2018
bd9ba06bba
Merge pull request #47 from danieldupriest/condense-pages 
Condense pages
 2019-01-30 17:02:48 -08:00
hui2018
9e6f08675d
Merge pull request #46 from danieldupriest/show-report-history 
Show report history
 2019-01-30 17:02:01 -08:00
Preston Doman
546b0730da Add edit report form function 2019-01-30 15:42:09 -08:00
Preston Doman
9ecbc6eb27 Change navbar brand from an anchor to a div 2019-01-30 10:14:49 -08:00
Preston Doman
1b2dab0632 Condense pages, rename html files, and update navbar 2019-01-30 09:03:11 -08:00
ppdom
c569993f75
Merge pull request #45 from danieldupriest/rework-policy-files 
Moved policy files into 'backend/' and fixed (most) formatting issues.
 2019-01-30 01:16:02 -08:00
Preston Doman
41a4ab6c8b Update endpoint url 2019-01-30 00:48:04 -08:00
Preston Doman
f1da66abcc Merge branch 'master' into show-report-history 2019-01-30 00:27:29 -08:00
Preston Doman
4eeb7bb5ae Change formatting 2019-01-30 00:25:45 -08:00
Preston Doman
5aebef7be4 Refactor code 2019-01-29 22:17:44 -08:00
rupikad
0b04057da2
Merge pull request #43 from danieldupriest/api-endpoint-rework 
Reworked API endpoints with correct types and some sample JSON.
 2019-01-29 17:03:12 -08:00
Preston Doman
72dd3d9900 Add form-building function 2019-01-29 17:01:39 -08:00