Commit Graph
1272 Commits
Author SHA1 Message Date
周旭东 177b6005f3 Update taskkanban.html.php 2022-02-23 05:28:31 +00:00
周旭东 8b494a429d Update kanban.html.php 2022-02-23 05:27:17 +00:00
周旭东 ede11fedbe Update kanban.html.php 2022-02-23 05:21:05 +00:00
周旭东 f134c0d63b Merge branch 'sprint/185' into 'sprint/185_zxd_49696'
# Conflicts:
#   module/execution/view/kanban.html.php
2022-02-23 05:17:54 +00:00
李玉春 e637d830ee Merge branch 'sprint/185' into 'sprint/185_zxd_49693'
# Conflicts:
#   module/execution/js/kanban.js
#   module/execution/view/kanban.html.php
2022-02-23 05:08:23 +00:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zhouxudong d3d29e78b1 * Finish task #49693. 2022-02-22 17:41:44 +08:00
李玉春 2f548dce80 Merge branch 'sprint/185_zhengrunyu_49694' into 'sprint/185'
*Finish task 49694 49695.

See merge request easycorp/zentaopms!1886
2022-02-22 08:35:39 +00:00
zhengrunyu c9685d4441 *Finish task 49694 49695. 2022-02-22 15:52:32 +08:00
zhujinyong 49af622fd8 * Move exit to return. 2022-02-22 14:25:14 +08:00
zhouxudong 15ea32151f * Finish task #19696. 2022-02-21 14:22:17 +08:00
zhengrunyu 069f009b6d *Finish task 49283 2022-02-17 14:34:11 +08:00
周旭东 117a240287 Update kanban.html.php 2022-02-15 05:13:13 +00:00
zhouxudong bc31a203ae *Fix bug #19343. 2022-02-15 10:45:33 +08:00
zhouxudong c21f887cbc *Fix bug #18593. 2022-02-14 17:11:05 +08:00
liyuchun 5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
孙华伟 db37a2ea85 Fix bug #19435. 2022-02-14 10:07:49 +08:00
孙华伟 1a494d0329 Fix bug #19435. 2022-02-14 09:32:47 +08:00
孙华伟 ef8e2c049b *Fix bug 19435. 2022-02-11 17:39:30 +08:00
孙广明 531ec207f8 Merge branch 'sprint/fixbug_18593' into 'master'
Sprint/fixbug 18593

See merge request easycorp/zentaopms!1727
2022-02-08 08:17:22 +00:00
zhouxudong a7a720e66d *Fix bug #18593. 2022-02-08 14:13:24 +08:00
zhouxudong 41c4f7135f *Fix bug #18593. 2022-02-08 09:08:15 +08:00
tanghucheng 83632f916d * Fix bug #19269. 2022-02-08 09:01:19 +08:00
tianshujie 0ef9b12a2c * Fix bug #19070. 2022-01-27 16:13:13 +08:00
zhouxin e48be0c1db Fix s bug. 2022-01-27 03:11:36 +00:00
sgm0422 4f3c4dbdae * Fix bug #19048. 2022-01-27 08:32:36 +08:00
李玉春 8bff3489c8 Merge branch 'sgm_47983' into 'master'
* Fix bug #18972.

See merge request easycorp/zentaopms!1633
2022-01-26 02:39:03 +00:00
孙广明 2530d27f0b * Fix bug #18972. 2022-01-26 10:14:30 +08:00
tianshujie 8dcd1a0e4c * Fix the problem of error reporting and button dividing line. 2022-01-26 09:02:16 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
liumengyi 571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
liumengyi 1353d674c7 * Fix bug #18883 and #18891. 2022-01-24 14:19:35 +08:00
liumengyi 80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
tianshujie b22eed4a6d * Fix bug #18783,18780. 2022-01-20 11:15:33 +08:00
孙广明 f30562f520 Merge branch 'sprint/183_zhouxin_47980' into 'master'
Finish task #47980.

See merge request easycorp/zentaopms!1496
2022-01-19 09:32:28 +00:00
zhouxudong a7fa427b91 *Finish task #47958. 2022-01-19 14:29:23 +08:00
zhouxin 919e91b029 Finish task #47980. 2022-01-19 05:51:01 +00:00
liumengyi 361d245ac6 * Remove useless variables. 2022-01-19 11:13:43 +08:00
liumengyi 2d10aedf4b * Remove useless code. 2022-01-19 09:04:11 +08:00
liumengyi a1c6cfadcc * Modify required item judgment method. 2022-01-19 09:01:29 +08:00
liumengyi 8f924a7f05 * Fix bug #18481. 2022-01-18 17:23:54 +08:00
liumengyi c587ac5863 * Fix bug #18671. 2022-01-18 14:46:38 +08:00
tianshujie cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
liumengyi deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
tianshujie 3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
liumengyi b2324c3406 * Fix bug #18485,#18474. 2022-01-17 10:13:31 +08:00
liumengyi cdba989f91 * Fix bug #18458,#18473. 2022-01-17 08:54:22 +08:00
liumengyi 0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00