 朱金勇
|
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 |
|
|
lanzongjun
|
36010b797f
|
* fix bug #54940
|
2022-05-25 15:58:26 +08:00 |
|
|
lanzongjun
|
0a84e5fb81
|
* fix bug #54940
|
2022-05-25 15:51:48 +08:00 |
|
|
王怡栋
|
b4646bcf9c
|
Merge branch 'sprint/master_zhouxudong_54998' into 'master'
* Finish task #54998.
See merge request easycorp/zentaopms!3591
|
2022-05-25 07:17:49 +00:00 |
|
|
王怡栋
|
601272cd59
|
Merge branch 'sprint/193_hufangzhou_54994' into 'master'
* Finish task #54994.
See merge request easycorp/zentaopms!3580
|
2022-05-25 07:10:56 +00:00 |
|
|
王怡栋
|
7466f08e23
|
Merge branch 'sprint/193_hufangzhou_54996' into 'master'
* Finish task #54996.
See merge request easycorp/zentaopms!3581
|
2022-05-25 07:09:51 +00:00 |
|
|
hufangzhou
|
9e3133e2a3
|
* Resolve issue #644.
|
2022-05-25 13:49:25 +08:00 |
|
|
hufangzhou
|
47151034b0
|
* Finish task #54996.
|
2022-05-25 11:21:49 +08:00 |
|
|
sunjun
|
532ed847f3
|
fixbug_sunjun
|
2022-05-25 03:07:59 +00:00 |
|
|
hufangzhou
|
5ea15374ac
|
* Finish task #54994.
|
2022-05-25 10:51:01 +08:00 |
|
|
李玉春
|
19718e6249
|
Merge branch 'master' into 'sprint_sunjun_55259'
# Conflicts:
# module/bug/view/batchcreate.html.php
|
2022-05-25 02:31:37 +00:00 |
|
|
sunjun
|
62c617db87
|
sprint_sunjun_55259
|
2022-05-25 02:10:02 +00:00 |
|
|
sunjun
|
ca20a35a26
|
sprint_sunjun_55259
|
2022-05-25 01:34:10 +00:00 |
|
|
zhouxudong
|
02d3db0b44
|
* Finish task #54998.
|
2022-05-25 01:23:51 +00:00 |
|
|
daitingting
|
e2f7c10296
|
* Set default value in getFieldControl function, finish task #54954.
|
2022-05-25 01:03:06 +00:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
liumengyi
|
b70e6047db
|
* Fix bug for batch assign.
|
2022-05-19 16:33:20 +08:00 |
|
|
liumengyi
|
47ec417f16
|
* Fix bug #22689.
|
2022-05-19 15:39:10 +08:00 |
|