Commit Graph
2753 Commits
Author SHA1 Message Date
zhouxudong 49ae55568d * Fix bug about kanban's task actions. 2022-07-12 07:18:43 +00:00
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
tianshujie 1d1441f17f * Fix bug #25070. 2022-07-12 14:22:37 +08:00
zhouxudong 94c09e733d * Fix bug about taskkanban. 2022-07-12 06:12:02 +00:00
孙广明 c56ec2cbe4 * Add stage name. 2022-07-12 14:08:35 +08:00
zhouxudong 69101c8409 * Fix bug about taskkanban. 2022-07-12 06:06:02 +00:00
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
mayue 14ace897ca * Fix bug #24404. 2022-07-12 10:21:23 +08:00
sunjun d1d49fe404 sprint/211_sunjun_60474 2022-07-12 02:03:53 +00:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
zhouxudong fd2b8ec129 * Fix bug. 2022-07-11 12:56:31 +00:00
孙广明 f507af4cd0 * Code for stage list. 2022-07-11 18:19:27 +08:00
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00
chaideqing 3532e82841 * fix card show blank above header 2022-07-11 15:29:26 +08:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
孙广明 1afa07c083 * Code for task list. 2022-07-08 13:37:28 +08:00
王怡栋 b202420822 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
* Finish task #59681.

See merge request easycorp/zentaopms!4431
2022-07-08 03:30:23 +00:00
zhouxudong e8da735c95 * Finish task #59681. 2022-07-08 03:28:02 +00:00
孙广明 39d2a529b0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4428
2022-07-08 02:46:11 +00:00
孙广明 df7787bbd1 Merge branch 'fixbug_createTask' into 'master'
Fixbug create task

See merge request easycorp/zentaopms!4427
2022-07-08 02:43:15 +00:00
sunjun d2b201003b fixbug 2022-07-08 02:37:29 +00:00
tianshujie fe4b40e3cd * Fix bug #24127. 2022-07-08 10:34:05 +08:00
王怡栋 272ba58696 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
Sprint/master zhouxudong 59681

See merge request easycorp/zentaopms!4426
2022-07-08 02:09:05 +00:00
zhouxudong 7988466f2f * Finish task #59681. 2022-07-08 02:07:45 +00:00
zhouxudong e146c91ecb * Finish task #59681. 2022-07-08 02:04:04 +00:00
sunjun f7400480d4 fixbug_createTask 2022-07-08 02:02:22 +00:00
zhouxudong 85cecc60e5 * Finish task #59681. 2022-07-08 01:55:07 +00:00
zhouxudong f8c7be2001 * Finish task #59681. 2022-07-08 01:47:03 +00:00
刘刚 6d59cccaec Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.

See merge request easycorp/zentaopms!4419
2022-07-08 00:01:15 +00:00
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
zhouxudong e68d805486 * Finish task #59681. 2022-07-07 07:49:17 +00:00
zhouxudong 63128f6258 * Finish task #59681. 2022-07-07 05:36:28 +00:00
zhouxudong 28c6608986 * Finish task #59681. 2022-07-07 02:59:57 +00: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
tianshujie 40ca319394 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/211_tianshujie_58555 2022-07-07 09:41:09 +08:00
刘刚 52da827d60 Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.

See merge request easycorp/zentaopms!4394
2022-07-07 01:23:55 +00:00
daitingting 3bdeeea0f0 * Fix bug #24908. 2022-07-07 01:12:48 +00:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
王怡栋 f25fcc1eb2 Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
#   module/testcase/css/create.css
2022-07-06 06:47:25 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
刘刚 d3174ab36c Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10

See merge request easycorp/zentaopms!4368
2022-07-06 03:07:19 +00:00
liumengyi 6464887f89 * Fix bug #24753. 2022-07-06 08:42:21 +08:00
liumengyi b5608fb799 * Fix bug #24754. 2022-07-06 08:41:51 +08:00
tianshujie 577b42f32c * Hide required fields in custom forms. 2022-07-06 08:41:20 +08:00
tianshujie cdaf164f0a * Fix bug #24752,24747. 2022-07-06 08:26:27 +08:00
daitingting be44e76cb9 * Finish task #59646. 2022-07-05 09:20:47 +00:00
王怡栋 bc00e9f66c Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475

See merge request easycorp/zentaopms!4353
2022-07-05 08:30:47 +00:00