 Wenrui LI
|
3e515ea4dd
|
* make vision unswitchable for users without multiple visions.
|
2022-02-21 10:29:00 +08:00 |
|
|
李玉春
|
c280365ce8
|
Merge branch 'sprint/185_zhengrunyu_49303' into 'sprint/185'
Sprint/185 zhengrunyu 49303
See merge request easycorp/zentaopms!1857
|
2022-02-21 01:27:02 +00:00 |
|
|
zhengrunyu
|
1a8f317229
|
*Finish task 49303
|
2022-02-21 09:07:30 +08:00 |
|
|
孙广明
|
176a8fa648
|
Merge branch 'sprint/185_xieqiyu_49308' into 'sprint/185'
* Finish task#49308.
See merge request easycorp/zentaopms!1849
|
2022-02-18 07:40:04 +00:00 |
|
|
孙广明
|
e90059443b
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# module/common/model.php
|
2022-02-18 07:25:15 +00:00 |
|
|
孙广明
|
ffbbfe417f
|
Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
# db/update16.4.sql
|
2022-02-18 06:23:22 +00:00 |
|
|
xieqiyu
|
4d3e06bce2
|
* Finish task#49308.
|
2022-02-18 14:04:20 +08:00 |
|
|
zhangzilong
|
fede832aa2
|
* Finish task #49284.
|
2022-02-18 14:00:53 +08:00 |
|
|
zhangzilong
|
504e7738b2
|
* Finish task #49284.
|
2022-02-18 13:56:17 +08:00 |
|
|
zhangzilong
|
0c4035711f
|
* Finish task #49284.
|
2022-02-18 13:15:48 +08:00 |
|
|
王怡栋
|
60937d3a52
|
Merge branch 'sprint/185_lwr_visionSwitch' into 'sprint/185'
Add vision switcher and tweak menu arrows.
See merge request easycorp/zentaopms!1842
|
2022-02-18 03:13:11 +00:00 |
|
|
王怡栋
|
116938b2e6
|
* finish task #49417.
|
2022-02-18 11:01:13 +08:00 |
|
|
孙广明
|
58212c71b7
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* adjust for set vision.
See merge request easycorp/zentaopms!1844
|
2022-02-18 00:51:08 +00:00 |
|
|
王怡栋
|
3082abe478
|
* adjust for set vision.
|
2022-02-18 08:36:54 +08:00 |
|
|
zhangzilong
|
4e84e5cbd7
|
* Finish task #49284.
|
2022-02-17 17:35:11 +08:00 |
|
|
Wenrui LI
|
a02c9baf3d
|
* add vision switcher and tweak menu arrows.
|
2022-02-17 16:20:57 +08:00 |
|
|
王怡栋
|
218546e6c4
|
Merge branch 'sprint/tanghucheng_fixbug' into 'sprint/185'
* finish task #49421,49338.
See merge request easycorp/zentaopms!1838
|
2022-02-17 08:20:10 +00:00 |
|
|
孙广明
|
3d519133fa
|
Merge branch 'sprint/185_xieqiyu_49292' into 'sprint/185'
* Finish task#49292.
See merge request easycorp/zentaopms!1835
|
2022-02-17 07:32:16 +00:00 |
|
|
孙广明
|
b52c8bbafd
|
Merge branch 'sprint/185_zxd_49307' into 'sprint/185'
Sprint/185 zxd 49307
See merge request easycorp/zentaopms!1841
|
2022-02-17 07:31:29 +00:00 |
|
|
李玉春
|
62097d0731
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49286'
# Conflicts:
# db/update16.4.sql
|
2022-02-17 07:23:41 +00:00 |
|
|
zhouxudong
|
54c7b99bc6
|
* Add space.
|
2022-02-17 15:21:42 +08:00 |
|
|
zhouxudong
|
aae63736d3
|
*Finish task #49307.
|
2022-02-17 15:05:22 +08:00 |
|
|
zhengrunyu
|
3dbbc4b3f0
|
*Finish task 49286.
|
2022-02-17 15:02:18 +08:00 |
|
|
tanghucheng
|
966f00c07a
|
* finish task #49421,49338.
|
2022-02-17 14:58:59 +08:00 |
|
|
孙广明
|
36eec1ed28
|
Merge branch 'sprint/185_mayue_Bug11007' into 'sprint/185'
* Fix bug #11007.
See merge request easycorp/zentaopms!1836
|
2022-02-17 06:37:25 +00:00 |
|
|
xieqiyu
|
70391990a0
|
* Finish task#49292.
|
2022-02-17 14:14:09 +08:00 |
|
|
zhengrunyu
|
ae58f6c7c8
|
* Finish task 49303.
|
2022-02-17 11:27:41 +08:00 |
|
|
王怡栋
|
3ebcfb1ddc
|
* fix bug #19693.
|
2022-02-17 11:06:28 +08:00 |
|
|
zhengrunyu
|
5083af2323
|
*Finish task 49286.
|
2022-02-17 10:47:56 +08:00 |
|
|
孙广明
|
bd31f6f4ff
|
Merge branch 'sprint/185_liumengyi_fixbug' into 'sprint/185'
* Fix bug for kanban priv.
See merge request easycorp/zentaopms!1829
|
2022-02-17 02:37:17 +00:00 |
|
|
liumengyi
|
6dc1c744a1
|
* Fix bug for kanban priv.
|
2022-02-17 10:34:17 +08:00 |
|
|
zhouxudong
|
5473987cb0
|
*Finish task #49307.
|
2022-02-17 10:24:37 +08:00 |
|
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
|
mayue
|
e80390a8f2
|
* Fix bug #11007.
|
2022-02-17 09:35:33 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
liyuchun
|
a7bcb16751
|
Merge branch '185_fixbug' into 185
|
2022-02-17 08:24:32 +08:00 |
|
|
tanghucheng
|
8104870b83
|
* code for task #49080.
|
2022-02-16 15:11:44 +08:00 |
|
|
孙广明
|
e9a29f39fc
|
* Fix details.
|
2022-02-16 13:05:56 +08:00 |
|
|
tanghucheng
|
e837186eba
|
* code for task #49081.
|
2022-02-16 10:27:36 +08:00 |
|
|
孙广明
|
b963b38547
|
* Fix details.
|
2022-02-16 10:09:34 +08:00 |
|
|
孙广明
|
127da2bfc6
|
* Add finished notice.
|
2022-02-16 10:04:55 +08:00 |
|
|
孙广明
|
7cfb1c2e9c
|
Merge branch 'tianshujie_19306' into 'master'
* Fix bug #19306.
See merge request easycorp/zentaopms!1819
|
2022-02-16 01:58:28 +00:00 |
|
|
tianshujie
|
e22bd59961
|
* Fix bug #19306.
|
2022-02-16 09:57:17 +08:00 |
|
|
朱金勇
|
c9b8ad34a6
|
Merge branch 'sprint/scx_editorlang' into 'master'
*Translate lang.
See merge request easycorp/zentaopms!1818
|
2022-02-16 01:42:30 +00:00 |
|
|
孙广明
|
b44ac97ace
|
Merge branch 'sprint/184_hufangzhou_19649' into 'master'
* Fix bug #19649.
See merge request easycorp/zentaopms!1817
|
2022-02-16 01:41:32 +00:00 |
|
|
songchenxuan
|
b7eacca5eb
|
*Translate lang.
|
2022-02-16 09:37:37 +08:00 |
|
|
孙广明
|
abb38d4709
|
* Fix details.
|
2022-02-16 09:36:21 +08:00 |
|
|
hufangzhou
|
f9cc2702f9
|
* Fix bug #19649.
|
2022-02-16 09:24:11 +08:00 |
|
|
hufangzhou
|
92b25b7d4e
|
* Adjust the directory path to full path.
|
2022-02-15 17:26:04 +08:00 |
|
|
hufangzhou
|
a67e9ce403
|
* Adjust the file path to full path.
|
2022-02-15 17:21:27 +08:00 |
|