 liuhong
|
6b6f9c39ee
|
*Finish task #64879.
|
2022-08-18 02:51:35 +00:00 |
|
|
liuhong
|
24ea56af1c
|
*Finish task #64880.
|
2022-08-18 02:51:35 +00:00 |
|
|
liuhong
|
fda5a1b952
|
*Finish task #64883.
|
2022-08-18 02:51:35 +00:00 |
|
|
liuhong
|
ebae24048d
|
*Finish task #64883.
|
2022-08-18 02:51:35 +00:00 |
|
|
王怡栋
|
b959dfd2cc
|
Merge branch 'master_liuhong_26203' into 'sprint_liuhong'
*Fix bug #26203
See merge request easycorp/zentaopms!5003
|
2022-08-18 02:31:02 +00:00 |
|
|
王怡栋
|
dd433841b6
|
Merge branch 'master_liuhong_26210' into 'sprint_liuhong'
*Fix bug #26210.
See merge request easycorp/zentaopms!5002
|
2022-08-18 02:30:31 +00:00 |
|
|
王怡栋
|
3365e8a10c
|
Merge branch 'master_liuhong_26230' into 'sprint_liuhong'
*Fix bug #26230.
See merge request easycorp/zentaopms!5001
|
2022-08-18 02:26:48 +00:00 |
|
|
王怡栋
|
9c18c3013c
|
Merge branch 'sprint/hufangzhou_unusedfile' into 'master'
* Fix bug #26548.
See merge request easycorp/zentaopms!4982
|
2022-08-16 09:06:08 +00:00 |
|
|
王怡栋
|
3256ca241e
|
Merge branch 'master_xieqiyu_26545' into 'master'
* Fix bug#26545.
See merge request easycorp/zentaopms!4983
|
2022-08-16 09:05:54 +00:00 |
|
|
孙广明
|
1ec773d7d2
|
Merge branch 'sprint/228_tianshujie_fixbug' into 'master'
* Fix bug #26553.
See merge request easycorp/zentaopms!4984
|
2022-08-16 08:56:56 +00:00 |
|
|
tianshujie
|
572b14f05f
|
* Fix bug #26553.
|
2022-08-16 16:46:25 +08:00 |
|
|
tianshujie
|
d5ba096809
|
* Fix bug #26553.
|
2022-08-16 16:44:39 +08:00 |
|
|
xieqiyu
|
7ecf79a163
|
* Fix bug#26545.
|
2022-08-16 16:36:03 +08:00 |
|
|
hufangzhou
|
6a6b04db11
|
* Fix bug #26548.
|
2022-08-16 15:16:19 +08:00 |
|
|
zhujinyong
|
61802828b3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-16 15:02:50 +08:00 |
|
|
zhujinyong
|
c8f3aec35b
|
+ Add vendor of sqlparser.
|
2022-08-16 15:02:27 +08:00 |
|
|
王怡栋
|
9f7de89251
|
Merge branch 'importExport' into 'master'
* Fix bug #26520,26520.
See merge request easycorp/zentaopms!4979
|
2022-08-16 06:16:21 +00:00 |
|
|
tanghucheng
|
eaaf6e7498
|
* Update lang for lite.
|
2022-08-16 14:00:50 +08:00 |
|
|
tanghucheng
|
68f35f5262
|
* Fix bug #26520,26520.
|
2022-08-16 13:58:19 +08:00 |
|
|
王怡栋
|
4e2df94bdf
|
Merge branch 'sprint/zentaomax42_lanzongjun' into 'master'
* fix bug cp project
See merge request easycorp/zentaopms!4976
|
2022-08-16 05:07:32 +00:00 |
|
|
lanzongjun
|
572021a1bd
|
* fix params
|
2022-08-16 13:06:58 +08:00 |
|
|
sunguangming
|
3e6052ae5f
|
* Fix bug #26465.
|
2022-08-16 13:02:25 +08:00 |
|
|
lanzongjun
|
4b21f31e5c
|
* fix bug #26462
|
2022-08-16 11:22:57 +08:00 |
|
|
孙广明
|
64b7bb8460
|
Merge branch 'importExport' into 'master'
* Fix bug #26256.
See merge request easycorp/zentaopms!4977
|
2022-08-16 01:54:10 +00:00 |
|
|
tanghucheng
|
e2865a49c6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-16 09:32:04 +08:00 |
|
|
tanghucheng
|
d3314f22aa
|
* Fix bug #26256.
|
2022-08-16 09:28:41 +08:00 |
|
|
lanzongjun
|
5b380fedb4
|
* fix bug cp project
|
2022-08-16 09:19:27 +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 |
|
|
liuhong
|
30f4f11753
|
*Fix bug #26203
|
2022-08-15 04:44:12 +00:00 |
|