 Wenrui LI
|
2fdb1de490
|
* show only groups of current vision on user create, bug #18849.
|
2022-02-22 14:52:36 +08:00 |
|
|
zhujinyong
|
49af622fd8
|
* Move exit to return.
|
2022-02-22 14:25:14 +08:00 |
|
|
zhujinyong
|
2b7820d317
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-22 14:15:18 +08:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
xieqiyu
|
da00225feb
|
* Fix bug.
|
2022-02-22 11:11:43 +08:00 |
|
|
xieqiyu
|
8cac8975bb
|
* Adjust code.
|
2022-02-22 11:09:16 +08:00 |
|
|
xieqiyu
|
c053468aa6
|
* Fix bug.
|
2022-02-22 11:05:45 +08:00 |
|
|
孙广明
|
fdd36dce95
|
Merge branch 'sprint/185_zhouxin_49302' into 'sprint/185'
Sprint/185 zhouxin 49302
See merge request easycorp/zentaopms!1874
|
2022-02-22 01:58:09 +00:00 |
|
|
zhouxin
|
63be4b0948
|
Adjust code.
|
2022-02-22 01:56:44 +00:00 |
|
|
王怡栋
|
6486986b5a
|
Merge branch 'sprint/185_tanghucheng_49418' into 'sprint/185'
* Finish task #49415,49418,49425,49418,49402.
See merge request easycorp/zentaopms!1873
|
2022-02-22 01:49:27 +00:00 |
|
|
zhujinyong
|
1f8e1b0021
|
* Fix return print() -> return.
|
2022-02-22 09:35:25 +08:00 |
|
|
zhujinyong
|
5a334ccb86
|
* Fix bug: return error.
|
2022-02-22 09:26:31 +08:00 |
|
|
tanghucheng
|
f650bc44c7
|
* Finish task #49415,49418,49425.
|
2022-02-22 09:19:27 +08:00 |
|
|
zhouxin
|
ae8d371efb
|
Fix bug. .
|
2022-02-22 01:12:41 +00:00 |
|
|
zhujinyong
|
002e215a3d
|
* Move die to return.
|
2022-02-22 09:02:00 +08:00 |
|
|
zhujinyong
|
b17c3c8206
|
* Move die to return print.
|
2022-02-22 08:42:32 +08:00 |
|
|
tanghucheng
|
9b6903f6eb
|
* Finish task#49418.
|
2022-02-21 17:23:09 +08:00 |
|
|
王怡栋
|
1955a0ec04
|
Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* code for task #49697.
See merge request easycorp/zentaopms!1869
|
2022-02-21 09:19:35 +00:00 |
|
|
tanghucheng
|
422811bcbd
|
* code for task #49697.
|
2022-02-21 17:01:42 +08:00 |
|
|
zhouxin
|
751fec28e8
|
Finish task #49302.
|
2022-02-21 08:53:25 +00:00 |
|
|
zhouxudong
|
b525288fb2
|
* Fix bug #19809.
|
2022-02-21 15:13:27 +08:00 |
|
|
王怡栋
|
d80b711da0
|
Merge branch 'sprint/185_lwr_fixbug_19195' into 'sprint/185'
* push to array with braces not plus sign, bug #19195.
See merge request easycorp/zentaopms!1862
|
2022-02-21 05:21:51 +00:00 |
|
|
王怡栋
|
0cb4581eec
|
Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Finish task #49697.
See merge request easycorp/zentaopms!1856
|
2022-02-21 05:21:01 +00:00 |
|
|
tanghucheng
|
510e7397d4
|
* Finish task #49697.
|
2022-02-21 13:12:51 +08:00 |
|
|
王怡栋
|
7b92be407d
|
Merge branch 'sprint/185_lwr_visionSwitchEnhance' into 'sprint/185'
* make vision unswitchable for users without multiple visions.
See merge request easycorp/zentaopms!1861
|
2022-02-21 03:26:44 +00:00 |
|
|
Wenrui LI
|
59892b5d77
|
* push to array with braces not plus sign, bug #19195.
|
2022-02-21 11:26:22 +08:00 |
|
|
Wenrui LI
|
3e515ea4dd
|
* make vision unswitchable for users without multiple visions.
|
2022-02-21 10:29:00 +08:00 |
|
|
zhouxudong
|
ae2ad29753
|
* Finish task #49296.
|
2022-02-21 09:56:42 +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 |
|