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

231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BrittanyBi 1a2715ec04 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54 2019-04-07 20:37:36 -06:00
BrittanyBi 1a12f29755 PAN-54 Left this out of previous commit somehow. 2019-04-07 20:36:53 -06:00
BrittanyBi 4cc184b6e7 PAN-54 Client-side mostly working. Still need email validator and to handle the errors thrown by UserCreationController. Next stage after that is to query the DB for existing usernames - once for the registering party and once for the referrer category. 2019-04-07 20:34:52 -06:00
Alex Tusa 1bddb2d646 Merge pull request #24 from atusa17/PAN-15 
Pan 15
 2019-04-07 15:33:49 -06:00
Dark-Alex-17 36036b710d PAN-15 Finished Unit Tests 2019-04-07 15:18:19 -06:00
BrittanyBi 6f70785387 PAN-54 2019-04-03 20:14:54 -06:00
dantanxiaotian adbcd786f0 PAN-15 fix the request changes 2019-04-02 16:38:54 -06:00
BrittanyBi 2a4adcbd08 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54 2019-03-31 14:17:08 -06:00
dantanxiaotian b1d4ed9719 PAN-15 fix the request changes 2019-03-27 12:18:12 -06:00
Dark-Alex-17 eedc7a3eee Merge remote-tracking branch 'origin/PAN-15' into PAN-15 2019-03-24 17:49:16 -06:00
Dark-Alex-17 0bc56f57e6 PAN-15 Merged with master 2019-03-24 17:49:07 -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
Dark-Alex-17 e2e2b24f3d Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15 2019-03-24 17:44:27 -06:00
Alex Tusa c715e98e81 Merge pull request #26 from atusa17/PAN-18 
Pan 18
 2019-03-24 17:34:50 -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
zeliu 8f2968bc2b PAN-18 WORKING HOMEPAGE 2019-03-24 17:17:04 -06:00
zeliu 98f6b9e2b7 PAN-18 WORKING HOMEPAGE 2019-03-24 17:02:50 -06:00
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
Dark-Alex-17 296cf62be6 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:40:19 -06:00
Dark-Alex-17 f5dbdac990 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:29:30 -06:00
Dark-Alex-17 c9a2a978fc PAN-52 Fixed issue with the Theorems API 2019-03-21 11:20:52 -06:00
Dark-Alex-17 d0cde837e9 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:09:01 -06:00
Dark-Alex-17 07cdef3d44 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:05:32 -06:00
Dark-Alex-17 ab360abcf8 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:02:46 -06:00
Dark-Alex-17 4622c49cee PAN-52 Fixed issue with the Theorems API 2019-03-21 10:59:14 -06:00
Dark-Alex-17 f8a1d8bf89 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:55:15 -06:00
Dark-Alex-17 ba4c7502db PAN-52 Fixed issue with the Theorems API 2019-03-21 10:39:24 -06:00
Dark-Alex-17 1e15082fcc PAN-52 Fixed issue with the Theorems API 2019-03-21 10:32:57 -06:00
Dark-Alex-17 6b7cf5cd91 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:28:51 -06:00
Dark-Alex-17 413a78f729 PAN-52 Fixed issue with the Theorems API 2019-03-21 10:28:09 -06:00
Dark-Alex-17 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
Dark-Alex-17 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
Dark-Alex-17 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
Dark-Alex-17 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
Dark-Alex-17 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
Dark-Alex-17 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
Dark-Alex-17 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