Commit Graph
41739 Commits
Author SHA1 Message Date
xieqiyu 05a1b2be02 * Code for task#59543. 2022-07-07 17:52:30 +08:00
xieqiyu 29efcab628 * Code for task#59543. 2022-07-07 17:42:30 +08:00
xieqiyu 07231be2d2 * Code for task#59543. 2022-07-07 17:23:09 +08:00
xieqiyu 2e733795f6 * Code for task#59543. Update bug to story. 2022-07-07 16:49:24 +08:00
xieqiyu 2f81269858 * Code for task#59543. 2022-07-07 16:13:55 +08:00
孙广明 b2dac0d660 Merge branch 'liyuchun_59430' 2022-07-07 14:01:18 +08:00
李玉春 ce18e2e476 Merge branch 'master' into 'liyuchun_59430'
# Conflicts:
#   module/repo/control.php
2022-07-07 05:59:30 +00:00
李玉春 c392efc4e4 Merge branch 'cyy_59430' into 'master'
* Finish task #59430.

See merge request easycorp/zentaopms!4404
2022-07-07 05:57:05 +00:00
liyuchun 7784dfa80d * Finish task #59434. 2022-07-07 05:56:33 +00:00
李玉春 e06426f77f Merge branch 'cyy_bug' into 'master'
* Modify back btn.

See merge request easycorp/zentaopms!4397
2022-07-07 05:54:54 +00:00
liyuchun 92988c9386 * Finish task #59432,59434. 2022-07-07 05:53:56 +00:00
王怡栋 7c432a46b0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24937

See merge request easycorp/zentaopms!4407
2022-07-07 05:36:54 +00:00
刘刚 7262a6d365 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24912.

See merge request easycorp/zentaopms!4406
2022-07-07 05:32:53 +00:00
lanzongjun ec9c9f2a0e * fix bug #24937 2022-07-07 13:32:34 +08:00
daitingting 008043aa25 * Fix bug #24912. 2022-07-07 05:31:24 +00:00
caoyanyi 28c4deffb7 * Modify data get. 2022-07-07 13:20:22 +08:00
wangyidong 6d71c5e346 * fix bug #24794. 2022-07-07 13:18:25 +08:00
王怡栋 5dd799ee9e Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug  #24942, #24949.

See merge request easycorp/zentaopms!4400
2022-07-07 05:10:46 +00:00
王怡栋 10b95d1e48 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4398
2022-07-07 05:10:07 +00:00
liumengyi 9e5a0ff356 * Fix bug for task #59469. 2022-07-07 12:06:41 +08:00
xieqiyu ef190dc83e * Code for task#59543. Update create bug and batch create bug. 2022-07-07 11:42:54 +08:00
刘刚 c958da7bf4 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24924.

See merge request easycorp/zentaopms!4405
2022-07-07 03:20:08 +00:00
daitingting 162513b943 * Fix bug #24924. 2022-07-07 03:18:45 +00:00
caoyanyi 40d2eca43b * Finish task #59430. 2022-07-07 11:17:41 +08:00
刘刚 263419df29 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24959.

See merge request easycorp/zentaopms!4403
2022-07-07 03:13:21 +00:00
liuruogu 15d87d68e4 * Fix bug #24959. 2022-07-07 03:12:51 +00:00
liuruogu bf62f6fa75 * Fix bug #24959. 2022-07-07 03:03:59 +00:00
孙广明 d02553620f Merge branch 'srpint213_zg_24853' into 'master'
* Fix bug#24853

See merge request easycorp/zentaopms!4396
2022-07-07 02:54:25 +00:00
孙广明 27959db980 Merge branch 'sprint/213_mayue_bug#24811' into 'master'
* Fix bug #24811.

See merge request easycorp/zentaopms!4402
2022-07-07 02:54:16 +00:00
mayue 8192f8b185 * Fix bug #24811. 2022-07-07 10:52:45 +08:00
孙广明 c540e7002d Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555

See merge request easycorp/zentaopms!4392
2022-07-07 02:51:51 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
刘刚 ff94cac738 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24898.

See merge request easycorp/zentaopms!4399
2022-07-07 02:36:20 +00:00
daitingting cfc20958d0 * Fix bug #24903. 2022-07-07 02:35:55 +00:00
liumengyi eb6901ee34 * Fix bug #24949. 2022-07-07 10:29:37 +08:00
liumengyi 119175e5c9 * Fix bug #24942. 2022-07-07 10:28:57 +08:00
daitingting a588add16f * Fix bug #24898. 2022-07-07 02:16:18 +00:00
wangyidong 072945f180 * fix for tid. 2022-07-07 10:09:19 +08:00
caoyanyi fc7404e096 * Modify back btn. 2022-07-07 10:08:28 +08:00
xieqiyu 157c60bd64 * Code for task#59546. Update unlink story. 2022-07-07 10:04:24 +08:00
孙广明 b5a365422f * Code for pri error. 2022-07-07 09:57:20 +08:00
李玉春 c69b9e32d5 Merge branch 'cyy_gitea' into 'master'
Add Gitea module.

See merge request easycorp/zentaopms!4390
2022-07-07 01:56:40 +00:00
caoyanyi ebbcfd3564 * Modify language. 2022-07-07 09:54:20 +08:00
caoyanyi 9dd1c4454c * Adjust code. 2022-07-07 09:49:40 +08:00
王怡栋 5879801b8b Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.

See merge request easycorp/zentaopms!4395
2022-07-07 01:49:35 +00:00
xieqiyu 75d4bc213c * Code for task#59546. Update batch create story and change story. 2022-07-07 09:49:15 +08:00
liumengyi c8b30d557a * Optimize code for task #59482. 2022-07-07 09:48:17 +08:00
zenggang 270ab7ce6e * Fix bug#24853 2022-07-07 01:47:23 +00:00
caoyanyi e794c59ce1 * Adjust codes. 2022-07-07 09:46:11 +08:00
liumengyi 59bbb4577a * Finish task #59482. 2022-07-07 09:44:33 +08:00