 tanghucheng
|
004561024f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-21 17:37:48 +08:00 |
|
|
tianshujie
|
03f9bca910
|
* Fix bug #25465.
|
2022-07-21 08:46:07 +08:00 |
|
|
tanghucheng
|
d0694aae7e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-20 16:02:00 +08:00 |
|
|
liumengyi
|
9ed05fad25
|
* Optimize code for task #61173.
|
2022-07-20 15:59:50 +08:00 |
|
|
liumengyi
|
d161817441
|
* Optimize code for task #61173.
|
2022-07-20 15:56:59 +08:00 |
|
|
liumengyi
|
13eda1d631
|
* Finish task #61173.
|
2022-07-20 10:28:01 +08:00 |
|
|
tanghucheng
|
d9cec2568a
|
* Code for bug config.
|
2022-07-18 14:45:09 +08:00 |
|
|
tanghucheng
|
817ebdaf5d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-11 08:44:42 +08:00 |
|
|
tanghucheng
|
6eb8428c4b
|
* Fix bug config.
|
2022-07-08 15:34:31 +08:00 |
|
|
liumengyi
|
f9b24fb48c
|
* Fix bug of task #23123.
|
2022-07-08 13:52:33 +08:00 |
|
|
liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|
|
tanghucheng
|
ad32cd3092
|
* Fix getRows and set config for bug.
|
2022-07-08 11:00:47 +08:00 |
|
|
liumengyi
|
e709c4bbda
|
* Finish task #59480, #59481.
|
2022-07-07 14:12:45 +08:00 |
|
|
刘刚
|
d3174ab36c
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4368
|
2022-07-06 03:07:19 +00:00 |
|
|
daitingting
|
be44e76cb9
|
* Finish task #59646.
|
2022-07-05 09:20:47 +00:00 |
|
|
zhouxudong
|
1c00265c79
|
* Finish task #59527 #59572.
|
2022-07-04 07:21:39 +00:00 |
|
|
xieqiyu
|
1b338f5cf5
|
* Fix bug#24216.
|
2022-06-30 14:09:52 +08:00 |
|
|
tianshujie
|
26f37ec09c
|
* Finish task #58560.
|
2022-06-27 15:38:33 +08:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
zhouxin
|
a6c7038d6c
|
* Code for review.
|
2022-06-17 03:19:45 +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 |
|
|
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 |
|
|
zhouxin
|
68b8268391
|
* Finish task #55258.
|
2022-06-13 01:25:38 +00:00 |
|
|
sunjun
|
a69d10d9db
|
sprint_194 add project in batchcreate view
|
2022-06-10 06:36:12 +00: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 |
|
|
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 |
|
|
宋辰轩
|
7d1341e710
|
* Fix bug #23068.
|
2022-06-01 10:59:52 +08:00 |
|
|
宋辰轩
|
081b7352e9
|
* Fix bug #23068.
|
2022-06-01 09:51:55 +08:00 |
|
|
liumengyi
|
6a61aa3500
|
* Fix bug #22533.
|
2022-05-27 11:08:15 +08:00 |
|
|
hufangzhou
|
9e3133e2a3
|
* Resolve issue #644.
|
2022-05-25 13:49:25 +08:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
liumengyi
|
47ec417f16
|
* Fix bug #22689.
|
2022-05-19 15:39:10 +08:00 |
|
|
hufangzhou
|
775a397395
|
* Finish task #54484,#54485,#54486.
|
2022-05-19 11:09:53 +08:00 |
|
|
liumengyi
|
7659a2376c
|
* Code format for task #54320.
|
2022-05-19 10:38:00 +08:00 |
|
|
liumengyi
|
6aabf4eae0
|
* Finish task #54320.
|
2022-05-18 17:00:48 +08:00 |
|
|
wangyidong
|
415d9ed538
|
* adjust for merge master code.
|
2022-05-17 17:12:12 +08:00 |
|
|
tianshujie
|
e848ea7d3f
|
* Fix the project logic to which the lookup execution belongs.
|
2022-05-17 09:39:07 +08:00 |
|
|
王怡栋
|
3cd2d727a7
|
Merge branch 'sprint/master_zhouxudong_22531' into 'master'
* Fix bug #22531.
See merge request easycorp/zentaopms!3431
|
2022-05-16 09:26:34 +00:00 |
|
|
zhouxudong
|
48c052efad
|
* Fix bug #22531.
|
2022-05-16 09:23:29 +00:00 |
|
|
tanghucheng
|
a0bd326f3b
|
* Fix bug.
|
2022-05-16 06:43:34 +00:00 |
|