Commit Graph

37 Commits

Author SHA1 Message Date
7305f444f8 PAN-46 Merged with Master 2019-04-11 20:57:20 -06:00
36036b710d PAN-15 Finished Unit Tests 2019-04-07 15:18:19 -06:00
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
0bc56f57e6 PAN-15 Merged with master 2019-03-24 17:49:07 -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
9695f5082a Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	services/build.gradle
2019-03-20 22:30:11 -06:00
f5f959b453 Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	services/build.gradle
2019-03-20 22:28:51 -06:00
f35777b5a6 Merge remote-tracking branch 'origin/PAN-15' into PAN-15
# Conflicts:
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
#	services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
2019-03-20 22:17:24 -06:00
748781f10f Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15
# Conflicts:
#	build.gradle
#	persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java
#	persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java
#	services/src/main/java/edu/msudenver/tsp/services/RestService.java
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
#	services/src/main/java/edu/msudenver/tsp/services/factory/RequestFactory.java
#	services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java
#	services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
2019-03-20 22:15:32 -06:00
Alex Tusa
083c149a73 Merge branch 'master' into PAN-15 2019-03-20 22:15:08 -06:00
dantanxiaotian
860e5379e6 PAN-15 UserService.java and completed UserSservice integration test 2019-03-20 16:06:24 -06:00
a84e6c6ab7 PAN-52 Removed useless classes 2019-03-17 16:22:23 -06:00
9700eb55ab PAN-52 Removed useless classes 2019-03-17 16:21:32 -06:00
6197beb309 PAN-52 Updated the build.gradle files 2019-03-17 15:37:04 -06:00
6009720d80 PAN-52 Created RequestFactory unit tests 2019-03-17 15:07:23 -06:00
c90f5b6e09 PAN-57 Added patch method to RestService per request 2019-03-17 14:52:41 -06:00
a13ab97154 PAN-57 Refacted superfluous code 2019-03-17 14:48:43 -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
c826185bba PAN-60 Created an example UserService 2019-03-10 12:33:54 -06:00
22e401062a PAN-60 created the RequestFactory 2019-03-10 12:03:11 -06:00
e9661fdf78 PAN-60 created initial RestService 2019-03-10 11:48:34 -06:00
103d09bb0e PAN-10 added a null check to the recurse method 2019-03-05 11:48:18 -07:00
BrittanyBi
2f5aef8092 PAN-10 ParserService.recurse() code refactored to be more readable. 2019-03-04 23:00:26 -07:00
BrittanyBi
357e9b23cc PAN-10 Refactored direct access of fields to getter and setter methods. 2019-03-04 22:24:27 -07:00
BrittanyBi
6f5bbab5ac PAN-10 Corrected many styling errors which required little refactoring. 2019-03-04 21:23:45 -07:00
BrittanyBi
e4594dc900 PAN-10 deleted commented-out code 2019-03-03 19:01:01 -07:00
BrittanyBi
e47f2556f6 PAN-10 code & tests. 100% coverage.
Node class extracted from ParserService class.
ParserConfig deleted because it wasn't being used.
2019-03-03 18:51:11 -07:00
BrittanyBi
4b76f2eb69 PAN-10 code & test corrections. Node class extracted from ParserService class. 2019-03-03 17:32:52 -07:00
96c90a3c49 change git root 2019-03-03 16:13:24 -07:00