 王怡栋
|
dc62a0fce6
|
Merge branch 'sprint/231_tianshujie_bug' into 'master'
* Fix bug #26862.
See merge request easycorp/zentaopms!5115
|
2022-08-25 05:28:15 +00:00 |
|
|
tianshujie
|
06ab4ea7a5
|
* Fix bug #26862.
|
2022-08-25 13:06:38 +08:00 |
|
|
王怡栋
|
e16516ed44
|
Merge branch 'sprint/hufangzhou_html' into 'master'
* Calculate height in html format.
See merge request easycorp/zentaopms!5113
|
2022-08-25 03:21:06 +00:00 |
|
|
王怡栋
|
d6b0c3d876
|
Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug
See merge request easycorp/zentaopms!5111
|
2022-08-25 03:20:50 +00:00 |
|
|
王怡栋
|
de8934a593
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add import white list
See merge request easycorp/zentaopms!5109
|
2022-08-25 03:20:27 +00:00 |
|
|
王怡栋
|
dcb1795c2e
|
Merge branch 'master_xieqiyu_fixBug' into 'master'
* Fix bug of my requirement.
See merge request easycorp/zentaopms!5108
|
2022-08-25 03:19:51 +00:00 |
|
|
王怡栋
|
395cd0d0cd
|
Merge branch 'importExport' into 'master'
* Fix bug for port.
See merge request easycorp/zentaopms!5112
|
2022-08-25 03:18:53 +00:00 |
|
|
hufangzhou
|
fa9ea8cdca
|
* Calculate height in html format.
|
2022-08-25 11:16:44 +08:00 |
|
|
tanghucheng
|
1808127ba7
|
* Fix bug for port.
|
2022-08-25 11:10:31 +08:00 |
|
|
tianshujie
|
cc3ebce871
|
* Fix bug #26862.
|
2022-08-25 10:42:34 +08:00 |
|
|
王怡栋
|
815308b0a1
|
Merge branch 'sprint/hufangzhou_add8.1' into 'master'
* Add php 8.1 for package.
See merge request easycorp/zentaopms!5110
|
2022-08-25 02:41:49 +00:00 |
|
|
tianshujie
|
c6220519b1
|
* Modify the required fields on the page for creating a task are incorrect.
|
2022-08-25 10:40:26 +08:00 |
|
|
hufangzhou
|
90c9cdc9fa
|
* Add php 8.1 for package.
|
2022-08-25 10:34:32 +08:00 |
|
|
lanzongjun
|
b964b5e17a
|
* add import white list
|
2022-08-25 10:20:05 +08:00 |
|
|
王怡栋
|
0d9c57b293
|
Merge branch 'sprint/231_dongli_64972' into 'master'
* Fix bug #26824.
See merge request easycorp/zentaopms!5099
|
2022-08-25 02:17:34 +00:00 |
|
|
xieqiyu
|
e0826b5271
|
* Fix bug of my requirement.
|
2022-08-25 10:16:51 +08:00 |
|
|
孙广明
|
5115d871b6
|
Merge branch 'sprint/231_liumengyi_26846' into 'master'
* Fix bug #26846.
See merge request easycorp/zentaopms!5106
|
2022-08-25 02:03:22 +00:00 |
|
|
liumengyi
|
723093c840
|
* Fix bug for task #65808.
|
2022-08-25 10:01:58 +08:00 |
|
|
孙广明
|
41e346a299
|
Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug
See merge request easycorp/zentaopms!5104
|
2022-08-25 01:57:26 +00:00 |
|
|
liumengyi
|
9408410fee
|
* Fix bug #26846.
|
2022-08-25 09:56:42 +08:00 |
|
|
tianshujie
|
5e06502b84
|
* Fix bug #26858.
|
2022-08-25 09:49:55 +08:00 |
|
|
王怡栋
|
a25bb863bb
|
Merge branch 'sprint/231_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!5103
|
2022-08-25 01:36:16 +00:00 |
|
|
王怡栋
|
e59dc5a47e
|
Merge branch 'master_liuhong_66226' into 'master'
*Fix bug #66226.
See merge request easycorp/zentaopms!5094
|
2022-08-25 01:31:42 +00:00 |
|
|
hufangzhou
|
e55c40278d
|
* Add the new version.
|
2022-08-25 09:31:18 +08:00 |
|
|
liuhong
|
e36ae07f31
|
*Fix bug #66226.
|
2022-08-25 01:28:00 +00:00 |
|
|
tianshujie
|
1c1ccb2c6a
|
* Fix bug #26834.
|
2022-08-25 09:27:57 +08:00 |
|
|
liuhong
|
88e6b8c92e
|
*Fix bug #66226.
|
2022-08-25 01:22:35 +00:00 |
|
|
liuhong
|
cac2e8ddb3
|
*Fix bug #66226.
|
2022-08-25 01:16:07 +00:00 |
|
|
liuhong
|
2aff11fbd7
|
Fix bug #66226.
|
2022-08-25 01:12:22 +00:00 |
|
|
王怡栋
|
9554910fd4
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26819
See merge request easycorp/zentaopms!5102
|
2022-08-25 01:11:38 +00:00 |
|
|
tianshujie
|
8e46aa45f5
|
* Fix bug #26832.
|
2022-08-25 09:07:19 +08:00 |
|
|
lanzongjun
|
3d87534f3c
|
* fix bug #26819
|
2022-08-25 09:07:01 +08:00 |
|
|
王怡栋
|
1092812a40
|
Merge branch 'master_liuhong_26725' into 'master'
*Fix bug #26725.
See merge request easycorp/zentaopms!5049
|
2022-08-25 01:05:32 +00:00 |
|
|
lanzongjun
|
f5c4011039
|
* fix bug #26819
|
2022-08-25 08:57:55 +08:00 |
|
|
liyuchun
|
cbe4562f1d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-25 08:57:14 +08:00 |
|
|
liyuchun
|
a9b8582cc9
|
* Add cron task.
|
2022-08-25 08:57:01 +08:00 |
|
|
孙广明
|
2cd85595a1
|
Merge branch 'sprint/231_liumengyi_26841' into 'master'
* Fix bug #26841.
See merge request easycorp/zentaopms!5101
|
2022-08-25 00:56:29 +00:00 |
|
|
liyuchun
|
b2189bf529
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-25 08:55:31 +08:00 |
|
|
liyuchun
|
0f1d8abfdf
|
* Add filed in zt_job.
|
2022-08-25 08:55:18 +08:00 |
|
|
wangyidong
|
9fda3e2610
|
Merge branch 'sprint/231_zg_65782'
|
2022-08-25 08:52:15 +08:00 |
|
|
王怡栋
|
297a416762
|
Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
# module/story/control.php
|
2022-08-25 00:51:00 +00:00 |
|
|
王怡栋
|
589934c524
|
Merge branch 'sprint/231_zg_65806' into 'master'
* Finish task#65806
See merge request easycorp/zentaopms!5077
|
2022-08-25 00:47:26 +00:00 |
|
|
王怡栋
|
638be2116b
|
Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5065
|
2022-08-25 00:46:17 +00:00 |
|
|
王怡栋
|
6c83e2b3fd
|
Merge branch 'master_xieqiyu_fixStoryBug' into 'master'
Master xieqiyu fix story bug
See merge request easycorp/zentaopms!5098
|
2022-08-25 00:45:49 +00:00 |
|
|
王怡栋
|
ecddbde00c
|
Merge branch 'sprint/ZUI_guofeilong_Picker' into 'master'
Sprint/zui guofeilong picker: update options disableEmptySearch
See merge request easycorp/zentaopms!5097
|
2022-08-25 00:43:10 +00:00 |
|
|
liumengyi
|
de58e793b4
|
* Fix bug #26841.
|
2022-08-25 08:39:47 +08:00 |
|
|
王怡栋
|
ada42d0453
|
Merge branch 'max43_tanghucheng' into 'master'
* Fix bug #26617.
See merge request easycorp/zentaopms!5086
|
2022-08-25 00:28:23 +00:00 |
|
|
李玉春
|
c84bcd5726
|
Merge branch 'cyy_api' into 'master'
* Modify error.
See merge request easycorp/zentaopms!5100
|
2022-08-25 00:10:25 +00:00 |
|
|
xieqiyu
|
14ce3c97f9
|
* Fix bug#26804,26797.
|
2022-08-24 22:43:27 +08:00 |
|
|
xieqiyu
|
b2becfb0ec
|
* Fix bug#26806.
|
2022-08-24 21:06:12 +08:00 |
|