 李玉春
|
ba6a2cd512
|
Merge branch 'sprint/170_zhouxin_16209' into 'sprint/170'
Fix bug #16209.
See merge request easycorp/zentaopms!452
|
2021-11-15 05:23:45 +00:00 |
|
|
李玉春
|
1b2cf5ca09
|
Merge branch 'sprint/170_xieqiyu_upgrade' into 'sprint/170'
Sprint/170 xieqiyu upgrade
See merge request easycorp/zentaopms!453
|
2021-11-15 05:14:37 +00:00 |
|
|
xieqiyu
|
f6884fd700
|
* Modify comment.
|
2021-11-15 13:09:42 +08:00 |
|
|
xieqiyu
|
55e0e9591b
|
* Process branch and module when upgrade.
|
2021-11-15 13:07:07 +08:00 |
|
|
李玉春
|
a8523d317a
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.
See merge request easycorp/zentaopms!437
|
2021-11-15 05:05:00 +00:00 |
|
|
zhouxin
|
ccb98adb41
|
Fix bug #16209.
|
2021-11-15 10:44:29 +08:00 |
|
|
zhouxin
|
b5ab5a03d7
|
Finish task #43916.
|
2021-11-15 10:07:01 +08:00 |
|
|
李玉春
|
4719289333
|
Merge branch 'sprint/170_tianshujie_16248' into 'sprint/170'
* Fix bug #16248.
See merge request easycorp/zentaopms!450
|
2021-11-15 02:04:36 +00:00 |
|
|
tianshujie
|
17ee3c0980
|
* Fix bug #16248.
|
2021-11-15 09:55:18 +08:00 |
|
|
李玉春
|
dbf8840697
|
Merge branch 'sprint/170_mayue_16223' into 'sprint/170'
* Fix bug #16223.
See merge request easycorp/zentaopms!449
|
2021-11-15 01:40:34 +00:00 |
|
|
李玉春
|
ca0f02be21
|
Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'
* Fix bug #16179.
See merge request easycorp/zentaopms!448
|
2021-11-15 01:35:56 +00:00 |
|
|
hufangzhou
|
12054383a6
|
* Fix bug #16179.
|
2021-11-15 09:28:58 +08:00 |
|
|
mayue
|
92c5221f26
|
* Fix bug #16223.
|
2021-11-15 09:08:40 +08:00 |
|
|
李玉春
|
9e74d7204a
|
Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'
* Fix the bugs.
See merge request easycorp/zentaopms!447
|
2021-11-15 01:05:55 +00:00 |
|
|
李玉春
|
5ede27a2c6
|
Merge branch 'sprint/170_xieqiyu_16094' into 'sprint/170'
* Fix bug#16094.
See merge request easycorp/zentaopms!445
|
2021-11-15 01:04:47 +00:00 |
|
|
李玉春
|
6839a8e23c
|
Merge branch 'sprint_xieqiyu_16188' into 'sprint/170'
* Fix bug#16188.
See merge request easycorp/zentaopms!446
|
2021-11-15 01:04:13 +00:00 |
|
|
hufangzhou
|
e441e4a28d
|
* Fix the bugs.
|
2021-11-15 08:50:05 +08:00 |
|
|
朱金勇
|
2adb14ae19
|
Merge branch 'sprint/170_sunhao/improve_pie_chart' into 'sprint/170'
* Fix CanvasRenderingContext2D error when init progress-pie plugin.
See merge request easycorp/zentaopms!439
|
2021-11-14 09:46:04 +00:00 |
|
|
xieqiyu
|
a9ba1c9344
|
* Fix bug#16094.
|
2021-11-14 14:18:40 +08:00 |
|
|
xieqiyu
|
cce14cef80
|
* Fix bug#16188.
|
2021-11-14 10:47:12 +08:00 |
|
|
mayue
|
3921075895
|
* Fix bug #16223.
|
2021-11-12 17:55:58 +08:00 |
|
|
李玉春
|
8851c7878b
|
Merge branch 'sprint/170_tianshujie_merge' into 'sprint/170'
* Merge conflict.
See merge request easycorp/zentaopms!443
|
2021-11-12 07:37:34 +00:00 |
|
|
tianshujie
|
bc2560fd95
|
* Remove spaces.
|
2021-11-12 15:36:29 +08:00 |
|
|
tianshujie
|
a3da8bf0e0
|
* Merge conflict.
|
2021-11-12 15:33:35 +08:00 |
|
|
liyuchun
|
77b697c991
|
Merge branch 'sprint/170_tianshujie_16194' into sprint/170
|
2021-11-12 15:31:52 +08:00 |
|
|
李玉春
|
9686f7e13e
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_16194'
# Conflicts:
# module/project/control.php
|
2021-11-12 07:31:40 +00:00 |
|
|
孙广明
|
c55cc7844c
|
Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'
* Deal with the branch is empty.
See merge request easycorp/zentaopms!442
|
2021-11-12 07:30:52 +00:00 |
|
|
hufangzhou
|
8352d145f5
|
* Deal with the branch is empty.
|
2021-11-12 15:22:47 +08:00 |
|
|
孙广明
|
9230c6a413
|
Merge branch 'sprint/170_liyuchun_bug' into 'sprint/170'
* Fix error of manage product.
See merge request easycorp/zentaopms!441
|
2021-11-12 07:22:10 +00:00 |
|
|
tianshujie
|
48d7682b0f
|
* Modify the code issue.
|
2021-11-12 15:18:26 +08:00 |
|
|
liyuchun
|
0c7bcaf928
|
* Fix error of manage product.
|
2021-11-12 15:07:42 +08:00 |
|
|
tianshujie
|
50b4590655
|
* Fix bug #16194.
|
2021-11-12 14:53:51 +08:00 |
|
|
李玉春
|
73a9a43999
|
Merge branch 'sprint/170_songchenxuan_16186' into 'sprint/170'
* Fix bug #16186.
See merge request easycorp/zentaopms!438
|
2021-11-12 06:52:14 +00:00 |
|
|
Hao Sun
|
37071ded1f
|
* fix CanvasRenderingContext2D error when init progress-pie plugin.
|
2021-11-12 14:35:59 +08:00 |
|
|
songchenxuan
|
225d83b304
|
* Fix bug #16186.
|
2021-11-12 14:29:25 +08:00 |
|
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
|
李玉春
|
fe15f97b82
|
Merge branch 'sprint/170_mayue_16221' into 'sprint/170'
* Fix bug #16221.
See merge request easycorp/zentaopms!436
|
2021-11-12 06:00:30 +00:00 |
|
|
mayue
|
67687a738a
|
* Fix bug #16221.
|
2021-11-12 13:58:02 +08:00 |
|
|
李玉春
|
89396523ad
|
Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170'
* Fix bug #16190.
See merge request easycorp/zentaopms!434
|
2021-11-12 05:25:50 +00:00 |
|
|
tianshujie
|
54d69e1969
|
* Fix bug #16190.
|
2021-11-12 13:19:18 +08:00 |
|
|
孙广明
|
e237e5267c
|
Merge branch 'sprint/170_wangyidong' into 'sprint/170'
* fix bug for get tree menu in project view.
See merge request easycorp/zentaopms!428
|
2021-11-12 05:17:02 +00:00 |
|
|
tianshujie
|
44bfbb7cdc
|
* Fix bug #16190.
|
2021-11-12 13:10:52 +08:00 |
|
|
李玉春
|
b71f540905
|
Merge branch 'sprint/170_songchenxuan_16043' into 'sprint/170'
* Fix bug #16043.
See merge request easycorp/zentaopms!427
|
2021-11-12 02:46:18 +00:00 |
|
|
王怡栋
|
1dd4bbc079
|
* fix bug for get tree menu in project view.
|
2021-11-12 10:35:13 +08:00 |
|
|
songchenxuan
|
2dbfab7e5a
|
* Fix bug #16043.
|
2021-11-12 10:29:30 +08:00 |
|
|
孙广明
|
98caaec0ea
|
Merge branch 'sprint/170_hufangzhou_bug' into 'sprint/170'
* Modify the cookie of storyModule.
See merge request easycorp/zentaopms!424
|
2021-11-12 02:11:00 +00:00 |
|
|
孙广明
|
bac8da4180
|
Merge branch 'sprint/170_hufangzhou_16219' into 'sprint/170'
* Fix bug #16219.
See merge request easycorp/zentaopms!425
|
2021-11-12 02:10:37 +00:00 |
|
|
hufangzhou
|
d160b6b0f5
|
* Fix bug #16219.
|
2021-11-12 10:07:28 +08:00 |
|
|
hufangzhou
|
bf08427c9a
|
* Modify the cookie of storyModule.
|
2021-11-12 09:45:43 +08:00 |
|
|
孙广明
|
e75aee2b1e
|
Merge branch 'sprint/170_leiyong' into 'sprint/170'
* Do not query deleted webhook configurations.
See merge request easycorp/zentaopms!418
|
2021-11-12 01:04:17 +00:00 |
|