Commit Graph

26 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
-
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
-
15449a84f8 fixed Travis build failed 2019-05-01 19:53:11 -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
-
9605565289 fix conflict 2019-04-07 23:25:06 -06:00
-
56aa561d68 fix commit 2019-04-07 23:06:52 -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
zeliu
3b4753215c PAN-18 Refactored the HomeController 2019-03-24 15:26:08 -06:00
zeliu
94440faa4d PAN-18 Here is the JSP file for hoempage 2019-03-24 15:21:25 -06:00
zeliu
cf5135e5b0 Merge branch 'master' of https://github.com/atusa17/ptp 2019-03-24 15:18:22 -06:00
296cf62be6 PAN-52 Fixed issue with the Theorems API 2019-03-21 11:40:19 -06:00
8c79d9975e Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16
# Conflicts:
#	services/build.gradle
2019-03-20 22:32:25 -06:00
749a20c0fd Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16
# Conflicts:
#	services/build.gradle
2019-03-20 22:00:11 -06:00
-
5479130178 fixed again, thanks Alex for your detailed reviews I have learned alot :) 2019-03-19 17:44:53 -06:00
-
f0cb7633c6 updated with passed tests 2019-03-19 00:11:38 -06:00
-
9f5d9e24f5 made few changes also adding test method 2019-03-18 13:52:01 -06:00
-
0afe995950 Reverted build file changes 2019-03-15 01:44:51 -06:00
-
c45c0a6108 add to PAN-16 2019-03-14 17:04:10 -06:00
-
139dc943c3 PAN-16 finished 2019-03-14 16:58:17 -06:00
zeliu
86c5e8123e Here is the JSP file for hoempage 2019-03-07 10:22:08 -07:00
Alex Tusa
27e56039f4 Create README.md 2019-03-04 18:15:22 -07:00
96c90a3c49 change git root 2019-03-03 16:13:24 -07:00