孙广明
|
87458bc808
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20702,20698,20642.
See merge request easycorp/zentaopms!2223
|
2022-03-14 02:13:14 +00:00 |
|
tanghucheng
|
a25fd822bd
|
* Fix bug #20702,20698,20642.
|
2022-03-14 09:55:44 +08:00 |
|
hufangzhou
|
8187472563
|
* Fix bug #20665.
|
2022-03-14 09:06:42 +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 |
|
hufangzhou
|
59181566ff
|
* Move the gantt extension file to common/view.
|
2022-03-02 13:22:53 +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 |
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +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 |
|
zhengrunyu
|
13882f5a5b
|
* Fix bug.
|
2022-02-24 13:59:37 +08:00 |
|
孙广明
|
b59b9cfba4
|
Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.
See merge request easycorp/zentaopms!1947
|
2022-02-24 05:28:15 +00:00 |
|
zhujinyong
|
ff8694661d
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-24 13:04:49 +08:00 |
|
zhujinyong
|
43998c45bb
|
* Fix vision switcher.
|
2022-02-24 13:04:25 +08:00 |
|
zhangzilong
|
7abab086a9
|
* Finish task #49280.
|
2022-02-24 11:31:37 +08:00 |
|
孙广明
|
e6338d280e
|
Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'
* Finish task #49280.
See merge request easycorp/zentaopms!1936
|
2022-02-24 02:46:43 +00:00 |
|
zhangzilong
|
861d6d3e47
|
* Finish task #49280.
|
2022-02-24 10:44:13 +08:00 |
|
zhangzilong
|
a68221ccaf
|
* Finish task #49280.
|
2022-02-24 10:41:54 +08:00 |
|
zhangzilong
|
a9e3772439
|
* Finish task #49280.
|
2022-02-24 09:30:52 +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 |
|
王怡栋
|
f70f6c9f6b
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Code for upgrade.
See merge request easycorp/zentaopms!1899
|
2022-02-23 02:18:07 +00:00 |
|
孙广明
|
3782342638
|
* Fix bug.
|
2022-02-23 10:17:38 +08:00 |
|
孙广明
|
2d2270b477
|
* Code for upgrade.
|
2022-02-23 10:13:14 +08:00 |
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00: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 |
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +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 |
|
孙广明
|
be4313a9df
|
* Fix details.
|
2022-02-17 13:27:37 +08:00 |
|