| 
								
								
									 Rupika | 26aa235612 | section 4 per diem link | 2019-02-10 12:44:26 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 7c1c41e828 | made per diem link visible | 2019-02-10 12:25:45 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 93d99e13f6 | added delete report SQL call in views.py | 2019-02-10 12:13:22 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | c0768aaed3 | added delete report SQL call | 2019-02-09 15:39:48 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | e315355e81 | fixing db | 2019-02-09 15:32:15 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 7c472bb917 | moved the get_data_type and get_path_leaf to models.py from views.py to clean up | 2019-02-09 13:41:39 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | f3d76adf3c | extracts just the file name from the file path | 2019-02-09 13:23:01 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | f8b6d665c7 | changed the data_values to display as just "value" in the JSON data dict | 2019-02-07 18:21:57 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | f19781a682 | added function that displays data values | 2019-02-07 18:13:32 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 9552589e24 | added filter by user_id -- now reports only display based on user id | 2019-02-07 17:13:43 -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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 kououken | 1ec02e1d22 | Added report_pk to reports api endpoint> | 2019-02-05 12:48:49 -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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Rupika | ae86657fcd | Deleted serializer.py and committing final changes | 2019-02-04 12:10:12 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | ebed65f723 | Committing my work from api-remove-endpoint to new branch | 2019-02-04 09:51:36 -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 |  | 
				
					
						| 
								
								
									 Rupika | e0611793f6 | Printing the data from the database - need to update the functionality to prevent overwriting | 2019-02-03 00:47:04 -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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 kououken | 6ae79194d0 | Merged data fields into Field table, added 'required' and 'auto_submit' fields to Section. | 2019-01-31 16:55: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 kououken | 875641fbe4 | Fixed policy file spacing. | 2019-01-29 16:56:56 -08:00 |  | 
				
					
						| 
								
								
									 kououken | a70d9aa6bc | Moved policy files into 'backend/' and fixed (most) formatting issues. | 2019-01-29 16:39:35 -08:00 |  | 
				
					
						| 
								
								
									 Logan Miller | 0a930a21ed | Merge pull request #39 from danieldupriest/example_policy Created example policy config file | 2019-01-28 13:53:44 -08:00 |  | 
				
					
						| 
								
								
									 Logan Miller | c665a83729 | Merge pull request #37 from danieldupriest/model-string-representations Gave all models string representations and set up file storage. | 2019-01-28 13:49:52 -08:00 |  | 
				
					
						| 
								
								
									 kououken | 1ff30226f9 | Added 'report_pk' to report list json. | 2019-01-28 13:23:49 -08:00 |  | 
				
					
						| 
								
								
									 kououken | a4dbb3f644 | Reworked API endpoints with correct types and some sample JSON. | 2019-01-27 14:22:42 -08:00 |  | 
				
					
						| 
								
								
									 joe-arriaga | 0f7d844dda | Update hasher.py | 2019-01-26 12:05:07 -08:00 |  | 
				
					
						| 
								
								
									 Joe Arriaga | 368bc0964c | Replaced tabs with spaces in simple_poicy.py. | 2019-01-25 21:29:38 -08:00 |  | 
				
					
						| 
								
								
									 Daniel Dupriest | fbe95aac0b | Merge pull request #29 from danieldupriest/example_policy Added example policy | 2019-01-25 19:45:29 -08:00 |  | 
				
					
						| 
								
								
									 kououken | 1a68176f80 | Gave all models string representations and set up file storage. | 2019-01-25 14:37:03 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | c9fbe8d60e | adding model = models.report | 2019-01-25 12:45:34 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 496ec5626e | fix errors | 2019-01-23 18:18:19 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | fe516ec96b | Got serializer code to work, need to fix submitting null "date submitted" fields in report | 2019-01-23 13:40:37 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 4bc54d5dcc | fixed merge conflict in settings.py? | 2019-01-23 10:25:50 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | c2f1899e20 | updating my code | 2019-01-22 23:11:41 -08:00 |  | 
				
					
						| 
								
								
									 joe-arriaga | ab3366529b | Merge branch 'master' into create-custom-user | 2019-01-22 17:56:02 -08:00 |  |