 Wenrui LI
|
6c7156fa86
|
* remove get extension error from sidebar, bug #19033.
|
2022-02-23 09:39:38 +08:00 |
|
|
liyuchun
|
2a359ed8d2
|
Merge branch 'sprint/185_zhengrunyu_49283' into sprint/185
|
2022-02-23 09:34:00 +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 |
|
|
孙广明
|
6ce7926bd8
|
Merge branch 'sprint/185_zhouxin_49692' into 'sprint/185'
Finish task #49692.
See merge request easycorp/zentaopms!1891
|
2022-02-23 01:25:22 +00:00 |
|
|
zhouxin
|
d8085ec0cd
|
Adjust code.
|
2022-02-23 01:23:43 +00:00 |
|
|
孙广明
|
054dd42a65
|
Merge branch 'sprint/185_zhangzilong_49284' into 'sprint/185'
*Fix bug 19780.
See merge request easycorp/zentaopms!1895
|
2022-02-23 01:21:39 +00:00 |
|
|
zhangzilong
|
0687aaba57
|
* Fix bug #19780.
|
2022-02-23 09:20:18 +08:00 |
|
|
zhangzilong
|
516c7b0133
|
* Fix bug #19780.
|
2022-02-23 09:18:47 +08:00 |
|
|
李玉春
|
d7a0925a22
|
Merge branch 'sprint/185_zhengrunyu_49306' into 'sprint/185'
Sprint/185 zhengrunyu 49306
See merge request easycorp/zentaopms!1897
|
2022-02-23 01:06:25 +00:00 |
|
|
zhengrunyu
|
51db3536d7
|
*Code bug.
|
2022-02-23 09:04:01 +08:00 |
|
|
zhengrunyu
|
d04ff0a6d9
|
* Finish task 49306.
|
2022-02-23 09:00:37 +08:00 |
|
|
zhangzilong
|
8d9439d0e6
|
* Fix bug #19780.
|
2022-02-23 08:57:32 +08:00 |
|
|
Wenrui LI
|
c34a9bbd67
|
* remove plan related stuff from action search of lite vision, bug #19021.
|
2022-02-23 08:43:36 +08:00 |
|
|
李玉春
|
60d970d41d
|
Merge branch 'sprint/185_fixbug' into 'sprint/185'
* Fix bug.
See merge request easycorp/zentaopms!1889
|
2022-02-22 09:09:46 +00:00 |
|
|
xieqiyu
|
4e1767b2df
|
* Fix bug.
|
2022-02-22 17:08:09 +08:00 |
|
|
王怡栋
|
9f571b2cc4
|
Merge branch 'sprint/185_lwr_filterActionSearch_bug19021' into sprint/185
|
2022-02-22 17:03:37 +08:00 |
|
|
王怡栋
|
c3d38e028a
|
Merge branch 'sprint/185' into 'sprint/185_lwr_filterActionSearch_bug19021'
# Conflicts:
# extension/lite/action/ext/lang/zh-cn/lite.php
|
2022-02-22 09:02:58 +00:00 |
|
|
王怡栋
|
a5f8058da8
|
Merge branch 'sprint/185_tanghucheng_49409' into 'sprint/185'
* Finish task #49409.
See merge request easycorp/zentaopms!1888
|
2022-02-22 09:01:58 +00:00 |
|
|
zhouxin
|
a9995c6fe0
|
Finish task #49692.
|
2022-02-22 09:00:47 +00:00 |
|
|
tanghucheng
|
6b2bc49830
|
* Finish task #49409.
|
2022-02-22 16:59:09 +08:00 |
|
|
Wenrui LI
|
61dc15d6d1
|
* remove unwanted search items from action module, bug #19021.
|
2022-02-22 16:41:29 +08:00 |
|
|
李玉春
|
2f548dce80
|
Merge branch 'sprint/185_zhengrunyu_49694' into 'sprint/185'
*Finish task 49694 49695.
See merge request easycorp/zentaopms!1886
|
2022-02-22 08:35:39 +00:00 |
|
|
孙广明
|
47c48e68a2
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong
See merge request easycorp/zentaopms!1878
|
2022-02-22 07:53:22 +00:00 |
|
|
zhengrunyu
|
c9685d4441
|
*Finish task 49694 49695.
|
2022-02-22 15:52:32 +08:00 |
|
|
王怡栋
|
1a7ae952d5
|
Merge branch 'sprint/185_lwr_filterGroups_bug18849' into 'sprint/185'
* show only groups of current vision on user create, bug #18849.
See merge request easycorp/zentaopms!1882
|
2022-02-22 07:10:06 +00:00 |
|
|
王怡栋
|
09aae17895
|
Merge branch 'upgrade' into 'sprint/185'
Upgrade
See merge request easycorp/zentaopms!1880
|
2022-02-22 07:09:14 +00:00 |
|
|
Wenrui LI
|
2fdb1de490
|
* show only groups of current vision on user create, bug #18849.
|
2022-02-22 14:52:36 +08:00 |
|
|
Wenrui LI
|
7afe8319fb
|
* fix workflow icon not present.
|
2022-02-22 14:43:41 +08:00 |
|
|
孙广明
|
10679fa684
|
* Add upgrade.
|
2022-02-22 14:32:47 +08:00 |
|
|
tianshujie
|
7b83097539
|
* Modify query file logic.
|
2022-02-22 14:26:30 +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 |
|
|
王怡栋
|
23a5acab55
|
* adjust for edition config.
|
2022-02-22 13:35:36 +08:00 |
|
|
王怡栋
|
2c89a401d5
|
* code for task #49352 and fix error.
|
2022-02-22 13:29:07 +08:00 |
|
|
孙广明
|
08e9b10368
|
Merge branch 'sprint/185_fixbug' into 'sprint/185'
* Fix bug.
See merge request easycorp/zentaopms!1877
|
2022-02-22 03:13:43 +00:00 |
|
|
xieqiyu
|
da00225feb
|
* Fix bug.
|
2022-02-22 11:11:43 +08:00 |
|
|
孙广明
|
845016278d
|
Merge branch 'sprint/185_fixbug' into 'sprint/185'
* Fix bug.
See merge request easycorp/zentaopms!1876
|
2022-02-22 03:10:28 +00: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 |
|
|
王怡栋
|
0948be7aaa
|
Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong
|
2022-02-22 10:55:23 +08:00 |
|
|
王怡栋
|
cc184728c1
|
* code for task #49348.
|
2022-02-22 10:54:43 +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 |
|
|
tanghucheng
|
4ffb8c996c
|
* Finish task #49402.
|
2022-02-22 09:46:00 +08: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 |
|