Commit Graph

882 Commits

Author SHA1 Message Date
tianshujie
ecf679aeaf * Fix the problem of calling config error in static method. 2022-02-25 09:12:19 +08:00
孙广明
32f322ec51 Merge branch 'sprint/186_tianshujie_version' into 'sprint/185'
Sprint/186 tianshujie version

See merge request easycorp/zentaopms!1960
2022-02-24 09:04:10 +00:00
tianshujie
30d3fc1303 * Modify version judgment logic. 2022-02-24 16:21:58 +08:00
tianshujie
b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhujinyong
c7708b55cc * Adjust style of vision switcher. 2022-02-24 16:02:17 +08:00
zhujinyong
43998c45bb * Fix vision switcher. 2022-02-24 13:04:25 +08:00
zhujinyong
891b914fc9 * Format code. 2022-02-23 16:39:15 +08:00
孙广明
0ee66db862 * Code for upgrade. 2022-02-23 13:44:09 +08:00
孙广明
2276e1430f * Code for upgrade. 2022-02-23 10:49:29 +08:00
孙广明
3782342638 * Fix bug. 2022-02-23 10:17:38 +08:00
孙广明
2d2270b477 * Code for upgrade. 2022-02-23 10:13:14 +08:00
zhujinyong
49af622fd8 * Move exit to return. 2022-02-22 14:25:14 +08:00
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
Wenrui LI
3e515ea4dd * make vision unswitchable for users without multiple visions. 2022-02-21 10:29:00 +08:00
孙广明
e90059443b Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
#   module/common/model.php
2022-02-18 07:25:15 +00:00
王怡栋
116938b2e6 * finish task #49417. 2022-02-18 11:01:13 +08:00
Wenrui LI
a02c9baf3d * add vision switcher and tweak menu arrows. 2022-02-17 16:20:57 +08:00
xieqiyu
70391990a0 * Finish task#49292. 2022-02-17 14:14:09 +08:00
tanghucheng
0b41fc7fc6 * Fix bug #18851. 2022-01-24 09:59:01 +08:00
tanghucheng
59f26f0470 * Finish task #47942. 2022-01-19 17:22:05 +08:00
zhujinyong
3baf9213a2 * Fix rnd vision. 2022-01-19 14:34:55 +08:00
zhujinyong
2e85ff6e08 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-19 09:08:22 +08:00
zhujinyong
8ed8e31da9 * Fix doc menu for lite. 2022-01-19 09:08:07 +08:00
王怡栋
03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
tianshujie
eee8de32a9 * Fix bug #18469. 2022-01-18 15:01:38 +08:00
zhujinyong
faff9d3dbd + Switch vision. 2022-01-18 11:50:29 +08:00
zhujinyong
b4c3ec0a9c * Refactoring for extension. 2022-01-10 22:39:54 +08:00
hufangzhou
0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
王怡栋
7001079844 * adjust for block priv. 2022-01-04 11:28:43 +08:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +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