Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • df2f666228 Moving files to correct folder Jack 2019-01-20 11:44:29 -0800
  • c5e7fc879f Code is functional, but doesn't display corresponding JSON text for each view? Rupika 2019-01-20 00:24:39 -0800
  • be5c722eca Fixed merge conflict in reimbursinator/urls.py Rupika 2019-01-19 22:39:07 -0800
  • 82c9a5fc46 Updating my code Rupika 2019-01-19 22:29:25 -0800
  • 2d68724a34
         Merge pull request #22 from danieldupriest/CollapsingNavbar sliang17 2019-01-19 12:01:18 -0800
  • 108a854ef8 Add collapsible navbar to all pages Preston Doman 2019-01-19 00:09:27 -0800
  • f72fb78c95
         Merge pull request #19 from danieldupriest/docker-config-fixes hui2018 2019-01-18 20:32:56 -0800
  • b722b652b5
         Merge pull request #20 from danieldupriest/FixJqueryBug hui2018 2019-01-18 20:29:15 -0800
  • d295f66c0d create folder for img/js/css and fix the page to be more responsive on mobile Jack 2019-01-18 20:20:20 -0800
  • b51a4a9112 create folder for img/js/css and fix the page to be more responsive on mobile Jack 2019-01-18 20:11:45 -0800
  • f7de63a16a Centering signup page and added email text box Jack 2019-01-18 13:53:01 -0800
  • 9617cbe558 Centering signup page and added email text box Jack 2019-01-17 20:49:11 -0800
  • aadc284ade Fix Jquery bug by changing script include order Preston Doman 2019-01-18 15:37:53 -0800
  • c5ac3eb7ac Changed docker-compose.yml version to 2.0 and tried to fix recursion issue by naming images. kououken 2019-01-18 14:10:09 -0800
  • ab795864be
         Merge pull request #17 from danieldupriest/update-versions hui2018 2019-01-18 13:56:44 -0800
  • ebc886db0d
         Merge pull request #16 from danieldupriest/LogoutScript sliang17 2019-01-17 17:06:05 -0800
  • 660c556ca1 Recreated django project with v2.1.4 and updated docker config to match. Daniel Dupriest 2019-01-17 14:12:20 -0800
  • 91c0b8eb5e Add logout script to dashboard.html and fix formatting Preston Doman 2019-01-17 13:12:17 -0800
  • f02420e210
         Merge pull request #15 from danieldupriest/LoginScript hui2018 2019-01-17 12:02:42 -0800
  • e0540739e7 Add missing errorReport tag to login.html Preston Doman 2019-01-16 23:55:23 -0800
  • e1f06dbb2b Add login script to login page Preston Doman 2019-01-16 22:59:51 -0800
  • 1fb294320d
         Merge pull request #14 from danieldupriest/AddIconToPages rupikad 2019-01-16 19:09:58 -0800
  • 065ecf9bb4 Add icon to the all of the pages that are missing Jack 2019-01-15 18:41:23 -0800
  • 567cae05d3
         Merge pull request #13 from danieldupriest/DashboardUI hui2018 2019-01-15 18:34:20 -0800
  • 169b42a94d Update formatting with prettier and fix links and scripts into one line sliang17 2019-01-14 20:39:38 -0800
  • c007b688d3
         Merge pull request #12 from danieldupriest/LoginPage hui2018 2019-01-14 09:43:36 -0800
  • 95117fc09b Create dashboard UI sliang17 2019-01-14 03:25:48 -0800
  • 117c43d52d
         Merge pull request #11 from danieldupriest/CreateSignUpPage sliang17 2019-01-13 22:06:08 -0800
  • 3464741618 Add login page Preston Doman 2019-01-13 19:09:05 -0800
  • f9ef59bc9c Removing specifying type in index.html Jack 2019-01-13 18:05:45 -0800
  • c53a31a32f Removing specifying type in index.html Jack 2019-01-13 17:49:57 -0800
  • c2194a4c0a Separate javascript from html file Jack 2019-01-13 17:48:06 -0800
  • 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 Jack 2019-01-13 16:22:06 -0800
  • 7b62d5c261
         Merge pull request #10 from danieldupriest/IndexPageWithSignupAndLogin sliang17 2019-01-13 16:14:49 -0800
  • fef594d84d aligned in header Jack 2019-01-13 15:26:04 -0800
  • 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. Jack 2019-01-13 15:13:26 -0800
  • 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. Jack 2019-01-13 15:12:25 -0800
  • 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. Jack 2019-01-13 14:55:07 -0800
  • 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. Jack 2019-01-13 14:00:30 -0800
  • 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. Jack 2019-01-13 09:42:48 -0800
  • 0d9e40b19a
         Merge pull request #9 from danieldupriest/danieldupriest-readme-patch sliang17 2019-01-12 19:55:18 -0800
  • 700c4f5567
         Update README.md Daniel Dupriest 2019-01-12 15:43:39 -0800
  • 4608a3b3ab
         Merge pull request #7 from danieldupriest/modify_ignore ppdom 2019-01-12 15:38:25 -0800
  • 1a5c9cfb7d
         Merge pull request #8 from danieldupriest/shuaiyi ppdom 2019-01-12 15:35:59 -0800
  • 65d4094e97
         Merge pull request #6 from danieldupriest/logan ppdom 2019-01-12 15:28:10 -0800
  • 19db7c886e Add my name sliang17 2019-01-12 15:08:02 -0800
  • ce2d3224dc Added my name to the READ.me Logan Miller 2019-01-12 15:07:49 -0800
  • 2348850a2d Modified gitignore and commented dbsqlite Rupika 2019-01-12 15:06:08 -0800
  • e38b25cef0
         Merge pull request #5 from danieldupriest/Jack sliang17 2019-01-12 14:59:18 -0800
  • 748b971878 Testing added name in README Jack 2019-01-12 14:49:23 -0800
  • 8c8e501a77
         Merge pull request #4 from danieldupriest/rupika Daniel Dupriest 2019-01-11 17:30:01 -0800
  • 1aea594d07
         Delete vcs.xml rupikad 2019-01-11 13:00:41 -0800
  • ec620b037b
         Merge pull request #3 from danieldupriest/master rupikad 2019-01-10 22:24:04 -0800
  • 74bd227da9 Resolved merge conflict Rupika 2019-01-10 22:22:15 -0800
  • 0d4b7830a3 Re-adding .gitignore file Rupika 2019-01-10 22:03:07 -0800
  • 4d4fd0f7c7 Created a new branch Rupika 2019-01-10 21:45:18 -0800
  • 9868b17f9f
         Merge pull request #2 from danieldupriest/docker-config Logan Miller 2019-01-10 13:10:34 -0800
  • 83e5743ac5 Changed docker-compose.yml version to '3.3' and added 'localhost' to django ALLOWED_HOSTS. kououken 2019-01-09 17:06:57 -0800
  • 79956e0186 Reimplemented front and back end SSL and made Docker copy in fresh files (database, html, etc.) every startup. kououken 2018-12-22 17:57:39 -0600
  • 03d7bc0d2e Revert "Switched both static and api servers over to SSL connection-only. Added self-signed certificate for testing." kououken 2018-12-22 15:24:11 -0600
  • 2bdd44e1f6 Switched both static and api servers over to SSL connection-only. Added self-signed certificate for testing. kououken 2018-12-22 12:48:15 -0600
  • eee1bfb680 Modified django code to match v1.10 conventions. kououken 2018-12-20 12:21:43 -0600
  • 6be348c110 Adjusted python and Django versions to match conservative Debian versions (per our tech stack plan). kououken 2018-12-20 12:18:37 -0600
  • 0f03533408 Frontend (nginx) and backend (gunicorn) now both working for docker deployment. kououken 2018-12-20 11:46:26 -0600
  • 951b52ef25 Testing initial docker environment to deploy frontend. kououken 2018-12-20 01:42:02 -0600
  • b51daa7714
         Add files via upload Logan Miller 2018-12-07 22:23:29 -0800
  • b037ec30b7
         Initial commit Daniel Dupriest 2018-11-05 19:54:09 -0800