Commit Graph
20 Commits
Author SHA1 Message Date
dantanxiaotian adbcd786f0 PAN-15 fix the request changes 2019-04-02 16:38:54 -06:00
dantanxiaotian b1d4ed9719 PAN-15 fix the request changes 2019-03-27 12:18:12 -06:00
dantanxiaotian cc7e6e0ed2 Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15 2019-03-24 17:45:00 -06:00
dantanxiaotian 6791f6c61f Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
2019-03-24 17:31:40 -06:00
dantanxiaotian 7060f2e7e3 Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
2019-03-24 15:00:20 -06:00
dantanxiaotian 89f1c55f51 PAN-15 Fixed unit tests 2019-03-24 14:54:06 -06:00
dantanxiaotian b15ef858b0 Merge pull request #23 from atusa17/PAN-52
Pan 52
2019-03-20 16:20:03 -06:00
dantanxiaotian 860e5379e6 PAN-15 UserService.java and completed UserSservice integration test 2019-03-20 16:06:24 -06:00
dantanxiaotian 46122cbafd PAN-15 Created gradle tasks to start the persistence API and to start the API asynchronously 2019-03-10 19:58:04 -06:00
dantanxiaotian ffaf020b80 PAN-15 WORKING AND WITH TRAVIS!!! 2019-03-10 17:21:32 -06:00
dantanxiaotian 5d429b2c8e PAN-15 Updated tests 2019-03-10 17:06:47 -06:00
dantanxiaotian ced18dcc97 Merge remote-tracking branch 'origin/PAN-15' into PAN-15 2019-03-10 17:03:59 -06:00
dantanxiaotian 238908f4fa PAN-15 Updated tests 2019-03-10 17:03:50 -06:00
dantanxiaotian 10b0a09690 PAN-15 Updated the gradle dependencies 2019-03-10 16:18:19 -06:00
dantanxiaotian ba37ffeb57 PAN-15 Created initial UserService implementation and initial integration tests 2019-03-10 15:55:43 -06:00
dantanxiaotian 2dda30753e Merge pull request #19 from atusa17/PAN-60
Pan 60
2019-03-10 13:24:03 -06:00
dantanxiaotian 92aebf0283 Merge pull request #14 from atusa17/PAN-7
Pan 7
2019-02-24 16:37:42 -07:00
dantanxiaotian b142de57d5 Merge pull request #10 from atusa17/PAN-6-windows-compatibility
PAN-6 added a Windows batch file to load the DB on Windows systems.
2019-02-12 11:42:42 -07:00
dantanxiaotian 38e88c9f94 Merge pull request #9 from atusa17/PAN-6
Pan 6
2019-02-10 14:35:34 -07:00
dantanxiaotian 76b89038bf Merge pull request #8 from atusa17/PAN-5
Pan 5
2019-02-05 15:31:02 -07:00