Daniel Dupriest
|
71c1208bfa
|
Merge pull request #36 from danieldupriest/create_api_serializer
Create api serializer
|
2019-01-25 13:01:26 -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 |
|
Logan Miller
|
acc2a6ecc2
|
Merge pull request #35 from danieldupriest/create-custom-user
Create custom user
|
2019-01-22 18:40:55 -08:00 |
|
Logan Miller
|
05f612ab06
|
Merge pull request #34 from danieldupriest/BootstrapSignupForm
Bootstrap signup form
|
2019-01-22 18:17:02 -08:00 |
|
joe-arriaga
|
ab3366529b
|
Merge branch 'master' into create-custom-user
|
2019-01-22 17:56:02 -08:00 |
|
joe-arriaga
|
f299e3a24e
|
Merge pull request #33 from danieldupriest/enable-cors-support
Enabled cors headers for django
|
2019-01-22 17:33:39 -08:00 |
|
joe-arriaga
|
d7bc7cda09
|
Merge pull request #32 from danieldupriest/docker-compose-fix
Removed duplicate 'image:' line in docker-compose, trying to fix bug.
|
2019-01-22 17:23:07 -08:00 |
|
Daniel Dupriest
|
63f3465ca4
|
Created initial user and some sample report objects. Initialized superuser to admin/admin
|
2019-01-22 17:03:07 -08:00 |
|
Daniel Dupriest
|
bd1bf44059
|
Created CustomUser and tweaked backend models.
|
2019-01-22 16:38:09 -08:00 |
|
Preston Doman
|
6a5f5ec2c2
|
Update form and navbar formatting and remove extra index.html links
|
2019-01-22 15:02:06 -08:00 |
|
Preston Doman
|
9e9e85919c
|
Merge branch 'master' into BootstrapSignupForm
|
2019-01-22 14:51:54 -08:00 |
|
Preston Doman
|
0add4e59ba
|
Fix favicon bug
|
2019-01-22 14:51:46 -08:00 |
|
Daniel Dupriest
|
64b47c3345
|
Enabled cors headers for django
|
2019-01-22 13:34:47 -08:00 |
|
Daniel Dupriest
|
1a63d006df
|
Removed duplicate 'image:' line in docker-compose, trying to fix bug.
|
2019-01-22 12:31:30 -08:00 |
|
sliang17
|
5175646e51
|
Merge pull request #31 from danieldupriest/FixLoginLogoutFaviconBugs
Fix login logout favicon bugs
|
2019-01-22 11:36:15 -08:00 |
|
Preston Doman
|
9366120871
|
Merge branch 'master' into FixLoginLogoutFaviconBugs
|
2019-01-22 10:48:17 -08:00 |
|
Preston Doman
|
ad0afab699
|
Fix the logging in/out and favicon bugs
|
2019-01-22 10:46:11 -08:00 |
|
sliang17
|
1afcb1dda6
|
Merge pull request #30 from danieldupriest/ResponsivePageInDashboard
Making the tabs in dashboard responsive
|
2019-01-22 10:45:24 -08:00 |
|
Jack
|
a6807a4d57
|
Making the tabs in dashboard responsive
|
2019-01-22 09:37:48 -08:00 |
|
hui2018
|
eb1df00620
|
Merge pull request #28 from danieldupriest/BootstrapLoginForm
Bootstrap login form
|
2019-01-22 08:31:24 -08:00 |
|
sliang17
|
b08e5adf92
|
Merge pull request #27 from danieldupriest/update-django
Updated django version to fix vulnerability.
|
2019-01-22 00:02:05 -08:00 |
|
Preston Doman
|
77f99eb180
|
Add Bootstrap styling to the signup form
|
2019-01-21 21:18:34 -08:00 |
|
Preston Doman
|
457fae09aa
|
Update Bootstrap styling to login form
|
2019-01-20 21:50:19 -08:00 |
|
Preston Doman
|
b93e889923
|
Add Bootstrap styling to login form
|
2019-01-20 21:45:42 -08:00 |
|
Daniel Dupriest
|
b3177b906b
|
Updated django version to fix vulnerability.
|
2019-01-20 15:16:56 -08:00 |
|
joe-arriaga
|
c3611737e8
|
Merge pull request #26 from danieldupriest/database-models
Database models all implemented. Migrations made.
|
2019-01-20 15:06:39 -08:00 |
|
Daniel Dupriest
|
36252079d7
|
Database models all implemented. Migrations made.
|
2019-01-20 14:39:11 -08:00 |
|
Logan Miller
|
7bfe8a44ea
|
Merge pull request #24 from danieldupriest/stub_api_call
Stub api call
|
2019-01-20 13:20:15 -08:00 |
|
hui2018
|
19a6df89db
|
Merge pull request #23 from danieldupriest/CenterSignUpPage2
Moving files to correct folder
|
2019-01-20 12:39:31 -08:00 |
|
Rupika
|
f18d36e42d
|
Removed database migration
|
2019-01-20 12:33:19 -08:00 |
|
Jack
|
6f9543c63d
|
Fixed header for signup page, and fix the tag alignment
|
2019-01-20 12:31:48 -08:00 |
|
Rupika
|
b7706501f1
|
Removed pipfile/pipfile.lock from reimbursinator folder
|
2019-01-20 12:18:35 -08:00 |
|
Rupika
|
96a3067a61
|
Re-committing after adding
|
2019-01-20 12:00:45 -08:00 |
|
Rupika
|
5d55d9d66f
|
Fixed functionality and added JSON responses for corresponding views.
|
2019-01-20 11:58:30 -08:00 |
|
Jack
|
76c4e033c6
|
fix signup page with "duplicate navbar"
|
2019-01-20 11:49:59 -08:00 |
|
Jack
|
df2f666228
|
Moving files to correct folder
|
2019-01-20 11:44:29 -08:00 |
|
Rupika
|
c5e7fc879f
|
Code is functional, but doesn't display corresponding JSON text for each view?
|
2019-01-20 00:24:39 -08:00 |
|
Rupika
|
be5c722eca
|
Fixed merge conflict in reimbursinator/urls.py
|
2019-01-19 22:39:07 -08:00 |
|
Rupika
|
82c9a5fc46
|
Updating my code
|
2019-01-19 22:29:25 -08:00 |
|
sliang17
|
2d68724a34
|
Merge pull request #22 from danieldupriest/CollapsingNavbar
Add collapsible navbar to all pages
|
2019-01-19 12:01:18 -08:00 |
|
Preston Doman
|
108a854ef8
|
Add collapsible navbar to all pages
|
2019-01-19 00:09:27 -08:00 |
|
hui2018
|
f72fb78c95
|
Merge pull request #19 from danieldupriest/docker-config-fixes
Changed docker-compose.yml version to 2.0 and tried to fix recursion …
|
2019-01-18 20:32:56 -08:00 |
|
hui2018
|
b722b652b5
|
Merge pull request #20 from danieldupriest/FixJqueryBug
Fix Jquery bug by changing script include order
|
2019-01-18 20:29:15 -08:00 |
|
Jack
|
d295f66c0d
|
create folder for img/js/css and fix the page to be more responsive on mobile
|
2019-01-18 20:20:20 -08:00 |
|
Jack
|
b51a4a9112
|
create folder for img/js/css and fix the page to be more responsive on mobile
|
2019-01-18 20:11:45 -08:00 |
|
Jack
|
f7de63a16a
|
Centering signup page and added email text box
|
2019-01-18 19:43:02 -08:00 |
|