Commit Graph
147 Commits
Author SHA1 Message Date
李玉春 ca3b8a3927 Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* optimize UI for kanban and fix drop rules not work.

See merge request easycorp/zentaopms!2511
2022-03-24 06:44:07 +00:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
孙华伟 cbbc6be340 *Optimize the code. 2022-03-24 11:29:55 +08:00
孙华伟 4282c9ebc2 *Fix bug #20863. 2022-03-24 11:11:02 +08:00
zhouxin b52e26ce89 Fix bug #18301. 2022-03-16 00:39:08 +00:00
zhouxin 087916a60e Fix bug #20191. 2022-03-02 05:49:21 +00:00
zhouxin 5dc91f9a30 Finish task #49886#49883. 2022-02-28 09:14:19 +00:00
zhengrunyu 1a8f317229 *Finish task 49303 2022-02-21 09:07:30 +08:00
zhengrunyu ae58f6c7c8 * Finish task 49303. 2022-02-17 11:27:41 +08:00
李玉春 459f6a2076 Merge branch 'master' into 'sunhuawei_fixbug_19247'
# Conflicts:
#   module/execution/css/story.css
2022-02-15 05:41:51 +00:00
孙华伟 aaf936b061 Fix bug #19247 #19435 #19239. 2022-02-15 13:29:03 +08:00
孙华伟 742614e0da Fix bug #19247 #19435 #19239 2022-02-15 13:25:12 +08:00
孙华伟 99532c30e0 Fix bug #19239. 2022-02-14 17:00:16 +08:00
孙华伟 06f9338fad *Fix bug #19239 #19367. 2022-02-11 08:54:47 +08:00
孙华伟 586af4b5de *Fix bug #48663. 2022-02-10 13:58:16 +08:00
zhengrunyu 919ea9d8d0 *Fix bug 18290. 2022-01-11 10:28:33 +08:00
zhengrunyu 5475eeab94 *Fix bug for start and end time when edit it. 2022-01-07 10:11:36 +08:00
zhengrunyu 325a57c292 *Code edit and batchedit. 2022-01-07 09:27:39 +08:00
zhengrunyu 16aa3247a0 *Fix bug. 2022-01-06 15:45:45 +08:00
zhengrunyu 8539bc7883 *Unset required. 2022-01-06 15:19:51 +08:00
zhengrunyu f2874479c2 *Adjust code. 2022-01-06 14:16:18 +08:00
zhengrunyu 133316ba45 *Adjust code. 2022-01-06 14:03:25 +08:00
zhengrunyu c0b16334ee *Code chenge status of parent and fix bug 2022-01-06 11:12:29 +08:00
tianshujie 0a3f8e4969 * Edit comment of browse.js file. 2022-01-05 11:06:31 +08:00
tianshujie ac03f67bdb * Fix problems in code review. 2022-01-05 11:02:34 +08:00
李玉春 76a3ebdd7b Merge branch 'sprint/181_zhengrunyu_18165' into 'master'
*Fixbug 18172.

See merge request easycorp/zentaopms!1257
2022-01-04 08:50:03 +00:00
zhengrunyu 18a744763f *Fixbug 18172. 2022-01-04 16:47:33 +08:00
liumengyi cc2601a4d5 * Add maximum width for plan title. 2022-01-04 16:08:38 +08:00
tianshujie 6ae2c2aaab * Fix bug #18143. 2022-01-04 09:54:07 +08:00
孙广明 fe6a6c0c54 * Fix code details. 2021-12-31 15:09:47 +08:00
孙广明 7a2a9daaef * Fix code details. 2021-12-31 15:04:19 +08:00
tianshujie 28881d6e76 * Modify the problem of dragging the card. 2021-12-31 11:03:01 +08:00
tianshujie 7b3bab2c4a * Fix bug #18094,#18077. 2021-12-31 08:57:08 +08:00
zhengrunyu eaf5bd6c50 *Fix bug. 2021-12-30 18:21:26 +08:00
孙广明 4c9dcd4af9 Merge branch 'master' into 'sprint/181_zhengrunyu_fixbug'
# Conflicts:
#   module/productplan/model.php
2021-12-30 08:48:11 +00:00
zhengrunyu a3e758269a *Code batchedit 2021-12-30 16:38:50 +08:00
孙广明 7267c50600 Merge branch 'master' into 'sgm_46670'
# Conflicts:
#   module/productplan/model.php
2021-12-30 08:12:11 +00:00
孙广明 e9c8da2f1e * Finish task #46670. 2021-12-30 16:04:32 +08:00
zhengrunyu b5348ab449 *Code batchedit time. 2021-12-30 14:35:47 +08:00
tianshujie 82a0d10f4b * The plan is completed or closed grayed out to create an execution button. 2021-12-30 14:29:53 +08:00
tianshujie 4d56aa8bdc * Add card drop-down operation. 2021-12-30 14:02:55 +08:00
tianshujie 97ea32f7c3 * Modify the mutual test question. 2021-12-30 13:49:49 +08:00
zhengrunyu 32430239a5 *code begin and end 2021-12-30 13:34:48 +08:00
孙广明 d6296cf071 Merge branch 'sprint/181_tianshujie_46672' into 'master'
*Finish task #46672.

See merge request easycorp/zentaopms!1188
2021-12-30 03:30:11 +00:00
tianshujie ff35ce06cd * Hide contextmenu when page scroll. 2021-12-30 11:24:07 +08:00
tianshujie 08723126ea * Finish task #46672. 2021-12-30 11:02:42 +08:00
孙广明 d4d7ef1074 Merge branch 'master' into 'sprint/181_zhengrunyu_46662'
# Conflicts:
#   module/productplan/lang/en.php
#   module/productplan/lang/zh-cn.php
#   module/productplan/view/browse.html.php
2021-12-30 01:17:44 +00:00
zhengrunyu ea8052baa0 *Finish task 46662 46664 46669. 2021-12-30 09:14:30 +08:00
zhengrunyu d28dcd7d63 *Finish task 46662 46665 46669. 2021-12-30 09:01:44 +08:00
tianshujie cc81db0ddc * Finish task #46667. 2021-12-30 08:24:38 +08:00