| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 ppdom | 4608a3b3ab | Merge pull request #7 from danieldupriest/modify_ignore Modified gitignore and commented dbsqlite | 2019-01-12 15:38:25 -08:00 |  | 
				
					
						| 
								
								
									 ppdom | 1a5c9cfb7d | Merge pull request #8 from danieldupriest/shuaiyi Add my name | 2019-01-12 15:35:59 -08:00 |  | 
				
					
						| 
								
								
									 ppdom | 65d4094e97 | Merge pull request #6 from danieldupriest/logan Added my name to the READ.me | 2019-01-12 15:28:10 -08:00 |  | 
				
					
						| 
								
								
									 sliang17 | 19db7c886e | Add my name | 2019-01-12 15:08:02 -08:00 |  | 
				
					
						| 
								
								
									 Logan Miller | ce2d3224dc | Added my name to the READ.me | 2019-01-12 15:07:49 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 2348850a2d | Modified gitignore and commented dbsqlite | 2019-01-12 15:06:08 -08:00 |  | 
				
					
						| 
								
								
									 sliang17 | e38b25cef0 | Merge pull request #5 from danieldupriest/Jack Testing added name in README | 2019-01-12 14:59:18 -08:00 |  | 
				
					
						| 
								
								
									 Jack | 748b971878 | Testing added name in README | 2019-01-12 14:49:23 -08:00 |  | 
				
					
						| 
								
								
									 Daniel Dupriest | 8c8e501a77 | Merge pull request #4 from danieldupriest/rupika Created .gitignore - merge to master | 2019-01-11 17:30:01 -08:00 |  | 
				
					
						| 
								
								
									 rupikad | 1aea594d07 | Delete vcs.xml | 2019-01-11 13:00:41 -08:00 |  | 
				
					
						| 
								
								
									 rupikad | ec620b037b | Merge pull request #3 from danieldupriest/master Merging from master | 2019-01-10 22:24:04 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 74bd227da9 | Resolved merge conflict | 2019-01-10 22:22:15 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 0d4b7830a3 | Re-adding .gitignore file | 2019-01-10 22:03:07 -08:00 |  | 
				
					
						| 
								
								
									 Rupika | 4d4fd0f7c7 | Created a new branch | 2019-01-10 21:45:18 -08:00 |  | 
				
					
						| 
								
								
									 Logan Miller | 9868b17f9f | Merge pull request #2 from danieldupriest/docker-config Changed docker-compose version to '3.3' and added 'localhost' | 2019-01-10 13:10:34 -08:00 |  | 
				
					
						| 
								
								
									 kououken | 83e5743ac5 | Changed docker-compose.yml version to '3.3' and added 'localhost' to django ALLOWED_HOSTS. | 2019-01-09 17:06:57 -08:00 |  | 
				
					
						| 
								
								
									 kououken | 79956e0186 | Reimplemented front and back end SSL and made Docker copy in fresh files (database, html, etc.) every startup. | 2018-12-22 17:57:39 -06:00 |  | 
				
					
						| 
								
								
									 kououken | 03d7bc0d2e | Revert "Switched both static and api servers over to SSL connection-only. Added self-signed certificate for testing." This reverts commit 2bdd44e1f6. | 2018-12-22 15:24:11 -06:00 |  | 
				
					
						| 
								
								
									 kououken | 2bdd44e1f6 | Switched both static and api servers over to SSL connection-only. Added self-signed certificate for testing. | 2018-12-22 12:48:15 -06:00 |  | 
				
					
						| 
								
								
									 kououken | eee1bfb680 | Modified django code to match v1.10 conventions. | 2018-12-20 12:21:43 -06:00 |  | 
				
					
						| 
								
								
									 kououken | 6be348c110 | Adjusted python and Django versions to match conservative Debian versions (per our tech stack plan). | 2018-12-20 12:18:37 -06:00 |  | 
				
					
						| 
								
								
									 kououken | 0f03533408 | Frontend (nginx) and backend (gunicorn) now both working for docker deployment. | 2018-12-20 11:46:26 -06:00 |  | 
				
					
						| 
								
								
									 kououken | 951b52ef25 | Testing initial docker environment to deploy frontend. | 2018-12-20 01:42:02 -06:00 |  | 
				
					
						| 
								
								
									 Logan Miller | b51daa7714 | Add files via upload | 2018-12-07 22:23:29 -08:00 |  | 
				
					
						| 
								
								
									 Daniel Dupriest | b037ec30b7 | Initial commit | 2018-11-05 19:54:09 -08:00 |  |