 王怡栋
|
f3d49ef75f
|
Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939
See merge request easycorp/zentaopms!5010
|
2022-08-18 05:54:12 +00:00 |
|
|
李玉春
|
ae0ee026cc
|
Merge branch 'zenops_41' into 'master'
Zenops 41
See merge request easycorp/zentaopms!5013
|
2022-08-18 05:21:42 +00:00 |
|
|
王怡栋
|
308fb3d2ee
|
Merge branch 'sprint/228_liumengyi_25319' into 'master'
* Fix bug #25319.
See merge request easycorp/zentaopms!4991
|
2022-08-18 05:02:22 +00:00 |
|
|
caoyanyi
|
7b71377d3c
|
Merge branch 'master' into zenops_41
|
2022-08-18 10:37:47 +08:00 |
|
|
mayue
|
a48a15cdb1
|
* Ajust codes about stage setType.
|
2022-08-18 09:31:29 +08:00 |
|
|
sunguangming
|
ef679444bd
|
* Code for file checkpriv bug.
|
2022-08-18 08:47:49 +08:00 |
|
|
mayue
|
b3801a92a6
|
* Optimize code.
|
2022-08-18 08:47:31 +08:00 |
|
|
sunguangming
|
b175607c41
|
* Code for file checkpriv bug.
|
2022-08-18 08:25:37 +08:00 |
|
|
mayue
|
e95ecf9244
|
* Finish task #64939.
|
2022-08-17 16:20:17 +08:00 |
|
|
caoyanyi
|
8c1a24d3b5
|
Merge branch 'master' into zenops_41
|
2022-08-17 16:03:23 +08:00 |
|
|
xieqiyu
|
6f6491148a
|
* Fix bug#26414.
|
2022-08-17 15:19:53 +08:00 |
|
|
liumengyi
|
6dc929d1db
|
* Fix bug #25319.
|
2022-08-17 10:58:25 +08:00 |
|
|
liumengyi
|
33fa12239e
|
* Fix bug #25319.
|
2022-08-17 10:56:09 +08:00 |
|
|
zhouxin
|
607fa5a010
|
* Fix bug of doc-objectLib.
|
2022-08-17 02:16:03 +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 |
|
|
caoyanyi
|
ef7bcf26eb
|
* Optimize diff page.
|
2022-08-16 15:07:14 +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
|
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 |
|
|
lanzongjun
|
5b380fedb4
|
* fix bug cp project
|
2022-08-16 09:19:27 +08:00 |
|
|
liyuchun
|
6a4299917d
|
* Fix bug #26413.
|
2022-08-16 08:53:41 +08:00 |
|
|
liyuchun
|
af9287a7d7
|
Merge branch 'zenops_41' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_41
|
2022-08-16 08:53:06 +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 |
|
|
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 |
|
|
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 |
|
|
孙广明
|
5391d4a163
|
Merge branch 'liyuchun_fixbug_26301' into 'zenops_41'
* Fix bug #26301.
See merge request easycorp/zentaopms!4966
|
2022-08-15 07:02:26 +00: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 |
|
|
王怡栋
|
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 |
|
|
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 |
|