 hufangzhou
|
3680af6833
|
* Finish task #53673.
|
2022-05-11 10:05:09 +08:00 |
|
|
liumengyi
|
8c6c09d699
|
* Finish task #53647.
|
2022-05-11 10:02:02 +08:00 |
|
|
zhouxin
|
b015ea5c77
|
* Finish task #53658.
|
2022-05-11 01:53:10 +00:00 |
|
|
liumengyi
|
977e100d04
|
* Finish task #53647.
|
2022-05-11 09:48:08 +08:00 |
|
|
daitingting
|
8243e4c175
|
* Remove empty line.
|
2022-05-11 01:47:55 +00:00 |
|
|
daitingting
|
09514cf770
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/daitingting_buildoperatemenu_productplan
|
2022-05-11 01:47:04 +00:00 |
|
|
daitingting
|
0fba3427af
|
* Build operate menu for productplan module.
|
2022-05-11 01:39:53 +00:00 |
|
|
xieqiyu
|
c77a6505d3
|
* Finish task#53671.
|
2022-05-11 09:01:17 +08:00 |
|
|
孙广明
|
ec014a85f0
|
Merge branch 'sprint/189_zhouxudong_53670' into 'master'
* Finish task #53670.
See merge request easycorp/zentaopms!3314
|
2022-05-10 09:24:53 +00:00 |
|
|
孙广明
|
887657308a
|
Merge branch 'sprint/189_liumengyi_53663' into 'master'
* Finish task #53663.
See merge request easycorp/zentaopms!3311
|
2022-05-10 09:23:24 +00:00 |
|
|
liumengyi
|
b4eda681c6
|
* Code for task #53663.
|
2022-05-10 17:22:29 +08:00 |
|
|
liumengyi
|
92f20d0914
|
* Finish task #53663, code format.
|
2022-05-10 17:19:48 +08:00 |
|
|
王怡栋
|
561b0bdbf1
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-10 09:12:01 +00:00 |
|
|
zhouxudong
|
1723a78c92
|
* Finish task #53651.
|
2022-05-10 09:11:06 +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 |
|
|
zenggang
|
d8d6ce45f7
|
* Finish task#53653
|
2022-05-10 08:58:00 +00:00 |
|
|
王怡栋
|
d9d331c38e
|
Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
# framework/control.class.php
|
2022-05-10 08:46:32 +00:00 |
|
|
wangyuting2
|
fe3c882c5e
|
* Adjust buildin workflow menu.
|
2022-05-10 16:32:04 +08:00 |
|
|
liumengyi
|
987edcc3cf
|
* Finish task #53663.
|
2022-05-10 16:29:56 +08:00 |
|
|
孙广明
|
69d9ffe9ae
|
Merge branch 'task_sunjun_53672' into 'master'
*task_sunjun_53672
See merge request easycorp/zentaopms!3300
|
2022-05-10 08:28:14 +00:00 |
|
|
sunjun
|
6abe1812a0
|
task_sunjun_53672
|
2022-05-10 08:23:33 +00:00 |
|
|
孙广明
|
9d8f4b4f21
|
Merge branch 'task_sunjun_53665' into 'master'
sprint_sunjun_53665
See merge request easycorp/zentaopms!3306
|
2022-05-10 08:23:21 +00:00 |
|
|
sunjun
|
0a23be8a5b
|
task_sunjun_53672
|
2022-05-10 08:22:25 +00:00 |
|
|
sunjun
|
bf1f9172ff
|
tasj_sunjun_53665
|
2022-05-10 08:15:50 +00:00 |
|
|
sunjun
|
57b5a8a1c5
|
task_sunjun_53672
|
2022-05-10 08:13:05 +00:00 |
|
|
唐胡成
|
82652aca0c
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-10 07:49:43 +00:00 |
|
|
李玉春
|
25a2285ccc
|
Merge branch 'sprint_sunjun_53654' into 'master'
Sprint sunjun 53654
See merge request easycorp/zentaopms!3308
|
2022-05-10 07:43:55 +00:00 |
|
|
sunjun
|
14b9350a1c
|
sprint_sunjun_53654
|
2022-05-10 07:40:57 +00:00 |
|
|
sunjun
|
d88c1310b6
|
sprint_sunjun_53654
|
2022-05-10 07:37:12 +00:00 |
|
|
liumengyi
|
c5ee9d9873
|
* Finish task #53663.
|
2022-05-10 15:35:32 +08:00 |
|
|
sunjun
|
631601a39b
|
sprint_sunjun_53665
|
2022-05-10 06:42:34 +00:00 |
|
|
tianshujie
|
4e2de99018
|
* Stages of updating trunk stories.
|
2022-05-10 14:25:01 +08:00 |
|
|
王怡栋
|
e7ae63a1a0
|
Merge branch 'sprint/daitingting_buildoperatemenu_product' into 'master'
* Build operate menu for product.
See merge request easycorp/zentaopms!3304
|
2022-05-10 05:58:27 +00:00 |
|
|
wangyidong
|
c9bc2ba86f
|
* code for task #53592.
|
2022-05-10 13:48:37 +08:00 |
|
|
daitingting
|
deb8d170a7
|
* Build operate menu for product.
|
2022-05-10 05:44:25 +00:00 |
|
|
tanghucheng
|
528fa45357
|
* Fix bug.
|
2022-05-10 05:13:35 +00:00 |
|
|
tianshujie
|
5c00aa823c
|
* Modify language item error.
|
2022-05-10 11:24:17 +08:00 |
|
|
tianshujie
|
896e36c90c
|
* Finish task #53667.
|
2022-05-10 10:50:02 +08:00 |
|
|
王怡栋
|
418a4580bb
|
Merge branch 'branch/workflow' into 'master'
Branch/workflow
See merge request easycorp/zentaopms!3302
|
2022-05-10 02:27:35 +00:00 |
|
|
tianshujie
|
c3fdb74a24
|
* Finish task #53668.
|
2022-05-10 10:12:48 +08:00 |
|
|
daitingting
|
a71cf1d280
|
Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow
|
2022-05-10 01:44:47 +00:00 |
|
|
sunjun
|
84ad06f3ec
|
*task_sunjun_53672
|
2022-05-10 01:37:07 +00:00 |
|
|
zhouxudong
|
4bb2ff1862
|
* Finish task #53670.
|
2022-05-10 01:34:01 +00:00 |
|
|
zhouxudong
|
a5fe4b5387
|
* Fix bug.
|
2022-05-10 00:37:24 +00:00 |
|
|
王怡栋
|
5090da4280
|
Merge branch 'branch/workflow' into 'master'
#Do task # 53548 and task #53550.
See merge request easycorp/zentaopms!3296
|
2022-05-09 09:20:05 +00:00 |
|
|
wangyuting2
|
dceb7ba183
|
* Optimize code.
|
2022-05-09 17:09:24 +08:00 |
|
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
|
wangyuting2
|
a607161591
|
* Finish task #53549.
|
2022-05-09 17:00:41 +08:00 |
|
|
wangyuting2
|
19631c8b97
|
* Adjust return.
|
2022-05-09 16:14:53 +08:00 |
|