 zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +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
|
39516e5d70
|
* fix bug #19657.
|
2022-02-16 17:07:20 +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 |
|
|
孙广明
|
7f50a2cbd9
|
* Fix code error.
|
2022-02-16 11:26:40 +08:00 |
|
|
tanghucheng
|
0cbd84fdf2
|
* code for task#48889.
|
2022-02-16 11:21:07 +08:00 |
|
|
tanghucheng
|
220c0a09c3
|
* code for task#48884.
|
2022-02-16 10:38:54 +08:00 |
|
|
tanghucheng
|
e837186eba
|
* code for task #49081.
|
2022-02-16 10:27:36 +08:00 |
|
|
tanghucheng
|
1db5a70ec9
|
* code for task#49015.
|
2022-02-16 10:16:58 +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 |
|
|
tanghucheng
|
0f8a2e8172
|
* fix bug .
|
2022-02-16 08:53:30 +08:00 |
|
|
孙广明
|
3332272ff9
|
Merge branch 'sprint/184_hufangzhou_19558' into 'master'
* Fix bug #19558.
See merge request easycorp/zentaopms!1815
|
2022-02-16 00:34:32 +00:00 |
|
|
tanghucheng
|
879d3c2f17
|
* fix bug.
|
2022-02-16 08:32:47 +08:00 |
|
|
tanghucheng
|
cfb17ef6e3
|
* fix bug.
|
2022-02-16 07:55:51 +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 |
|
|
hufangzhou
|
f0ba4e7987
|
* Fix bug #19558.
|
2022-02-15 17:12:01 +08:00 |
|
|
王怡栋
|
4987c816df
|
Merge branch 'sgm_jira' into 'master'
* Fix var name.
See merge request easycorp/zentaopms!1814
|
2022-02-15 09:10:49 +00:00 |
|
|
孙广明
|
13614b0772
|
* Fix var name.
|
2022-02-15 17:06:11 +08:00 |
|
|
李玉春
|
1f00067aa5
|
Merge branch 'devops21_zhangzilong_19312' into 'sprint/185_fixbug'
* Fix bug #19312.
See merge request easycorp/zentaopms!1813
|
2022-02-15 08:37:55 +00:00 |
|
|
zhangzilong
|
66cf431d7d
|
* Fix bug #19312.
|
2022-02-15 16:35:25 +08:00 |
|
|
tanghucheng
|
8f9e6c88de
|
* fix bug.
|
2022-02-15 15:56:34 +08:00 |
|
|
tanghucheng
|
3aa7be4881
|
* fix bug.
|
2022-02-15 15:52:57 +08:00 |
|
|
李玉春
|
0c55a20565
|
Merge branch 'devops_cyy_49125' into 'master'
* Modify page style.
See merge request easycorp/zentaopms!1812
|
2022-02-15 07:31:21 +00:00 |
|
|
caoyanyi
|
5c9b06bdfb
|
* Modify page style.
|
2022-02-15 15:27:16 +08:00 |
|
|
孙广明
|
57b2229ea3
|
Merge branch 'sprint/184_tianshujie_file' into 'master'
* Modify the path to get the file.
See merge request easycorp/zentaopms!1811
|
2022-02-15 07:19:01 +00:00 |
|
|
tianshujie
|
c44dfa1788
|
* Modify the path to get the file.
|
2022-02-15 15:16:14 +08:00 |
|
|
孙广明
|
8dc7ece5b4
|
Merge branch '184/mayue_modify_trash' into 'master'
* Fix bug #19569.
See merge request easycorp/zentaopms!1810
|
2022-02-15 07:12:11 +00:00 |
|
|
mayue
|
3037621f77
|
* Fix bug #19569.
|
2022-02-15 15:07:54 +08:00 |
|
|
zhangzilong
|
b64dc4da7b
|
* Fix bug #19312.
|
2022-02-15 15:04:21 +08:00 |
|
|
tanghucheng
|
d646d7554e
|
* fix bug.
|
2022-02-15 15:03:45 +08:00 |
|
|
王怡栋
|
96c4fd082e
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-02-15 14:22:58 +08:00 |
|
|
王怡栋
|
eb5bad5832
|
* code for task #48988.
|
2022-02-15 14:21:19 +08:00 |
|
|
liyuchun
|
d8b8d9252e
|
Merge branch 'sunhuawei_fixbug_19247'
|
2022-02-15 13:42:08 +08:00 |
|
|
李玉春
|
459f6a2076
|
Merge branch 'master' into 'sunhuawei_fixbug_19247'
# Conflicts:
# module/execution/css/story.css
|
2022-02-15 05:41:51 +00:00 |
|
|
李玉春
|
4baa0d2f7c
|
Merge branch 'devops21_zhangzilong_19249' into 'master'
* Code for bug #19249.
See merge request easycorp/zentaopms!1809
|
2022-02-15 05:37:45 +00:00 |
|
|
zhangzilong
|
2d9606bd71
|
* Code for bug #19249.
|
2022-02-15 13:35:33 +08:00 |
|
|
孙华伟
|
aaf936b061
|
Fix bug #19247 #19435 #19239.
|
2022-02-15 13:29:03 +08:00 |
|
|
孙广明
|
9e171958bf
|
Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.
See merge request easycorp/zentaopms!1800
|
2022-02-15 05:27:00 +00:00 |
|
|
李玉春
|
d3f7997c56
|
Merge branch 'devops21_zhangzilong_19249' into 'master'
* Fix bug #19249.
See merge request easycorp/zentaopms!1802
|
2022-02-15 05:26:51 +00:00 |
|