Alex Tusa
|
18b4cdbd28
|
Update README.md
|
2023-02-17 13:25:14 -07:00 |
|
tramanh305
|
1e3cfd3027
|
Merge pull request #31 from atusa17/PAN-70
PAN-70
|
2019-05-05 22:33:44 -06:00 |
|
tramanh305
|
ba707f2ce9
|
Merge branch 'master' into PAN-70
|
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 |
|
dantanxiaotian
|
1b88c00bbf
|
Merge pull request #29 from atusa17/PAN-54
Pan 54
|
2019-05-02 13:16:13 -06:00 |
|
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 |
|
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 |
|
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 |
|
-
|
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 |
|
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 |
|
-
|
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 |
|
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 |
|
|
|
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 |
|
-
|
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 |
|
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 |
|
