Commit Graph

852 Commits

Author SHA1 Message Date
王怡栋
7001079844 * adjust for block priv. 2022-01-04 11:28:43 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
zhujinyong
a0797b61db * Fix bug: remove $this. 2021-12-28 08:19:59 +08:00
李玉春
c474449b54 Merge branch 'sgm_fixbug' into 'master'
* Fix project priv bug.

See merge request easycorp/zentaopms!1012
2021-12-21 09:47:11 +00:00
hufangzhou
863965e61a * Finish task #46097. 2021-12-21 15:53:27 +08:00
tianshujie
8ea2cc8e9e * Fix bug #17704,17740,17694. 2021-12-21 09:53:44 +08:00
tianshujie
5863beeb76 * Remove extra spaces. 2021-12-21 09:01:53 +08:00
tianshujie
d364b7c362 * Remove useless attributes. 2021-12-21 08:53:21 +08:00
tianshujie
c04c2506ae * Finish task #46245. 2021-12-21 08:51:03 +08:00
孙广明
f5bc141f55 * Fix project priv bug. 2021-12-20 17:08:30 +08:00
孙广明
2df43b48b8 * Fix project priv bug. 2021-12-20 11:23:33 +08:00
朱金勇
c0fd222c18 Merge branch 'sprint/178_xieqiyu_46102' into 'master'
* Code for task#46102.

See merge request easycorp/zentaopms!990
2021-12-17 07:45:23 +00:00
孙广明
6ee1345b07 * Reset project priv. 2021-12-17 10:13:49 +08:00
xieqiyu
788c1c3f42 * Code for task#46102. 2021-12-16 09:42:50 +08:00
tanghucheng
5d1da3d0f5 * Fix bug #17126. 2021-12-07 09:33:52 +08:00
孙广明
24c613bba9 * Fix bug. 2021-12-02 17:01:33 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
王怡栋
fc591306b5 * code for task #45297. 2021-12-01 09:17:20 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
王怡栋
ef2385a150 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-30 09:38:44 +08:00
王怡栋
85d498c5cb * replace lib for markdown to html. 2021-11-30 09:38:12 +08:00
songchenxuan
908f51250b * Fix bug #15737. 2021-11-29 16:17:04 +08:00
王怡栋
d41d6cf262 * adjust for api. 2021-11-26 13:28:45 +08:00
zhouxin
88938892b0 Add realBegan for program. 2021-11-18 16:49:11 +08:00
xiawenlong
c7081db530 * Finish task 29162,29163 2021-11-18 15:31:26 +08:00
zhouxin
b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
zhouxin
b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
leiyong
088a6374df * Finish task#44172,task#44273. 2021-11-11 05:26:27 +00:00
zenggang
1da7061d7a * Fix menu pri judge 2021-10-26 07:49:56 +00:00
王怡栋
775f9942d2 * fix bug #15553. 2021-10-18 16:03:42 +08:00
王怡栋
72c92b6b0d * fix error. 2021-10-18 09:06:48 +08:00
王怡栋
5e0ac98809 Merge branch 'sprint/167_wangyidong' into sprint/167 2021-10-18 08:53:30 +08:00
王怡栋
68cd0eb2f9 Merge branch '15.6' into sprint/167_wangyidong 2021-10-18 08:44:13 +08:00
王怡栋
3989c71b3f * fix for large size session. 2021-10-15 13:38:05 +08:00
朱金勇
e50c3c65d9 Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179

See merge request easycorp/zentaopms!49
2021-10-15 01:05:33 +00:00
zenggang
de37a33ed5 * Adjust code format 2021-10-14 01:56:19 +00:00
liyuchun
3ddba6aeeb * Fix bug #15479. 2021-10-13 10:17:53 +08:00
zenggang
8f0b4a575e * Adjust code style 2021-10-13 01:44:56 +00:00
zenggang
5f35a398ad * Finish task#43179 2021-10-11 07:26:18 +00:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇
ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.

See merge request easycorp/zentaopms!41
2021-10-09 01:32:30 +00:00
王怡栋
0fa52d3318 * adjust for review code. 2021-10-09 09:29:10 +08:00
王怡栋
88a5c5d207 * fix loophole. 2021-10-08 10:35:38 +08:00
zenggang
77a9b33191 * Adjust code style 2021-10-08 02:27:50 +00:00
zenggang
189bc062b3 * Fix bug#15363 2021-09-30 16:17:48 +08:00
王怡栋
ee39f52c2e * finish task #42846. 2021-09-29 11:51:17 +08:00
王怡栋
08f1d594c0 * adjust for task #42835. 2021-09-28 09:24:33 +08:00
王怡栋
f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
王怡栋
a33f9b096d * adjust for project link in classic mode. 2021-09-24 16:27:08 +08:00
hufangzhou
7723233161 * Fix bug #15233. 2021-09-17 15:12:23 +08:00