Commit Graph

  • 18b4cdbd28 Update README.md master Alex Tusa 2023-02-17 13:25:14 -07:00
  • 1e3cfd3027 Merge pull request #31 from atusa17/PAN-70 tramanh305 2019-05-05 22:33:44 -06:00
  • ba707f2ce9 Merge branch 'master' into PAN-70 tramanh305 2019-05-05 17:31:22 -06:00
  • 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
  • 1b88c00bbf Merge pull request #29 from atusa17/PAN-54 dantanxiaotian 2019-05-02 13:16:13 -06:00
  • 8c4bb72148 PAN-54 For some reason it thinks I deleted these files??? BrittanyBi 2019-05-02 12:11:03 -06:00
  • 293805a8d7 Merge remote-tracking branch 'origin/PAN-54' into PAN-54 BrittanyBi 2019-05-02 12:05:21 -06:00
  • 1380c55f20 PAN-54 Last corrections BrittanyBi 2019-05-02 11:57:52 -06:00
  • 294d2a9dfd Deleted unrelated file Brittany 2019-05-02 11:07:19 -06:00
  • 1c69c8998c PAN-54 IT WORKS BrittanyBi 2019-05-01 22:32:09 -06:00
  • ec0572fb76 Merge branch 'master' into PAN-70 tramanh305 2019-05-01 22:21:44 -06:00
  • 681a484e27 fixed conflict - 2019-05-01 22:19:47 -06:00
  • 8cc31b5c21 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54 BrittanyBi 2019-05-01 22:03:15 -06:00
  • 08bda7099a PAN-54 Runs successfully but closes before the webpage can be loaded. BrittanyBi 2019-05-01 21:58:46 -06:00
  • 766ba2753a Merge pull request #32 from atusa17/PAN-53 Brittany 2019-05-01 21:55:55 -06:00
  • 15449a84f8 fixed Travis build failed - 2019-05-01 19:53:11 -06:00
  • 96a9e584af Merge branch 'master' of https://github.com/atusa17/ptp into PAN-53 dantanxiaotian 2019-05-01 14:56:40 -06:00
  • 7465568c97 Add loginpage controller, login jsp and logincontroller unit test. dantanxiaotian 2019-05-01 14:55:38 -06:00
  • 974dc713fa commit again - 2019-04-30 14:47:00 -06:00
  • e239bda6d0 Merge branch 'master' into PAN-70 tramanh305 2019-04-30 14:39:59 -06:00
  • d34ba70307 Merge pull request #30 from atusa17/PAN-64 dantanxiaotian 2019-04-29 23:11:24 -06:00
  • 8f809ff422 PAN-54 Clean slate that runs BrittanyBi 2019-04-29 12:46:33 -06:00
  • 071d195d2a Merge remote-tracking branch 'origin/PAN-54' into PAN-54 BrittanyBi 2019-04-24 16:39:14 -06:00
  • e72760c528 PAN-54 Working version includes no beans and no connection to the database. BrittanyBi 2019-04-24 16:38:29 -06:00
  • 09d76d93c1 Deleted PasswordMatchChecker Brittany 2019-04-24 16:10:43 -06:00
  • 52cc67ebfb Deleted ConfirmPasswordValidator Brittany 2019-04-24 16:10:12 -06:00
  • 3ee3d1bb06 PAN-64 Errors BrittanyBi 2019-04-22 12:42:28 -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
  • 27b28c1f36 Merge branch 'master' into PAN-54 Brittany 2019-04-17 19:30:28 -06:00
  • 6ab0470fca PAN-64 Fixed bug in tests that was failing the 1st Travis build. BrittanyBi 2019-04-15 20:49:56 -06:00
  • 41a78babd9 Merge branches 'PAN-64' and 'master' of https://github.com/atusa17/ptp into PAN-64 BrittanyBi 2019-04-14 21:10:49 -06:00
  • ecd6584422 PAN-64 Refactored ParserService. BrittanyBi 2019-04-14 20:29:11 -06:00
  • 5de86dc498 PAN-64 Completed and refactored unit tests for ParserService. BrittanyBi 2019-04-14 20:28:11 -06:00
  • dd92307cf8 Merge pull request #28 from atusa17/PAN-46 v0.4 Alex Tusa 2019-04-11 21:51:52 -06:00
  • 1e7e46fc66 PAN-46 fixed breaking integration tests atusa17 2019-04-11 21:36:21 -06:00
  • 53ba34db1e Merge remote-tracking branch 'origin/PAN-46' into PAN-46 atusa17 2019-04-11 20:57:46 -06:00
  • 7305f444f8 PAN-46 Merged with Master atusa17 2019-04-11 20:57:20 -06:00
  • 34c74da321 Merge branch 'master' into PAN-46 dantanxiaotian 2019-04-11 20:31:14 -06:00
  • dd6e98130d Merge pull request #27 from atusa17/PAN-11 Alex Tusa 2019-04-11 15:18:17 -06:00
  • cf49f9e980 PAN-54 Test. BrittanyBi 2019-04-10 20:17:20 -06:00
  • f86b36aa17 PAN-54 Added call to UserService to query DB. BrittanyBi 2019-04-07 23:55:15 -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 atusa17 2019-04-07 21:56:23 -06:00
  • c5727c8d1a PAN-46 Added validation to TheoremController atusa17 2019-04-07 21:40:09 -06:00
  • 61c4b3de42 PAN-46 Added validation to ProofController atusa17 2019-04-07 21:32:43 -06:00
  • 1a2715ec04 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54 BrittanyBi 2019-04-07 20:37:36 -06:00
  • 1a12f29755 PAN-54 Left this out of previous commit somehow. BrittanyBi 2019-04-07 20:36:53 -06:00
  • 9dd7fb66f5 PAN-46 Added validation to the DefinitionController atusa17 2019-04-07 20:35:57 -06:00
  • 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. BrittanyBi 2019-04-07 20:34:52 -06:00
  • 8127cb1647 PAN-46 Added validation to the AccountController atusa17 2019-04-07 20:25:33 -06:00
  • 12f7d7f359 PAN-11 fixed all integration tests atusa17 2019-04-07 18:00:12 -06:00
  • c8600b8bb4 PAN-11 Fixed integration tests atusa17 2019-04-07 17:30:34 -06:00
  • 091215f1eb PAN-11 Fixed integration tests atusa17 2019-04-07 17:22:08 -06:00
  • 67f77d6c9e PAN-11 Fixed integration tests atusa17 2019-04-07 17:06:43 -06:00
  • c75b243df8 PAN-11 Fixed integration tests atusa17 2019-04-07 16:51:36 -06:00
  • 609f018f9f PAN-11 Fixed integration tests atusa17 2019-04-07 16:21:18 -06:00
  • 7802e25310 Merge branches 'PAN-11' and 'master' of https://github.com/atusa17/ptp into PAN-11 atusa17 2019-04-07 16:03:36 -06:00
  • 1bddb2d646 Merge pull request #24 from atusa17/PAN-15 Alex Tusa 2019-04-07 15:33:49 -06:00
  • 36036b710d PAN-15 Finished Unit Tests atusa17 2019-04-07 15:18:19 -06:00
  • 6f70785387 PAN-54 BrittanyBi 2019-04-03 20:14:54 -06:00
  • adbcd786f0 PAN-15 fix the request changes dantanxiaotian 2019-04-02 16:38:54 -06:00
  • 2a4adcbd08 Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54 BrittanyBi 2019-03-31 14:17:08 -06:00
  • b1d4ed9719 PAN-15 fix the request changes dantanxiaotian 2019-03-27 12:18:12 -06:00
  • 765d8283d9 PAN-11 wrote unit tests for deleteDefinition atusa17 2019-03-24 22:36:10 -06:00
  • 8724d6c2f8 PAN-11 created the deleteDefinition method atusa17 2019-03-24 22:27:27 -06:00
  • 5a44b5b793 PAN-11 wrote unit tests for the updateDefinition method atusa17 2019-03-24 22:12:34 -06:00
  • 6d1db048c8 PAN-11 created the updateDefinition method atusa17 2019-03-24 21:51:36 -06:00
  • 69726a46a4 PAN-11 created the updateDefinition method atusa17 2019-03-24 21:51:10 -06:00
  • ae88fd356d PAN-11 Wrote unit tests for the findById method atusa17 2019-03-24 21:41:16 -06:00
  • bc0d631e6c PAN-11 Wrote the findById method atusa17 2019-03-24 21:29:49 -06:00
  • 92bea81ae5 PAN-11 Wrote unit tests for getAllDefinitions() atusa17 2019-03-24 21:23:03 -06:00
  • 978b58fe2c PAN-11 wrote the GetAllDefinitions() method atusa17 2019-03-24 20:48:25 -06:00
  • 8a582614f9 Merge branches 'PAN-11' and 'master' of https://github.com/atusa17/ptp into PAN-11 atusa17 2019-03-24 19:20:38 -06:00
  • eedc7a3eee Merge remote-tracking branch 'origin/PAN-15' into PAN-15 atusa17 2019-03-24 17:49:16 -06:00
  • 0bc56f57e6 PAN-15 Merged with master atusa17 2019-03-24 17:49:07 -06:00
  • cc7e6e0ed2 Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15 dantanxiaotian 2019-03-24 17:45:00 -06:00
  • e2e2b24f3d Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15 atusa17 2019-03-24 17:44:27 -06:00
  • c715e98e81 Merge pull request #26 from atusa17/PAN-18 Alex Tusa 2019-03-24 17:34:50 -06:00
  • 6791f6c61f Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15 dantanxiaotian 2019-03-24 17:31:40 -06:00
  • 8f2968bc2b PAN-18 WORKING HOMEPAGE zeliu 2019-03-24 17:17:04 -06:00
  • 98f6b9e2b7 PAN-18 WORKING HOMEPAGE zeliu 2019-03-24 17:02:50 -06:00
  • 0fc825e11b PAN-54 Created user registration page. BrittanyBi 2019-03-24 15:37:39 -06:00
  • 3b4753215c PAN-18 Refactored the HomeController zeliu 2019-03-24 15:26:08 -06:00
  • 94440faa4d PAN-18 Here is the JSP file for hoempage zeliu 2019-03-24 15:21:25 -06:00
  • cf5135e5b0 Merge branch 'master' of https://github.com/atusa17/ptp zeliu 2019-03-24 15:18:22 -06:00
  • 7060f2e7e3 Merge branch 'master' of https://github.com/atusa17/ptp into PAN-15 dantanxiaotian 2019-03-24 15:00:20 -06:00
  • 89f1c55f51 PAN-15 Fixed unit tests dantanxiaotian 2019-03-24 14:54:06 -06:00
  • de5a69d619 Merge pull request #25 from atusa17/PAN-52-fix v0.3 Alex Tusa 2019-03-21 12:15:55 -06:00
  • 296cf62be6 PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 11:40:19 -06:00
  • f5dbdac990 PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 11:29:30 -06:00
  • c9a2a978fc PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 11:20:52 -06:00
  • d0cde837e9 PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 11:09:01 -06:00
  • 07cdef3d44 PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 11:05:32 -06:00
  • ab360abcf8 PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 11:02:46 -06:00
  • 4622c49cee PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 10:59:14 -06:00
  • f8a1d8bf89 PAN-52 Fixed issue with the Theorems API atusa17 2019-03-21 10:55:15 -06:00