 王怡栋
|
ff22527151
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51306,#51304
See merge request easycorp/zentaopms!2395
|
2022-03-22 01:17:19 +00:00 |
|
|
Zongjun Lan
|
1e8b5800be
|
* fix task #51306,#51304
|
2022-03-22 09:16:16 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
liyuchun
|
2c276b4322
|
Merge branch 'devops24'
|
2022-03-22 08:44:37 +08:00 |
|
|
liyuchun
|
8b2d19b30c
|
* Fix bug #20580.
|
2022-03-21 16:47:57 +08:00 |
|
|
Zongjun Lan
|
3d05fdb119
|
* fix task #51306,#51304
|
2022-03-21 14:50:58 +08:00 |
|
|
王怡栋
|
24442be3c5
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)
See merge request easycorp/zentaopms!2357
|
2022-03-18 01:58:27 +00:00 |
|
|
tanghucheng
|
ec5f6244dd
|
* Fix bug #20906.
|
2022-03-18 09:18:34 +08:00 |
|
|
Zongjun Lan
|
ad622ccb02
|
* fix bug #t
|
2022-03-17 15:58:35 +08:00 |
|
|
tanghucheng
|
18cd2a98aa
|
* Adjust for vision name.
|
2022-03-17 10:24:41 +08:00 |
|
|
zhouxin
|
bfa1f3940d
|
Fix bug #19818.
|
2022-03-14 08:40:16 +00:00 |
|
|
tianshujie
|
920f64f572
|
* Modify the api error report.
|
2022-03-14 15:57:02 +08:00 |
|
|
xieqiyu
|
e8a7995351
|
* Fix bug#16424,#20555.
|
2022-03-10 10:32:41 +08:00 |
|
|
liumengyi
|
dd7d8902b8
|
* Finish task #50321.
|
2022-03-07 13:38:02 +08:00 |
|
|
孙广明
|
3d2b198848
|
* Code for project other menu.
|
2022-03-07 13:13:13 +08:00 |
|
|
王怡栋
|
da92204f31
|
* code for lite version.
|
2022-03-07 09:59:56 +08:00 |
|
|
tianshujie
|
4f17795ffd
|
* Fix bug #20266.
|
2022-03-02 15:15:37 +08:00 |
|
|
tianshujie
|
0bb3371484
|
* Fix bug #20245.
|
2022-03-02 14:48:50 +08:00 |
|
|
王怡栋
|
83ce0b8052
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #20238.
See merge request easycorp/zentaopms!2041
|
2022-03-02 03:19:32 +00:00 |
|
|
孙广明
|
b33cb32e4b
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix priv and classic mode.
See merge request easycorp/zentaopms!2031
|
2022-03-02 03:05:06 +00:00 |
|
|
孙广明
|
c3c1351400
|
* Fix bug #20238.
|
2022-03-02 10:53:30 +08:00 |
|
|
王怡栋
|
f71f500755
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-02 10:34:40 +08:00 |
|
|
王怡栋
|
76eea1f5d9
|
* adjust for global create.
|
2022-03-02 10:06:19 +08:00 |
|
|
tanghucheng
|
87aa943546
|
* Fix bug for classic.
|
2022-03-02 09:04:20 +08:00 |
|
|
tianshujie
|
cfb4b274a4
|
* Fix bug #20170.
|
2022-03-01 20:06:44 +08:00 |
|
|
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 |
|