 王怡栋
|
96ad1bfff8
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25016
See merge request easycorp/zentaopms!4440
|
2022-07-08 07:22:37 +00:00 |
|
|
孙广明
|
0264b6c3f9
|
Merge branch 'sprint/scx_translate' into 'master'
Sprint/scx translate
See merge request easycorp/zentaopms!4429
|
2022-07-08 07:11:20 +00:00 |
|
|
lanzongjun
|
5c95d9fd18
|
* fix bug #25016
|
2022-07-08 14:52:46 +08:00 |
|
|
wangyidong
|
9c61acba52
|
* fix bug for misc-captcha.
|
2022-07-08 14:46:25 +08:00 |
|
|
zhouxudong
|
f7b8ef064f
|
* Fix bug #24844.
|
2022-07-08 05:51:40 +00:00 |
|
|
tianshujie
|
9df3094887
|
* Troubleshooting Play Course 302 Network Issues.
|
2022-07-08 11:32:17 +08:00 |
|
|
宋辰轩
|
5c103233e3
|
* Edit design module lang.
|
2022-07-08 10:54:34 +08:00 |
|
|
wangyidong
|
38cc476bb9
|
* fix bug #22749.
|
2022-07-08 09:47:42 +08:00 |
|
|
liumengyi
|
d24c7185f5
|
* Fix bug of task #59480, #59481.
|
2022-07-07 15:35:19 +08:00 |
|
|
孙广明
|
c540e7002d
|
Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555
See merge request easycorp/zentaopms!4392
|
2022-07-07 02:51:51 +00:00 |
|
|
tianshujie
|
5ccd62ea84
|
* Merge insensitive refresh custom forms into one method.
|
2022-07-07 10:44:29 +08:00 |
|
|
孙广明
|
b5a365422f
|
* Code for pri error.
|
2022-07-07 09:57:20 +08:00 |
|
|
caoyanyi
|
99fa5aaae3
|
* Add gitea module.
|
2022-07-07 08:29:46 +08:00 |
|
|
王怡栋
|
f25fcc1eb2
|
Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
# module/testcase/css/create.css
|
2022-07-06 06:47:25 +00:00 |
|
|
王怡栋
|
29bed0101b
|
Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525
See merge request easycorp/zentaopms!4365
|
2022-07-06 02:17:24 +00:00 |
|
|
zhouxudong
|
bf19599c0e
|
* Finish task #59525.
|
2022-07-06 02:15:33 +00:00 |
|
|
tianshujie
|
cdaf164f0a
|
* Fix bug #24752,24747.
|
2022-07-06 08:26:27 +08:00 |
|
|
孙广明
|
d175ae0f5e
|
Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
# module/repo/control.php
|
2022-07-05 09:20:43 +00:00 |
|
|
liyuchun
|
8a3d924e2b
|
* Finish task #59451.
|
2022-07-05 08:42:48 +00:00 |
|
|
王怡栋
|
ae7cc6764d
|
Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.
See merge request easycorp/zentaopms!4348
|
2022-07-05 07:08:41 +00:00 |
|
|
孙广明
|
25028997fa
|
* Finish task #59701.
|
2022-07-05 15:03:15 +08:00 |
|
|
李玉春
|
c1f66467cd
|
Merge branch 'cyy_59436' into 'master'
Finish task 59436
See merge request easycorp/zentaopms!4335
|
2022-07-05 05:52:18 +00:00 |
|
|
liyuchun
|
0044a55b76
|
* Finish task #59439.
|
2022-07-05 05:48:02 +00:00 |
|
|
caoyanyi
|
b2085d27c6
|
* Modify language.
|
2022-07-05 13:03:26 +08:00 |
|
|
王怡栋
|
db007fe5eb
|
Merge branch 'sprint/211_tianshujie_59472' into 'master'
Sprint/211 tianshujie 59472
See merge request easycorp/zentaopms!4327
|
2022-07-05 01:54:17 +00:00 |
|
|
tianshujie
|
87160bf3a5
|
* Fix bug #24718.
|
2022-07-05 09:53:43 +08:00 |
|
|
tianshujie
|
63834e128c
|
* Fix bug #24718.
|
2022-07-05 09:52:13 +08:00 |
|
|
tianshujie
|
de4ae73289
|
* Fix bug #24718.
|
2022-07-05 08:46:11 +08:00 |
|
|
孙广明
|
ceb40be97a
|
Merge branch 'liyuchun_59437' into 'master'
* Finish task #59437,59438.
See merge request easycorp/zentaopms!4320
|
2022-07-04 09:23:50 +00:00 |
|
|
tianshujie
|
3028701a06
|
* Finish task #59472.
|
2022-07-04 17:18:20 +08:00 |
|
|
liyuchun
|
dd893ce8e1
|
* Finish task #59437,59438.
|
2022-07-04 07:36:29 +00:00 |
|
|
王怡栋
|
04b2a5994f
|
Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554
See merge request easycorp/zentaopms!4317
|
2022-07-04 06:59:21 +00:00 |
|
|
tianshujie
|
14037d612b
|
* Finish task #58554.
|
2022-07-04 14:58:56 +08:00 |
|
|
tianshujie
|
49ecf0795c
|
* Finish task #58554.
|
2022-07-04 14:57:07 +08:00 |
|
|
tianshujie
|
6fc6d25a48
|
* Finish task #58554.
|
2022-07-04 14:48:24 +08:00 |
|
|
wangyidong
|
c88aa6b8f1
|
Merge branch 'zentaomax35'
|
2022-07-04 14:16:06 +08:00 |
|
|
tianshujie
|
fedefaf02b
|
* Finish task #58554.
|
2022-07-04 13:20:33 +08:00 |
|
|
caoyanyi
|
30850025f5
|
* Modify tab menu.
|
2022-07-04 10:44:06 +08:00 |
|
|
孙广明
|
c4d5027b86
|
Merge branch 'fixbug_lang' into 'master'
Fixbug lang
See merge request easycorp/zentaopms!4271
|
2022-06-30 07:10:37 +00:00 |
|
|
王怡栋
|
d8094cba31
|
Merge branch 'sprint/workflow' into 'master'
* Add openedApproval config.
See merge request easycorp/zentaopms!4268
|
2022-06-30 07:06:32 +00:00 |
|
|
wangyuting2
|
20ef9ee98e
|
* Add openedApproval config.
|
2022-06-30 14:38:45 +08:00 |
|
|
王怡栋
|
90544b50e7
|
Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #23914, #23999, #24599.
See merge request easycorp/zentaopms!4264
|
2022-06-30 06:08:11 +00:00 |
|
|
liumengyi
|
61a1405ff2
|
* Fix bug #23914, #23999.
|
2022-06-30 14:03:24 +08:00 |
|
|
wangyidong
|
18a15b1d9d
|
* fix bug #23590.
|
2022-06-30 14:02:48 +08:00 |
|
|
liumengyi
|
076a744a0a
|
* Fix bug #23914, #23999.
|
2022-06-30 13:58:18 +08:00 |
|
|
tianshujie
|
98b100b6d1
|
* Add comments.
|
2022-06-30 13:40:43 +08:00 |
|
|
tianshujie
|
5a7778acbe
|
* Fixed TAB return error.
|
2022-06-30 13:37:34 +08:00 |
|
|
sunjun
|
db7d9edd07
|
fixbug_lang
|
2022-06-30 01:41:25 +00:00 |
|
|
xieqiyu
|
3dff44e506
|
* Fix bug#24370.
|
2022-06-30 08:24:25 +08:00 |
|
|
xieqiyu
|
7b579cfa1f
|
* Fix bug#24395.
|
2022-06-29 15:37:04 +08:00 |
|