Commit Graph

10 Commits

Author SHA1 Message Date
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
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
dantanxiaotian
860e5379e6 PAN-15 UserService.java and completed UserSservice integration test 2019-03-20 16:06:24 -06:00
atusa
4b866017a1 PAN-52 Finished creating the ProofController and writing all unit tests 2019-03-15 15:58:23 -06:00
4d0658a268 PAN-52 Added findByName to the TheoremRepository, and to the TheoremController as well as the corresponding tests, and a foreign key mapping from the proofs table to the corresponding theorem in the theorems table 2019-03-14 12:28:59 -06:00
7af41d4235 PAN-52 Added findByName and findByBranch methods to the repository, and created first couple of methods and corresponding tests in the ProofController 2019-03-14 11:43:01 -06:00
4bd1936a7a PAN-52 created the proofs DTO 2019-03-14 11:17:51 -06:00
bc92dc60d4 PAN-52 created the proofs table 2019-03-14 10:51:38 -06:00
f6de79a3d4 PAN-50 Added the creation of the theorems table to the local_development.sql 2019-03-03 18:25:46 -07:00
96c90a3c49 change git root 2019-03-03 16:13:24 -07:00