Commit Graph

14 Commits

Author SHA1 Message Date
BrittanyBi
8cc31b5c21 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
2019-05-01 22:03:15 -06:00
BrittanyBi
08bda7099a PAN-54 Runs successfully but closes before the webpage can be loaded. 2019-05-01 21:58:46 -06:00
dantanxiaotian
7465568c97 Add loginpage controller, login jsp and logincontroller unit test. 2019-05-01 14:55:38 -06:00
BrittanyBi
8f809ff422 PAN-54 Clean slate that runs 2019-04-29 12:46:33 -06:00
BrittanyBi
e72760c528 PAN-54 Working version includes no beans and no connection to the database. 2019-04-24 16:38:29 -06:00
BrittanyBi
3ee3d1bb06 PAN-64 Errors 2019-04-22 12:42:28 -06:00
BrittanyBi
f86b36aa17 PAN-54 Added call to UserService to query DB. 2019-04-07 23:55:15 -06:00
749a20c0fd Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16
# Conflicts:
#	services/build.gradle
2019-03-20 22:00:11 -06:00
-
5479130178 fixed again, thanks Alex for your detailed reviews I have learned alot :) 2019-03-19 17:44:53 -06:00
-
f0cb7633c6 updated with passed tests 2019-03-19 00:11:38 -06:00
-
9f5d9e24f5 made few changes also adding test method 2019-03-18 13:52:01 -06:00
-
0afe995950 Reverted build file changes 2019-03-15 01:44:51 -06:00
-
139dc943c3 PAN-16 finished 2019-03-14 16:58:17 -06:00
96c90a3c49 change git root 2019-03-03 16:13:24 -07:00