Commit Graph
42401 Commits
Author SHA1 Message Date
caoyanyi aaeebc1abd * Adjust codes. 2022-07-21 17:01:39 +08:00
caoyanyi 0eba61ac66 * Fix bug #24750. 2022-07-21 13:58:39 +08:00
caoyanyi 28ce2717db * Fix bug #24582. 2022-07-21 13:28:26 +08:00
caoyanyi df93073fe4 * Fix bug #24576. 2022-07-21 13:24:43 +08:00
caoyanyi cb09c1e3ff * Fix bug #24558. 2022-07-21 13:19:29 +08:00
王怡栋 167d746156 Merge branch 'cyy_25543' into 'master'
* Fix bug #25543.

See merge request easycorp/zentaopms!4621
2022-07-21 03:04:05 +00:00
caoyanyi 76f13a8b85 * Modify gitea delete merge request. 2022-07-21 10:54:18 +08:00
caoyanyi f9704cbb1b * Adjust code. 2022-07-21 10:15:59 +08:00
王怡栋 70d17e226b Merge branch 'sprint/master_zhouxudong_61442' into 'master'
* Finish task #61442.

See merge request easycorp/zentaopms!4611
2022-07-21 02:04:09 +00:00
王怡栋 660f0d0d85 Merge branch 'sprint/master_zhouxudong_61441' into 'master'
Sprint/master zhouxudong 61441

See merge request easycorp/zentaopms!4606
2022-07-21 02:03:20 +00:00
caoyanyi 2ef6ab7949 * Fix bug #25543. 2022-07-21 10:01:49 +08:00
孙广明 165dc24575 Merge branch 'sprint/217_liumengyi_25079' into 'master'
* Fix bug #25079.

See merge request easycorp/zentaopms!4619
2022-07-21 01:51:23 +00:00
liumengyi 8aa6469edb * Fix bug #25079. 2022-07-21 09:48:58 +08:00
zhouxudong 9d5f891419 * Finish task #61441. 2022-07-21 01:40:43 +00:00
zhouxudong a49f1b9961 * Finish task #61442. 2022-07-21 01:38:12 +00:00
zhouxudong 1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
王怡栋 1a8a06ecc7 Merge branch 'sprint/217_liumengyi_25230' into 'master'
* Fix bug #25230.

See merge request easycorp/zentaopms!4618
2022-07-21 01:26:48 +00:00
liumengyi 72ed2599d1 * Fix bug #25230. 2022-07-21 09:22:20 +08:00
王怡栋 623877555d Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!4613
2022-07-21 01:18:53 +00:00
王怡栋 2228d3dad8 Merge branch 'sprint/217_liumengyi_24796' into 'master'
* Fix bug #24796.

See merge request easycorp/zentaopms!4617
2022-07-21 00:41:24 +00:00
liumengyi 59968a12e4 * Fix bug #24796. 2022-07-21 08:40:56 +08:00
王怡栋 08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
王怡栋 c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master'
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
2022-07-20 09:29:07 +00:00
tianshujie 93f70dcf70 * Modify the jump link after saving the created program. 2022-07-20 17:25:25 +08:00
wangyidong 2cf2c96ebd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 17:25:00 +08:00
liumengyi 369a66f0f0 * Fix bug #24796. 2022-07-20 17:06:34 +08:00
tianshujie 5b0ada601f * Reformat code. 2022-07-20 17:05:59 +08:00
tianshujie e547bc05a8 * A project cannot be saved successfully for a long time during batch editing. 2022-07-20 17:02:14 +08:00
tianshujie bdab39e7f7 * Fixed an issue where advanced tables cannot be selected entirely. 2022-07-20 16:54:43 +08:00
caoyanyi a146a7633a * Modify data display. 2022-07-20 16:49:01 +08:00
caoyanyi 328a91abc5 * Add repo unique. 2022-07-20 16:39:11 +08:00
王怡栋 bcaeed4d82 Merge branch 'sprint/hufangzhou_doc_25510' into 'master'
* Adjust the style for document height.

See merge request easycorp/zentaopms!4614
2022-07-20 08:38:19 +00:00
hufangzhou e5d4bf2ef0 * Adjust the style for document height. 2022-07-20 16:36:26 +08:00
caoyanyi a637e8af2a * Modify url param. 2022-07-20 16:35:21 +08:00
caoyanyi 848e1e17c3 * Modify view page. 2022-07-20 16:28:58 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
caoyanyi b6c8d0427d * Fix bug #25522. 2022-07-20 16:09:34 +08:00
王怡栋 1bff7088d1 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4612
2022-07-20 08:08:56 +00:00
tianshujie 68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
王怡栋 f4fb9ca204 Merge branch 'sprint/217_liumengyi_61173' into 'master'
* Finish task #61173.

See merge request easycorp/zentaopms!4609
2022-07-20 08:01:12 +00:00
tianshujie c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +08:00
liumengyi 9ed05fad25 * Optimize code for task #61173. 2022-07-20 15:59:50 +08:00
tianshujie 05eb3a5422 * Fix bug #25454. 2022-07-20 15:59:28 +08:00
caoyanyi 8ab585040b * Fix bug #25516. 2022-07-20 15:57:41 +08:00
liumengyi d161817441 * Optimize code for task #61173. 2022-07-20 15:56:59 +08:00
王怡栋 e9ed908608 Merge branch 'cyy_mr_create' into 'master'
* Modify protect branch tips.

See merge request easycorp/zentaopms!4607
2022-07-20 06:59:07 +00:00
zhouxudong c637a40725 * Finish task #61441. 2022-07-20 06:56:14 +00:00
caoyanyi dcf20546ca * Adjust codes. 2022-07-20 14:28:07 +08:00
王怡栋 d3c3973346 Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #59750.

See merge request easycorp/zentaopms!4608
2022-07-20 06:27:44 +00:00