Commit Graph

264 Commits

Author SHA1 Message Date
Brittany
27b28c1f36 Merge branch 'master' into PAN-54 2019-04-17 19:30:28 -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
1e7e46fc66 PAN-46 fixed breaking integration tests 2019-04-11 21:36:21 -06:00
53ba34db1e Merge remote-tracking branch 'origin/PAN-46' into PAN-46 2019-04-11 20:57:46 -06:00
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
93774e7e11 PAN-46 Wrote unit tests for the ExceptionHandlingController 2019-04-07 21:56:23 -06:00
c5727c8d1a PAN-46 Added validation to TheoremController 2019-04-07 21:40:09 -06:00
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
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
8127cb1647 PAN-46 Added validation to the AccountController 2019-04-07 20:25:33 -06:00
12f7d7f359 PAN-11 fixed all integration tests 2019-04-07 18:00:12 -06:00
c8600b8bb4 PAN-11 Fixed integration tests 2019-04-07 17:30:34 -06:00
091215f1eb PAN-11 Fixed integration tests 2019-04-07 17:22:08 -06:00
67f77d6c9e PAN-11 Fixed integration tests 2019-04-07 17:06:43 -06:00
c75b243df8 PAN-11 Fixed integration tests 2019-04-07 16:51:36 -06:00
609f018f9f PAN-11 Fixed integration tests 2019-04-07 16:21:18 -06:00
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
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
765d8283d9 PAN-11 wrote unit tests for deleteDefinition 2019-03-24 22:36:10 -06:00
8724d6c2f8 PAN-11 created the deleteDefinition method 2019-03-24 22:27:27 -06:00
5a44b5b793 PAN-11 wrote unit tests for the updateDefinition method 2019-03-24 22:12:34 -06:00
6d1db048c8 PAN-11 created the updateDefinition method 2019-03-24 21:51:36 -06:00
69726a46a4 PAN-11 created the updateDefinition method 2019-03-24 21:51:10 -06:00
ae88fd356d PAN-11 Wrote unit tests for the findById method 2019-03-24 21:41:16 -06:00
bc0d631e6c PAN-11 Wrote the findById method 2019-03-24 21:29:49 -06:00
92bea81ae5 PAN-11 Wrote unit tests for getAllDefinitions() 2019-03-24 21:23:03 -06:00
978b58fe2c PAN-11 wrote the GetAllDefinitions() method 2019-03-24 20:48:25 -06:00
8a582614f9 Merge branches 'PAN-11' and 'master' of https://github.com/atusa17/ptp into PAN-11 2019-03-24 19:20:38 -06:00
eedc7a3eee Merge remote-tracking branch 'origin/PAN-15' into PAN-15 2019-03-24 17:49:16 -06:00
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
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