Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266 Commits 1 Branch 4 Tags
52cc67ebfb149599a29a37663a3a951b87891cbc
Commit Graph

266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BrittanyBi
0fc825e11b PAN-54 Created user registration page. 2019-03-24 15:37:39 -06:00
zeliu
3b4753215c PAN-18 Refactored the HomeController 2019-03-24 15:26:08 -06:00
zeliu
94440faa4d PAN-18 Here is the JSP file for hoempage 2019-03-24 15:21:25 -06:00
zeliu
cf5135e5b0 Merge branch 'master' of https://github.com/atusa17/ptp 2019-03-24 15:18:22 -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
Alex Tusa
de5a69d619 Merge pull request #25 from atusa17/PAN-52-fix 
PAN-52 Fixed issue with the Theorems API
v0.3 		2019-03-21 12:15:55 -06:00
atusa17
296cf62be6 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:40:19 -06:00
atusa17
f5dbdac990 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:29:30 -06:00
atusa17
c9a2a978fc PAN-52 Fixed issue with the Theorems API 2019-03-21 11:20:52 -06:00
atusa17
d0cde837e9 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:09:01 -06:00
atusa17
07cdef3d44 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:05:32 -06:00
atusa17
ab360abcf8 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:02:46 -06:00
atusa17
4622c49cee PAN-52 Fixed issue with the Theorems API 2019-03-21 10:59:14 -06:00
atusa17
f8a1d8bf89 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:55:15 -06:00
atusa17
ba4c7502db PAN-52 Fixed issue with the Theorems API 2019-03-21 10:39:24 -06:00
atusa17
1e15082fcc PAN-52 Fixed issue with the Theorems API 2019-03-21 10:32:57 -06:00
atusa17
6b7cf5cd91 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:28:51 -06:00
atusa17
413a78f729 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:28:09 -06:00
atusa17
80f55c4879 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:25:52 -06:00
Alex Tusa
ae15ec8073 Merge pull request #22 from atusa17/PAN-16 
Pan 16
 2019-03-20 22:47:56 -06:00
atusa17
8c79d9975e Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16 
# Conflicts:
#	services/build.gradle
 2019-03-20 22:32:25 -06:00
atusa17
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
atusa17
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
atusa17
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
atusa17
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
atusa17
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
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
-
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
atusa17
7b2d5c45a6 PAN-52 Forgot to add the @Repository annotation to the ProofRepository 2019-03-17 22:59:18 -06:00
atusa17
b48094ba26 PAN-11 Stuck trying to get the integration tests to be configured correctly 2019-03-17 22:02:00 -06:00
atusa17
3853911b3c PAN-11 corrected build.gradle inter-project dependencies 2019-03-17 21:09:07 -06:00
atusa17
a84e6c6ab7 PAN-52 Removed useless classes 2019-03-17 16:22:23 -06:00
atusa17
9700eb55ab PAN-52 Removed useless classes 2019-03-17 16:21:32 -06:00
atusa17
7548ca64d0 PAN-52 Updated the build.gradle files and the .travis.yml 2019-03-17 16:01:12 -06:00
atusa17
6197beb309 PAN-52 Updated the build.gradle files 2019-03-17 15:37:04 -06:00
atusa17
6009720d80 PAN-52 Created RequestFactory unit tests 2019-03-17 15:07:23 -06:00
atusa17
c90f5b6e09 PAN-57 Added patch method to RestService per request 2019-03-17 14:52:41 -06:00
atusa17
a13ab97154 PAN-57 Refacted superfluous code 2019-03-17 14:48:43 -06:00
atusa17
a85bf67d08 PAN-57 Refactored the Definition DTO 2019-03-17 14:36:44 -06:00
atusa17
1de1f7a5fc PAN-52 Finished integration tests for the proofs repository 2019-03-17 14:26:54 -06:00
atusa17
2c03c75938 PAN-52 Fixed a typo in the parameter arguments 2019-03-17 13:58:51 -06:00
atusa17
52a21e72f3 PAN-52 Updated logging formats 2019-03-17 12:51:48 -06:00
atusa
4b866017a1 PAN-52 Finished creating the ProofController and writing all unit tests 2019-03-15 15:58:23 -06:00
atusa
bd7455c679 PAN-52 updated the travis.yml file to also perform a sonar analysis after each build 2019-03-15 15:04:45 -06:00
-
150933b22b Merge remote-tracking branch 'origin/PAN-16' into PAN-16 2019-03-15 01:45:31 -06:00