 王怡栋
|
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 |
|
|
xieqiyu
|
bb574373b4
|
* Finish task#56388.
|
2022-06-08 11:27:23 +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 |
|
|
tianshujie
|
a396ad68c4
|
* Fix bug #23348,23349.
|
2022-06-07 13:55:45 +08:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
sunjun
|
136d48f85e
|
fixbug_sunjun_22971
|
2022-06-02 06:14:57 +00:00 |
|
|
孙广明
|
2d572a9d14
|
Merge branch '197'
|
2022-06-02 08:32:45 +08:00 |
|
|
zhouxin
|
cda4d7e809
|
* Adjust code.
|
2022-06-01 08:56:49 +00:00 |
|
|
zhouxin
|
bc803e56c8
|
* Finish task #55676.
|
2022-06-01 07:34:04 +00:00 |
|
|
wangyidong
|
2400dfc83a
|
* code for task #55568.
|
2022-06-01 14:48:35 +08:00 |
|
|
liumengyi
|
d93d30e2d7
|
* Optimize code for task #55677.
|
2022-06-01 14:39:11 +08:00 |
|
|
liumengyi
|
61ef8e945f
|
* Fix bug for #task #55677.
|
2022-06-01 14:27:56 +08:00 |
|
|
liumengyi
|
499024e935
|
* Finish tash #55677.
|
2022-06-01 10:36:46 +08:00 |
|
|
孙华伟
|
c9f567453e
|
*Fix bug #23034.
|
2022-05-31 14:41:55 +08:00 |
|
|
孙华伟
|
6b69778c43
|
*Fix bug #23034.
|
2022-05-31 10:17:15 +08:00 |
|
|
孙广明
|
d6017ab11e
|
* Plan module order by path.
|
2022-05-27 08:47:19 +08:00 |
|
|
mayue
|
b2f72aaeff
|
* Fix bug #22905.
|
2022-05-26 10:16:45 +08:00 |
|
|
liumengyi
|
6c97c84844
|
* Fix bug #22562.
|
2022-05-25 13:21:50 +08:00 |
|
|
zenggang
|
7d5615ffac
|
* Adjust story sort default to desc
|
2022-05-24 09:10:28 +00:00 |
|
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
|
hufangzhou
|
3179fd289b
|
* Fix bug #22669.
|
2022-05-19 16:10:17 +08:00 |
|
|
hufangzhou
|
4845901d39
|
* Delete the unsed code.
|
2022-05-19 15:52:16 +08:00 |
|
|
hufangzhou
|
331e31c911
|
* Fix bug #22672.
|
2022-05-19 15:43:38 +08:00 |
|
|
李玉春
|
c8312488ff
|
Merge branch 'sprint/191_liumengyi_54319' into 'master'
* Finish task #54319.
See merge request easycorp/zentaopms!3501
|
2022-05-19 02:45:28 +00:00 |
|
|
liumengyi
|
cac837c0f9
|
* Code format for task #54319.
|
2022-05-19 10:36:46 +08:00 |
|
|
tianshujie
|
244a281a47
|
* Finish task #54329.
|
2022-05-19 09:57:00 +08:00 |
|
|
liumengyi
|
f473c18251
|
* Finish task #54319.
|
2022-05-19 09:44:50 +08:00 |
|
|
tianshujie
|
db940f77fd
|
* Finish task #54329.
|
2022-05-19 09:43:34 +08:00 |
|
|
tianshujie
|
f1f4c511b5
|
* Finish task #54329.
|
2022-05-18 16:08:09 +08:00 |
|
|
daitingting
|
244f061700
|
* Build flow menu.
|
2022-05-17 09:14:29 +00:00 |
|
|
tianshujie
|
bc694cb2f4
|
* Delete extra blank lines.
|
2022-05-16 09:24:58 +08:00 |
|
|
tianshujie
|
aaea60f6ad
|
* Fix bug #22489.
|
2022-05-16 09:13:18 +08:00 |
|
|
王怡栋
|
307716798b
|
Merge branch 'sprint/daitingting_buildoperatemenu_story' into 'master'
* Build operate menu for story module.
See merge request easycorp/zentaopms!3335
|
2022-05-11 07:25:26 +00:00 |
|
|
daitingting
|
90f6f0f63f
|
* Build operate menu for story module.
|
2022-05-11 07:22:16 +00:00 |
|
|
daitingting
|
3315ef0f49
|
* Remove comment field of story.
|
2022-05-11 05:25:54 +00:00 |
|
|
孙广明
|
e6ba9acf68
|
Merge branch 'sprint/tianshujie_task53668' into 'master'
Sprint/tianshujie task53668
See merge request easycorp/zentaopms!3310
|
2022-05-10 09:09:34 +00:00 |
|
|
tianshujie
|
5bdb7f521c
|
* Finish task #53668.
|
2022-05-10 17:05:49 +08:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
|
hufangzhou
|
bb3587b65b
|
* Fix bug #22153.
|
2022-05-05 17:33:46 +08:00 |
|
|
zhujinyong
|
342667de6c
|
Merge branch 'api_zry'
|
2022-04-29 16:36:25 +08:00 |
|
|
zhengrunyu
|
15d243767d
|
* Fix api.
|
2022-04-29 15:56:01 +08:00 |
|
|
xieqiyu
|
1c1b5c64a3
|
* Fix bug#22092.
|
2022-04-28 16:25:58 +08:00 |
|
|
mayue
|
36bd7d298d
|
* Fix bug #21706.
|
2022-04-27 13:34:55 +08:00 |
|
|
wangyidong
|
7b1fc7ee04
|
* code for bug #22026.
|
2022-04-27 11:53:27 +08:00 |
|
|
李玉春
|
e1d6bf1ef2
|
Merge branch 'sprint/renying_Fixbug#19044' into 'master'
Fixbug#19044
See merge request easycorp/zentaopms!3137
|
2022-04-26 08:10:42 +00:00 |
|
|
renying
|
df378ff26f
|
Fixbug#19044
|
2022-04-26 07:44:38 +00:00 |
|