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

285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BrittanyBi
8c4bb72148 PAN-54 For some reason it thinks I deleted these files??? 2019-05-02 12:11:03 -06:00
BrittanyBi
293805a8d7 Merge remote-tracking branch 'origin/PAN-54' into PAN-54 
# Conflicts:
#	services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java
 2019-05-02 12:05:21 -06:00
BrittanyBi
1380c55f20 PAN-54 Last corrections 2019-05-02 11:57:52 -06:00
Brittany
294d2a9dfd Deleted unrelated file 2019-05-02 11:07:19 -06:00
BrittanyBi
1c69c8998c PAN-54 IT WORKS 2019-05-01 22:32:09 -06:00
BrittanyBi
8cc31b5c21 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54 
# Conflicts:
#	src/main/java/edu/msudenver/tsp/website/Application.java
 2019-05-01 22:03:15 -06:00
BrittanyBi
08bda7099a PAN-54 Runs successfully but closes before the webpage can be loaded. 2019-05-01 21:58:46 -06:00
Brittany
766ba2753a Merge pull request #32 from atusa17/PAN-53 
Pan 53
 2019-05-01 21:55:55 -06:00
dantanxiaotian
96a9e584af Merge branch 'master' of https://github.com/atusa17/ptp into PAN-53 2019-05-01 14:56:40 -06:00
dantanxiaotian
7465568c97 Add loginpage controller, login jsp and logincontroller unit test. 2019-05-01 14:55:38 -06:00
dantanxiaotian
d34ba70307 Merge pull request #30 from atusa17/PAN-64 
Pan 64
 2019-04-29 23:11:24 -06:00
BrittanyBi
8f809ff422 PAN-54 Clean slate that runs 2019-04-29 12:46:33 -06:00
BrittanyBi
071d195d2a Merge remote-tracking branch 'origin/PAN-54' into PAN-54 2019-04-24 16:39:14 -06:00
BrittanyBi
e72760c528 PAN-54 Working version includes no beans and no connection to the database. 2019-04-24 16:38:29 -06:00
Brittany
09d76d93c1 Deleted PasswordMatchChecker 
It's no longer necessary
 2019-04-24 16:10:43 -06:00
Brittany
52cc67ebfb Deleted ConfirmPasswordValidator 
It's no longer necessary
 2019-04-24 16:10:12 -06:00
BrittanyBi
3ee3d1bb06 PAN-64 Errors 2019-04-22 12:42:28 -06:00
Brittany
27b28c1f36 Merge branch 'master' into PAN-54 2019-04-17 19:30:28 -06:00
BrittanyBi
6ab0470fca PAN-64 Fixed bug in tests that was failing the 1st Travis build. 2019-04-15 20:49:56 -06:00
BrittanyBi
41a78babd9 Merge branches 'PAN-64' and 'master' of https://github.com/atusa17/ptp into PAN-64 2019-04-14 21:10:49 -06:00
BrittanyBi
ecd6584422 PAN-64 Refactored ParserService. 2019-04-14 20:29:11 -06:00
BrittanyBi
5de86dc498 PAN-64 Completed and refactored unit tests for ParserService. 2019-04-14 20:28:11 -06:00
Alex Tusa
dd92307cf8 Merge pull request #28 from atusa17/PAN-46 
Pan 46
v0.4 		2019-04-11 21:51:52 -06:00
atusa17
1e7e46fc66 PAN-46 fixed breaking integration tests 2019-04-11 21:36:21 -06:00
atusa17
53ba34db1e Merge remote-tracking branch 'origin/PAN-46' into PAN-46 2019-04-11 20:57:46 -06:00
atusa17
7305f444f8 PAN-46 Merged with Master 2019-04-11 20:57:20 -06:00
dantanxiaotian
34c74da321 Merge branch 'master' into PAN-46 2019-04-11 20:31:14 -06:00
Alex Tusa
dd6e98130d Merge pull request #27 from atusa17/PAN-11 
Pan 11
 2019-04-11 15:18:17 -06:00
BrittanyBi
cf49f9e980 PAN-54 Test. 2019-04-10 20:17:20 -06:00
BrittanyBi
f86b36aa17 PAN-54 Added call to UserService to query DB. 2019-04-07 23:55:15 -06:00
atusa17
93774e7e11 PAN-46 Wrote unit tests for the ExceptionHandlingController 2019-04-07 21:56:23 -06:00
atusa17
c5727c8d1a PAN-46 Added validation to TheoremController 2019-04-07 21:40:09 -06:00
atusa17
61c4b3de42 PAN-46 Added validation to ProofController 2019-04-07 21:32:43 -06:00
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
atusa17
9dd7fb66f5 PAN-46 Added validation to the DefinitionController 2019-04-07 20:35:57 -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
atusa17
8127cb1647 PAN-46 Added validation to the AccountController 2019-04-07 20:25:33 -06:00
atusa17
12f7d7f359 PAN-11 fixed all integration tests 2019-04-07 18:00:12 -06:00
atusa17
c8600b8bb4 PAN-11 Fixed integration tests 2019-04-07 17:30:34 -06:00
atusa17
091215f1eb PAN-11 Fixed integration tests 2019-04-07 17:22:08 -06:00
atusa17
67f77d6c9e PAN-11 Fixed integration tests 2019-04-07 17:06:43 -06:00
atusa17
c75b243df8 PAN-11 Fixed integration tests 2019-04-07 16:51:36 -06:00
atusa17
609f018f9f PAN-11 Fixed integration tests 2019-04-07 16:21:18 -06:00
atusa17
7802e25310 Merge branches 'PAN-11' and 'master' of https://github.com/atusa17/ptp into PAN-11 
# Conflicts:
#	services/src/integrationTest/resources/test.properties
#	services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
 2019-04-07 16:03:36 -06:00
Alex Tusa
1bddb2d646 Merge pull request #24 from atusa17/PAN-15 
Pan 15
 2019-04-07 15:33:49 -06:00
atusa17
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