Commit Graph

275 Commits

Author SHA1 Message Date
-
e546d9c228 Merge branch 'PAN-70' of https://github.com/atusa17/ptp into PAN-70 2019-05-05 16:27:35 -06:00
-
6547ddce45 commit changes 2019-05-05 16:26:51 -06:00
-
cb41c91189 changed background to 1 light blue solid color 2019-05-05 16:19:40 -06:00
tramanh305
ec0572fb76 Merge branch 'master' into PAN-70 2019-05-01 22:21:44 -06:00
-
681a484e27 fixed conflict 2019-05-01 22:19:47 -06:00
Brittany
766ba2753a Merge pull request #32 from atusa17/PAN-53
Pan 53
2019-05-01 21:55:55 -06:00
-
15449a84f8 fixed Travis build failed 2019-05-01 19:53:11 -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
-
974dc713fa commit again 2019-04-30 14:47:00 -06:00
tramanh305
e239bda6d0 Merge branch 'master' into PAN-70 2019-04-30 14:39:59 -06:00
dantanxiaotian
d34ba70307 Merge pull request #30 from atusa17/PAN-64
Pan 64
2019-04-29 23:11:24 -06:00
-
82b186ce5f Merge branch 'master' of https://github.com/atusa17/ptp into PAN-16 2019-04-19 22:19:42 -06:00
-
d0add0de67 updated 2019-04-19 22:18:44 -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
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
-
9605565289 fix conflict 2019-04-07 23:25:06 -06:00
-
56aa561d68 fix commit 2019-04-07 23:06:52 -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
9dd7fb66f5 PAN-46 Added validation to the DefinitionController 2019-04-07 20:35:57 -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
dantanxiaotian
adbcd786f0 PAN-15 fix the request changes 2019-04-02 16:38:54 -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