Commit Graph

2334 Commits

Author SHA1 Message Date
王怡栋
4fe35caf8e Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49335

See merge request easycorp/zentaopms!1910
2022-02-23 04:58:52 +00:00
Zongjun Lan
245a062277 modify code format 2022-02-23 11:34:17 +08:00
Zongjun Lan
91f09fe484 modify code format 2022-02-23 11:27:10 +08:00
Zongjun Lan
f6b9ade20a * Fix bug #49335 2022-02-23 11:07:27 +08:00
tanghucheng
09450e0023 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_tanghucheng_49697 2022-02-23 10:59:35 +08:00
tanghucheng
adb6f14e59 * Code for task #49697. 2022-02-23 10:39:51 +08:00
王怡栋
545ba95f90 * code for task #49372. 2022-02-23 09:55:38 +08: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
孙广明
054dd42a65 Merge branch 'sprint/185_zhangzilong_49284' into 'sprint/185'
*Fix bug 19780.

See merge request easycorp/zentaopms!1895
2022-02-23 01:21:39 +00:00
zhangzilong
8d9439d0e6 * Fix bug #19780. 2022-02-23 08:57:32 +08:00
tanghucheng
6b2bc49830 * Finish task #49409. 2022-02-22 16:59:09 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tanghucheng
422811bcbd * code for task #49697. 2022-02-21 17:01:42 +08:00
王怡栋
0cb4581eec Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Finish task #49697.

See merge request easycorp/zentaopms!1856
2022-02-21 05:21:01 +00:00
tanghucheng
510e7397d4 * Finish task #49697. 2022-02-21 13:12:51 +08:00
zhangzilong
4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
zhengrunyu
aa444513d6 * Finish task 49283. 2022-02-17 16:13:24 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tianshujie
e22bd59961 * Fix bug #19306. 2022-02-16 09:57:17 +08:00
hufangzhou
f9cc2702f9 * Fix bug #19649. 2022-02-16 09:24:11 +08:00
liumengyi
5f4b09f661 * Fix bug #19286. 2022-02-08 10:11:31 +08:00
tanghucheng
1506fe5e4c * fix bug #19025. 2022-01-28 13:15:02 +08:00
tanghucheng
6b91759988 * fix bug #19031. 2022-01-28 11:20:17 +08:00
tianshujie
45cbb3d9d6 * Fix bug #19065. 2022-01-27 15:34:49 +08:00
tanghucheng
516001b2eb * Fix bug #19064. 2022-01-27 13:54:06 +08:00
liumengyi
46a1da1935 * Fix bug #18949. 2022-01-25 17:15:45 +08:00
tanghucheng
2e2dc5581b * fix project index and global create card. 2022-01-24 16:48:06 +08:00
孙广明
7e250dfaee Merge branch 'xieqiyu_fixbug_18792' into 'master'
* Fix bug#18792.

See merge request easycorp/zentaopms!1520
2022-01-21 06:35:15 +00:00
tianshujie
fe23db6218 * Finish task #48012. 2022-01-21 12:23:38 +08:00
tianshujie
d38bb533b9 * Restore code. 2022-01-21 09:02:16 +08:00
tianshujie
c3ca6cf370 * Remove useless code. 2022-01-21 08:48:59 +08:00
tianshujie
25ee419afc * Implement the partial refresh function of the task card. 2022-01-20 15:31:10 +08:00
xieqiyu
795d691e8d * Fix bug#18792. 2022-01-20 15:00:16 +08:00
tianshujie
7383bb566d * Modify the question. 2022-01-20 13:49:21 +08:00
tianshujie
ee15a96157 * Achieve smooth refresh of completed tasks. 2022-01-20 13:41:20 +08:00
王怡栋
03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
朱金勇
d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
tianshujie
a66f16dae6 * Modify the code. 2022-01-18 10:02:40 +08:00
tianshujie
1642b2b63f * Fixed the error of creating sub-columns and the update of task cards. 2022-01-18 09:57:19 +08:00
tianshujie
cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
tianshujie
3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
tianshujie
9b5fa61141 * Modify the code logic. 2022-01-17 15:20:17 +08:00
tianshujie
103f9b8935 * Refactored update swimlane code. 2022-01-17 14:54:08 +08:00
chaideqing
250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +08:00
tianshujie
ef66f1418c * Filter out cards from other swimlanes when updating cards. 2022-01-17 12:23:21 +08:00
chaideqing
02bace4f99 * fix bug #18039,task #47399, keep close button is 32px in bug/story/task assignTo page 2022-01-17 11:26:33 +08:00
tianshujie
a42faa10f1 * Fix bug. 2022-01-17 10:22:51 +08:00
tianshujie
a241dc5b11 * Finish task #47350. 2022-01-14 14:51:48 +08:00
Wenrui LI
bee665aeaa * add vision field for task creation. 2022-01-12 15:48:54 +08:00
Wenrui LI
7f0f0fa2eb * check for vision when querying tasks. 2022-01-12 14:44:08 +08:00