Commit Graph
2259 Commits
Author SHA1 Message Date
zhouxudong 73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
王怡栋 42629df5ab Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4511
2022-07-13 05:43:07 +00:00
liumengyi a743cf4b3f * Optimize code. 2022-07-13 13:41:48 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
王怡栋 30e7879a41 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!4493
2022-07-13 03:12:44 +00:00
王怡栋 0ac2e857a4 Merge branch 'sprint214_leiyong_task_60384' into 'master'
Sprint214 leiyong task 60384

See merge request easycorp/zentaopms!4495
2022-07-13 02:25:36 +00:00
leiyong 5b91324e83 * Finish task#60384. 2022-07-13 02:15:09 +00:00
孙广明 d7999be8bf * Remove sprint create child btn. 2022-07-13 10:09:14 +08:00
王怡栋 65e48dadb8 Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.

See merge request easycorp/zentaopms!4487
2022-07-13 02:02:44 +00:00
liumengyi be11f49b45 * Optimize code. 2022-07-13 09:46:02 +08:00
孙广明 28f6cefe13 * Add burn to execution list. 2022-07-13 09:00:16 +08:00
孙广明 032f5e963a * Add space to execution list. 2022-07-13 08:51:09 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
zhouxudong adaa8667d7 * Finish task #60393. 2022-07-12 09:30:15 +00:00
王怡栋 11f2eb8a0f Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476

See merge request easycorp/zentaopms!4485
2022-07-12 09:20:31 +00:00
liumengyi d748d207fb * Optimize code. 2022-07-12 17:18:07 +08:00
王怡栋 d0c15d321f Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!4472
2022-07-12 07:41:56 +00:00
王怡栋 8bbc43b99c Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.

See merge request easycorp/zentaopms!4468
2022-07-12 07:23:46 +00:00
zhouxudong 09eabd3b84 * Finish task #60393. 2022-07-12 07:15:27 +00:00
zenggang 6a84cd7469 * Code for task#60640 2022-07-12 07:15:13 +00:00
王怡栋 58941466a6 Merge branch 'master_xieqiyu_fixKanbanBug' into 'master'
* Fix bug of story and bug action in execution.

See merge request easycorp/zentaopms!4471
2022-07-12 07:03:09 +00:00
孙广明 507eb73497 Merge branch 'sprint/216_mayue_bug#25081' into 'master'
* Fix bug #25081.

See merge request easycorp/zentaopms!4473
2022-07-12 06:28:56 +00:00
mayue 0a5cf0a831 * Optimize code. 2022-07-12 14:28:17 +08:00
mayue a21626979e * Fix bug #25081. 2022-07-12 14:25:58 +08:00
zhouxudong 69101c8409 * Fix bug about taskkanban. 2022-07-12 06:06:02 +00:00
xieqiyu 658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
王怡栋 d47cde97d2 Merge branch 'master_xieqiyu_25030' into 'master'
* Fix bug#25030.

See merge request easycorp/zentaopms!4464
2022-07-12 05:31:04 +00:00
liumengyi 154c18ee43 * Finish task #60476. 2022-07-12 11:07:16 +08:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
zenggang f3dd489f61 * Adjust code 2022-07-12 02:32:01 +00:00
zenggang 5d116c16c9 * Finish task#60640 2022-07-12 02:29:20 +00:00
xieqiyu bd596ac686 * Fix bug#25030. 2022-07-12 09:32:31 +08:00
孙广明 107060744e Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.

See merge request easycorp/zentaopms!4463
2022-07-12 00:54:34 +00:00
xieqiyu e7d7930b5b * Fix bug#25062. 2022-07-12 08:13:36 +08:00
zhouxudong fd2b8ec129 * Fix bug. 2022-07-11 12:56:31 +00:00
mayue 9248adc1af * Finish task #60639. 2022-07-11 18:10:09 +08:00
王怡栋 4c3d59333a Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.

See merge request easycorp/zentaopms!4450
2022-07-11 07:56:19 +00:00
mayue ea0500a20c * Finish task #60641. 2022-07-11 15:26:14 +08:00
王怡栋 e9809af13a Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
#   www/js/my.full.js
2022-07-11 07:10:23 +00:00
hufangzhou 3f2b98e71c * Move the functions to my.full.js file. 2022-07-11 15:03:40 +08:00
hufangzhou 21dbff52ca * Rename method names. 2022-07-11 14:57:43 +08:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
hufangzhou 2993ba53f8 * Finish task #59535. 2022-07-11 14:41:09 +08:00
mayue 88a580898d * Optimize code. 2022-07-11 10:06:43 +08:00
mayue 5bedd02491 * Fix bug #25031. 2022-07-11 09:54:58 +08:00
liumengyi 29993afa9e * Optimize code for bug #23123. 2022-07-08 13:55:41 +08:00
liumengyi 9921474711 * Fix bug #23123. 2022-07-08 13:43:43 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
孙广明 4049441bbe * Fix linkcase bug. 2022-07-08 11:24:09 +08:00