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 |
|
Jack
|
9617cbe558
|
Centering signup page and added email text box
|
2019-01-18 19:43:02 -08:00 |
|
Preston Doman
|
aadc284ade
|
Fix Jquery bug by changing script include order
|
2019-01-18 15:37:53 -08:00 |
|
kououken
|
c5ac3eb7ac
|
Changed docker-compose.yml version to 2.0 and tried to fix recursion issue by naming images.
|
2019-01-18 14:10:09 -08:00 |
|
hui2018
|
ab795864be
|
Merge pull request #17 from danieldupriest/update-versions
Recreated django project with v2.1.4 and updated docker config to match.
|
2019-01-18 13:56:44 -08:00 |
|
sliang17
|
ebc886db0d
|
Merge pull request #16 from danieldupriest/LogoutScript
Add logout script to dashboard.html and fix formatting
|
2019-01-17 17:06:05 -08:00 |
|
Daniel Dupriest
|
660c556ca1
|
Recreated django project with v2.1.4 and updated docker config to match.
|
2019-01-17 14:12:20 -08:00 |
|
Preston Doman
|
91c0b8eb5e
|
Add logout script to dashboard.html and fix formatting
|
2019-01-17 13:12:17 -08:00 |
|
hui2018
|
f02420e210
|
Merge pull request #15 from danieldupriest/LoginScript
Add login script to login page
|
2019-01-17 12:02:42 -08:00 |
|
Preston Doman
|
e0540739e7
|
Add missing errorReport tag to login.html
|
2019-01-16 23:55:23 -08:00 |
|
Preston Doman
|
e1f06dbb2b
|
Add login script to login page
|
2019-01-16 22:59:51 -08:00 |
|
rupikad
|
1fb294320d
|
Merge pull request #14 from danieldupriest/AddIconToPages
Add icons to pages
|
2019-01-16 19:09:58 -08:00 |
|
Jack
|
065ecf9bb4
|
Add icon to the all of the pages that are missing
|
2019-01-15 18:41:23 -08:00 |
|
hui2018
|
567cae05d3
|
Merge pull request #13 from danieldupriest/DashboardUI
Create dashboard UI
|
2019-01-15 18:34:20 -08:00 |
|
sliang17
|
169b42a94d
|
Update formatting with prettier and fix links and scripts into one line
|
2019-01-14 20:39:38 -08:00 |
|
hui2018
|
c007b688d3
|
Merge pull request #12 from danieldupriest/LoginPage
Add login page
|
2019-01-14 09:43:36 -08:00 |
|
sliang17
|
95117fc09b
|
Create dashboard UI
|
2019-01-14 03:25:48 -08:00 |
|
sliang17
|
117c43d52d
|
Merge pull request #11 from danieldupriest/CreateSignUpPage
Create sign up page with password confirmation
|
2019-01-13 22:06:08 -08:00 |
|
Preston Doman
|
3464741618
|
Add login page
|
2019-01-13 19:09:05 -08:00 |
|
Jack
|
f9ef59bc9c
|
Removing specifying type in index.html
|
2019-01-13 18:05:45 -08:00 |
|
Jack
|
c53a31a32f
|
Removing specifying type in index.html
|
2019-01-13 17:49:57 -08:00 |
|
Jack
|
c2194a4c0a
|
Separate javascript from html file
|
2019-01-13 17:48:06 -08:00 |
|
Jack
|
75a581386e
|
Create webpage with text input boxes for username and password and a second password verification box for creating a user account. Secondary password box should verify that the passwords match. Each text for now should be at least 4 characters long
|
2019-01-13 16:22:06 -08:00 |
|
sliang17
|
7b62d5c261
|
Merge pull request #10 from danieldupriest/IndexPageWithSignupAndLogin
Index page that will redirect to signup and login page
|
2019-01-13 16:14:49 -08:00 |
|
Jack
|
fef594d84d
|
aligned in header
|
2019-01-13 15:26:04 -08:00 |
|
Jack
|
97b41735bc
|
**Modified** Added signup page. Included jumbotron with nav-tab. Right now the login page have not yet included but the signup page is available. Description from trello: An index page with navbar that will redirect user to signup or login page with jumbotron.
|
2019-01-13 15:13:26 -08:00 |
|
Jack
|
5ea889ec1d
|
**Modified** Added signup page. Included jumbotron with nav-tab. Right now the login page have not yet included but the signup page is available. Description from trello: An index page with navbar that will redirect user to signup or login page with jumbotron.
|
2019-01-13 15:12:25 -08:00 |
|
Jack
|
7163bb5542
|
**Modified** Added signup page. Included jumbotron with nav-tab. Right now the login page have not yet included but the signup page is available. Description from trello: An index page with navbar that will redirect user to signup or login page with jumbotron.
|
2019-01-13 14:55:07 -08:00 |
|
Jack
|
143d2f3200
|
**Modified** Added signup page. Included jumbotron with nav-tab. Right now the login page have not yet included but the signup page is available. Description from trello: An index page with navbar that will redirect user to signup or login page with jumbotron.
|
2019-01-13 14:00:30 -08:00 |
|
Jack
|
6cd7172e2f
|
Added signup page. Included jumbotron with nav-tab. Right now the login page have not yet included but the signup page is available. Description from trello: An index page with navbar that will redirect user to signup or login page with jumbotron.
|
2019-01-13 09:42:48 -08:00 |
|
sliang17
|
0d9e40b19a
|
Merge pull request #9 from danieldupriest/danieldupriest-readme-patch
Update README.md to include names in a list.
|
2019-01-12 19:55:18 -08:00 |
|
Daniel Dupriest
|
700c4f5567
|
Update README.md
|
2019-01-12 15:43:39 -08:00 |
|