 王怡栋
|
a6916a73c5
|
Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527
See merge request easycorp/zentaopms!4326
|
2022-07-05 02:07:26 +00: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
|
17a8e9dcd5
|
* Changing the name of a function.
|
2022-07-05 08:47:45 +08:00 |
|
|
tianshujie
|
21d8a543a4
|
* Fix bug #24721.
|
2022-07-04 17:20:35 +08:00 |
|
|
tianshujie
|
3028701a06
|
* Finish task #59472.
|
2022-07-04 17:18:20 +08:00 |
|
|
王怡栋
|
4e1f22be8a
|
Merge branch 'sprint/212_zhouxudong_59542' into 'master'
Sprint/212 zhouxudong 59542
See merge request easycorp/zentaopms!4321
|
2022-07-04 07:50:04 +00:00 |
|
|
zhouxudong
|
5af55d653b
|
* Finish task #59542 #59541.
|
2022-07-04 07:46:30 +00:00 |
|
|
zhouxudong
|
1c00265c79
|
* Finish task #59527 #59572.
|
2022-07-04 07:21:39 +00:00 |
|
|
王怡栋
|
4bacc1b95f
|
Merge branch 'sprint/211_liumengyi_59468' into 'master'
* Finish task #59468.
See merge request easycorp/zentaopms!4316
|
2022-07-04 07:04:37 +00:00 |
|
|
liumengyi
|
247458ba1e
|
* Optimize code of task #59468.
|
2022-07-04 15:03:49 +08: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
|
6fc6d25a48
|
* Finish task #58554.
|
2022-07-04 14:48:24 +08:00 |
|
|
tianshujie
|
3e19862ed1
|
* Finish task #58554.
|
2022-07-04 14:12:36 +08:00 |
|
|
zhouxudong
|
6b960dc038
|
* Finish task #59542 #59541.
|
2022-07-04 05:57:34 +00:00 |
|
|
tianshujie
|
ee701c75c9
|
* Finish task #58554.
|
2022-07-04 13:20:09 +08:00 |
|
|
liumengyi
|
89f5ead39c
|
* Modify French language items.
|
2022-07-04 11:28:49 +08:00 |
|
|
liumengyi
|
7f9f5f662c
|
* Finish task #59468.
|
2022-07-04 11:21:56 +08:00 |
|
|
孙广明
|
52a588ec90
|
* Code for kanban error.
|
2022-07-01 14:38:20 +08:00 |
|
|
zhouxudong
|
1e4f5f1e7d
|
* Fix bug of batchCreate Task.
|
2022-07-01 05:19:00 +00:00 |
|
|
王怡栋
|
be04312358
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug for preview.
See merge request easycorp/zentaopms!4285
|
2022-07-01 00:17:54 +00:00 |
|
|
孙广明
|
f04bcce5cf
|
Merge branch 'fixbug_22007' into 'master'
fixbug_22007
See merge request easycorp/zentaopms!4286
|
2022-07-01 00:15:12 +00:00 |
|
|
sunjun
|
7882690c49
|
fixbug_22007
|
2022-06-30 09:16:49 +00:00 |
|
|
zhouxudong
|
3970773281
|
* Fix bug for preview.
|
2022-06-30 09:08:57 +00:00 |
|
|
zhouxudong
|
502e3db733
|
* Iframe and disable will be invalid.
|
2022-06-30 08:35:22 +00:00 |
|
|
zhouxudong
|
bd848e13e2
|
* Fix bug #24598.
|
2022-06-30 05:51:38 +00:00 |
|
|
王怡栋
|
531a112d7d
|
Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug
See merge request easycorp/zentaopms!4259
|
2022-06-30 05:17:58 +00:00 |
|
|
tianshujie
|
8fbf4148c4
|
* Fix bug #24573.
|
2022-06-30 10:55:05 +08:00 |
|
|
李玉春
|
46a88b04d3
|
Merge branch 'bug_24222' into 'master'
* Fix bug #24222.
See merge request easycorp/zentaopms!4231
|
2022-06-30 02:26:33 +00:00 |
|
|
tianshujie
|
c265149f88
|
* Fix bug #24586.
|
2022-06-30 10:19:52 +08:00 |
|
|
孙广明
|
7a80448220
|
* Code for multi task.
|
2022-06-30 09:51:35 +08:00 |
|
|
孙广明
|
793a4ec698
|
* Code for multi task assignedTo.
|
2022-06-30 09:41:33 +08:00 |
|
|
caoyanyi
|
ff8bef7fe6
|
* Fix bug #24222.
|
2022-06-29 17:09:21 +08:00 |
|
|
孙广明
|
d0924667d0
|
Merge branch 'sgm_task#58773' into 'master'
* Finish task #58771.
See merge request easycorp/zentaopms!4212
|
2022-06-29 06:07:38 +00:00 |
|
|
孙广明
|
6c777a0a97
|
* Finish task #58771.
|
2022-06-29 13:50:57 +08:00 |
|
|
孙广明
|
4dc9c76e9c
|
Merge branch 'sprint209_leiyong_task_58578' into 'master'
* Finish task#58578.
See merge request easycorp/zentaopms!4200
|
2022-06-29 05:34:12 +00:00 |
|
|
孙广明
|
59eeeced39
|
Merge branch 'sprint210_zg' into 'master'
* Finish task#58772,58774,58775
See merge request easycorp/zentaopms!4184
|
2022-06-29 01:14:39 +00:00 |
|
|
leiyong
|
f888f66bf5
|
* Finish task#58578.
|
2022-06-28 09:59:34 +00:00 |
|
|
zhouxudong
|
0daa2e2130
|
* Finish task #58605.
|
2022-06-28 07:50:23 +00:00 |
|
|
tianshujie
|
621e382cb6
|
* Finish task #58554.
|
2022-06-28 15:35:49 +08:00 |
|
|
zenggang
|
15feb917ce
|
* Finish task#58772,58774,58775
|
2022-06-28 05:39:31 +00:00 |
|
|
xieqiyu
|
320c88d44d
|
* Finish task#58584.
|
2022-06-28 13:30:51 +08:00 |
|
|
xieqiyu
|
78e86b9493
|
* Finish task#58591.
|
2022-06-27 11:25:11 +08:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
孙广明
|
33dd17eb8a
|
Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765
See merge request easycorp/zentaopms!4094
|
2022-06-23 05:30:16 +00:00 |
|
|
王怡栋
|
6fd3c28a23
|
Merge branch 'sprint205_leiyong_task_57878' into 'master'
Sprint205 leiyong task 57878
See merge request easycorp/zentaopms!4074
|
2022-06-23 00:41:00 +00:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
mayue
|
6c975adff8
|
* Add some code.
|
2022-06-22 17:21:55 +08:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
leiyong
|
aeaf517513
|
* Keep 2 decimal places.
|
2022-06-22 09:17:10 +00:00 |
|
|
leiyong
|
3356617455
|
* Finish task#57878.
|
2022-06-22 05:35:34 +00:00 |
|