 孙广明
|
583055fee3
|
Merge branch 'sgm_task' into 'sprint/zentaopms230'
* Code for task #65278.
See merge request easycorp/zentaopms!4995
|
2022-08-17 08:14:18 +00:00 |
|
|
sunguangming
|
6a1bb3f756
|
* Code for task #65278.
|
2022-08-17 16:13:26 +08:00 |
|
|
wangyidong
|
6d987182a8
|
* change for multi task teams.
|
2022-08-17 16:01:41 +08:00 |
|
|
wangyidong
|
28328da15c
|
Merge branch 'sprint/zentaopms230' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms230
|
2022-08-17 13:07:52 +08:00 |
|
|
wangyidong
|
aa4fd1de10
|
* adjust for linear task.
|
2022-08-17 13:07:33 +08:00 |
|
|
王怡栋
|
6d9ba865ba
|
Merge branch '230' into 'sprint/zentaopms230'
* Code for weekly.
See merge request easycorp/zentaopms!4980
|
2022-08-16 06:06:38 +00:00 |
|
|
wangyidong
|
95ef309921
|
* code for task #65279.
|
2022-08-16 13:39:25 +08:00 |
|
|
sunguangming
|
749d5f7375
|
* Code for weekly.
|
2022-08-16 10:48:47 +08:00 |
|
|
wangyidong
|
97700ca723
|
* fix for MYISAM to InnoDB.
|
2022-08-16 08:27:17 +08:00 |
|
|
wangyidong
|
ab83e773d9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-15 17:57:14 +08:00 |
|
|
wangyidong
|
0d6be2f360
|
* fix for sql error when change table engine.
|
2022-08-15 17:56:30 +08:00 |
|
|
王怡栋
|
d1ccbe14ae
|
Merge branch 'sprint/liuruogu_fixbug#26456' into 'master'
* Fix bug #26456.
See merge request easycorp/zentaopms!4974
|
2022-08-15 09:28:11 +00:00 |
|
|
liuruogu
|
f488c11146
|
* Fix bug #26456.
|
2022-08-15 09:23:06 +00:00 |
|
|
孙广明
|
7a92f78f16
|
Merge branch 'importExport' into 'master'
* Fix bug for gantt menu.
See merge request easycorp/zentaopms!4973
|
2022-08-15 07:48:14 +00:00 |
|
|
tanghucheng
|
517fd4b79e
|
* Fix bug for gantt menu.
|
2022-08-15 15:44:47 +08:00 |
|
|
王怡栋
|
2afc943171
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug gantt menu
See merge request easycorp/zentaopms!4972
|
2022-08-15 07:42:31 +00:00 |
|
|
孙广明
|
2251eb7aef
|
Merge branch 'sprint/hufangzhou_26445' into 'master'
* Fix bug #26445.
See merge request easycorp/zentaopms!4971
|
2022-08-15 07:38:24 +00:00 |
|
|
lanzongjun
|
c6ae545f36
|
* fix bug gantt menu
|
2022-08-15 15:37:30 +08:00 |
|
|
hufangzhou
|
ed4dec3540
|
* Fix bug #26445.
|
2022-08-15 15:32:13 +08:00 |
|
|
wangyidong
|
474662047c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-15 15:11:37 +08:00 |
|
|
wangyidong
|
cab10571b3
|
* adjust for after exec page.
|
2022-08-15 15:11:06 +08:00 |
|
|
孙广明
|
ffe9bb9815
|
Merge branch 'importExport' into 'master'
* Sort execution and project gantt menu .
See merge request easycorp/zentaopms!4970
|
2022-08-15 07:00:25 +00:00 |
|
|
孙广明
|
e0b470a476
|
Update gantt.html.php
|
2022-08-15 07:00:13 +00:00 |
|
|
tanghucheng
|
af4bd538f1
|
* Fix bug for port.
|
2022-08-15 14:56:57 +08:00 |
|
|
tanghucheng
|
2bc6e7a1e8
|
* Sort execution and project gantt menu .
|
2022-08-15 14:28:31 +08:00 |
|
|
王怡栋
|
704901e7e0
|
Merge branch 'sprint/hufangzhou_BI' into 'master'
* Add the BI sql to standard sql.
See merge request easycorp/zentaopms!4969
|
2022-08-15 06:01:01 +00:00 |
|
|
王怡栋
|
3aff3d70b5
|
Merge branch 'importExport' into 'master'
* Fix bug #26419,26417.
See merge request easycorp/zentaopms!4968
|
2022-08-15 06:00:38 +00:00 |
|
|
wangyidong
|
e891a32291
|
* File ui.flow.html.hook.php can not delete.
|
2022-08-15 13:50:39 +08:00 |
|
|
hufangzhou
|
81c1e5b6e7
|
* Add the BI sql to standard sql.
|
2022-08-15 13:24:04 +08:00 |
|
|
wangyidong
|
811c1d2ad6
|
* adjust for change table engine.
|
2022-08-15 13:04:24 +08:00 |
|
|
tanghucheng
|
c816179a08
|
* Fix bug #26419,26417.
|
2022-08-15 12:26:44 +08:00 |
|
|
zhujinyong
|
b6dcbaa519
|
+ Add libraries for bi.
|
2022-08-15 12:02:11 +08:00 |
|
|
zhujinyong
|
d21ed6a72f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-15 11:10:46 +08:00 |
|
|
zhujinyong
|
7e67e54fe9
|
* Define table.
|
2022-08-15 11:10:09 +08:00 |
|
|
wangyidong
|
1e5558d383
|
* adjust for search.
|
2022-08-15 11:06:34 +08:00 |
|
|
王怡栋
|
a84ae59d3b
|
Merge branch 'sprint/hufangzhou_xuansql' into 'master'
* Add the xuan update sql to zentao.sql.
See merge request easycorp/zentaopms!4967
|
2022-08-15 02:55:05 +00:00 |
|
|
hufangzhou
|
f98716d88f
|
* Add the xuan update sql to zentao.sql.
|
2022-08-15 10:53:56 +08:00 |
|
|
zhujinyong
|
9ebd84ddcb
|
+ Add bi sql.
|
2022-08-15 10:09:32 +08:00 |
|
|
zhujinyong
|
50479852ea
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-15 08:47:48 +08:00 |
|
|
zhujinyong
|
1c64aed9b1
|
Merge branch 'sprint/sunhao/table_overflow_type'
|
2022-08-15 08:44:56 +08:00 |
|
|
王怡栋
|
72b8148159
|
Merge branch 'master_liwenrui_bugfix_zentaoclient_card' into 'master'
* fix style of dialogs in zentaoclient.
See merge request easycorp/zentaopms!4964
|
2022-08-15 00:23:47 +00:00 |
|
|
孙广明
|
0fa03e96c7
|
Merge branch 'sprint/scx_api' into 'master'
* Modify product po rd qd createdby to user objectType.
See merge request easycorp/zentaopms!4961
|
2022-08-15 00:22:09 +00:00 |
|
|
Wenrui LI
|
2df27f9a12
|
* fix style of dialogs in zentaoclient.
|
2022-08-15 08:22:09 +08:00 |
|
|
王怡栋
|
be900dfbbc
|
Merge branch 'sprint224_zg_unit' into 'master'
* Adjust unit code
See merge request easycorp/zentaopms!4960
|
2022-08-15 00:21:12 +00:00 |
|
|
王怡栋
|
63dae91a00
|
Merge branch 'importExport' into 'master'
* Code for Import export
See merge request easycorp/zentaopms!4963
|
2022-08-15 00:14:35 +00:00 |
|
|
李玉春
|
bd3999375c
|
Merge branch 'sprint/224_tianshujie_case' into 'master'
Sprint/224 tianshujie case
See merge request easycorp/zentaopms!4962
|
2022-08-15 00:13:45 +00:00 |
|
|
tanghucheng
|
2f5eaab58c
|
* Format code for port module.
|
2022-08-14 16:21:16 +08:00 |
|
|
tanghucheng
|
087c4a37b1
|
* Code for lite story export.
|
2022-08-14 16:16:40 +08:00 |
|
|
tanghucheng
|
90f16b91ca
|
* Fix bug for bug and story export.
|
2022-08-14 15:25:00 +08:00 |
|
|
tianshujie
|
59d60c61b9
|
* Add the missing cases for the action module.
|
2022-08-14 14:02:48 +08:00 |
|