 王怡栋
|
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 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
wangzemei
|
b11a919ccd
|
* Fix bug #24000
|
2022-06-21 06:08:36 +00:00 |
|
|
zhouxin
|
600a10d7ac
|
* Fix bug #23635.
|
2022-06-17 05:09:13 +00:00 |
|
|
zhouxin
|
a6c7038d6c
|
* Code for review.
|
2022-06-17 03:19:45 +00:00 |
|
|
wangyidong
|
182f601ed2
|
* fix bug #23740.
|
2022-06-17 10:32:31 +08:00 |
|
|
王怡栋
|
b6ec24a3d3
|
Merge branch 'sprint/hufangzhou_package' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!3994
|
2022-06-17 00:26:06 +00:00 |
|
|
hufangzhou
|
64a0dab834
|
* Add the new version.
|
2022-06-16 18:04:47 +08:00 |
|
|
孙广明
|
3f83669de2
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.
See merge request easycorp/zentaopms!3992
|
2022-06-16 09:28:33 +00:00 |
|
|
leiyong
|
f4e3a0dc61
|
* Fix bug#23707.
|
2022-06-16 09:14:11 +00:00 |
|
|
孙广明
|
bfa7047dff
|
Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug
See merge request easycorp/zentaopms!3970
|
2022-06-16 05:17:36 +00:00 |
|
|
孙广明
|
31838f2a25
|
* Fix bug #23704.
|
2022-06-16 13:08:56 +08:00 |
|
|
xieqiyu
|
e2361820ba
|
* Fix bug#56936.
|
2022-06-16 11:13:17 +08:00 |
|
|
王怡栋
|
06a6d3f112
|
Merge branch 'sprint/master_zhouxudong_23687' into 'master'
* Fix bug #23687.
See merge request easycorp/zentaopms!3950
|
2022-06-16 00:31:01 +00:00 |
|
|
zhouxudong
|
6059c89194
|
* Fix bug #23687.
|
2022-06-15 09:13:37 +00:00 |
|
|
tanghucheng
|
7d8325f469
|
* Fix bug #23775.
|
2022-06-15 16:12:03 +08:00 |
|
|
朱金勇
|
cb9a0b6af9
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.
See merge request easycorp/zentaopms!3916
|
2022-06-14 09:44:45 +00:00 |
|
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
|
xieqiyu
|
ee6c3a53c0
|
* Finish task#56936.
|
2022-06-13 15:12:20 +08:00 |
|
|
孙广明
|
5c1f32c3d9
|
Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view
See merge request easycorp/zentaopms!3876
|
2022-06-13 02:06:00 +00:00 |
|
|
sunjun
|
385e4b23e3
|
sprint_194
|
2022-06-13 02:05:02 +00:00 |
|
|
zhouxin
|
68b8268391
|
* Finish task #55258.
|
2022-06-13 01:25:38 +00:00 |
|
|
zhouxin
|
8a588426fd
|
* Fix bug #56479.
|
2022-06-10 07:53:00 +00:00 |
|
|
sunjun
|
a69d10d9db
|
sprint_194 add project in batchcreate view
|
2022-06-10 06:36:12 +00:00 |
|
|
wangyidong
|
9b699300ff
|
* code for bug #23516.
|
2022-06-09 16:50:07 +08:00 |
|
|
王怡栋
|
ad0ebf0aa1
|
Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-06-09 07:24:23 +00:00 |
|
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
|
孙广明
|
f3f8e20c9b
|
Merge branch 'sprint/201_zhouxin_my_work' into 'master'
* Finish task #56461,56462,56458,56465.
See merge request easycorp/zentaopms!3819
|
2022-06-09 05:23:01 +00:00 |
|
|
zhouxin
|
c056b7e567
|
* Finish task #56461,56462,56458,56465.
|
2022-06-09 05:18:27 +00:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
leiyong
|
bb31bbdca2
|
* Finish task#56360.
|
2022-06-07 07:55:58 +00:00 |
|
|
孙广明
|
82f09dcb51
|
Merge branch 'master_xieqiyu_23154' into 'master'
* Fix bug#23154.
See merge request easycorp/zentaopms!3731
|
2022-06-02 09:43:11 +00:00 |
|
|
zhouxudong
|
0e6fc10f0b
|
* Fix bug #23111.
|
2022-06-02 05:24:18 +00:00 |
|
|
孙广明
|
2d572a9d14
|
Merge branch '197'
|
2022-06-02 08:32:45 +08:00 |
|
|
xieqiyu
|
1d2ca05e50
|
* Fix bug#23154.
|
2022-06-02 03:54:17 +08:00 |
|
|
sunjun
|
1c8db1da3a
|
fixbug_sunjun_22531
|
2022-06-01 09:14:12 +00:00 |
|
|
wangyidong
|
2400dfc83a
|
* code for task #55568.
|
2022-06-01 14:48:35 +08:00 |
|
|
tianshujie
|
3e10f3d0c9
|
* Finish task #55675.
|
2022-06-01 14:25:44 +08:00 |
|
|
tianshujie
|
b076635c79
|
* Finish task #55675.
|
2022-06-01 13:32:34 +08:00 |
|
|
王怡栋
|
5846c3d0fd
|
Merge branch 'sprint/scx_bugsearch' into 'master'
* Fix bug #23068.
See merge request easycorp/zentaopms!3675
|
2022-06-01 03:00:36 +00:00 |
|
|
宋辰轩
|
7d1341e710
|
* Fix bug #23068.
|
2022-06-01 10:59:52 +08:00 |
|
|
宋辰轩
|
081b7352e9
|
* Fix bug #23068.
|
2022-06-01 09:51:55 +08:00 |
|
|
zhouxudong
|
71a55f5dcf
|
* Finish task #55623.
|
2022-06-01 01:37:18 +00:00 |
|
|
liumengyi
|
6a61aa3500
|
* Fix bug #22533.
|
2022-05-27 11:08:15 +08:00 |
|
|
孙华伟
|
ab396ef809
|
*Optimize the code.
|
2022-05-26 11:14:50 +08:00 |
|
|
孙华伟
|
c43322977f
|
*Fix bug #22900.
|
2022-05-26 11:07:01 +08:00 |
|