Commit Graph
807 Commits
Author SHA1 Message Date
wangyidong eda06bcdc4 * fix bug #29680. 2022-11-30 14:55:45 +08:00
wangyuting cf769403ea * Fix bug #30132. 2022-11-24 06:17:14 +00:00
tianshujie 37c83b3d36 * Fix bug #29714. 2022-11-18 14:58:10 +08:00
tianshujie e3ea28a384 * Modified the way text overruns are displayed in flowcart. 2022-11-10 08:20:05 +08:00
wangyuting 2c336ec7dd * Finish task #74157. 2022-11-09 06:02:58 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie 278c4779f6 * Modify the list of issues in the block to be processed. 2022-10-28 15:59:17 +08:00
tianshujie fb546c1176 * Fix bug #29035. 2022-10-28 15:17:08 +08:00
tianshujie c3dd9a3bf2 * Fix bug #29004. 2022-10-28 10:24:53 +08:00
tianshujie 6367bdf450 * Fix bug #29036. 2022-10-28 08:46:31 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi abbbbecc9e * Modify block page style. 2022-10-27 08:57:27 +08:00
tianshujie 49da824085 * Remove useless code. 2022-10-27 08:17:42 +08:00
tianshujie f54ab6edc4 * Finish task #73749. 2022-10-26 15:41:44 +08:00
tianshujie 99e6e88e76 * Finish task #73748. 2022-10-26 15:40:59 +08:00
tianshujie 324245db52 * Finish task #73748. 2022-10-26 15:38:03 +08:00
tianshujie dbb7a17464 * Finish task #73746. 2022-10-26 15:30:11 +08:00
tianshujie f1fb4cf2f9 Merge branch 'sprint/253_tianshujie_dashboard' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/253_tianshujie_dashboard 2022-10-26 14:58:44 +08:00
tianshujie 58e4192fe2 * Finish task #73746. 2022-10-26 14:58:27 +08:00
caoyanyi 7b545e9a25 * Code for task #73763. 2022-10-26 14:35:36 +08:00
tianshujie 03276390b2 * Finish task #73749. 2022-10-26 14:09:18 +08:00
tianshujie b7a0d76922 * Finish task #73749. 2022-10-26 14:06:52 +08:00
tianshujie d7af949b90 * Finish task #73732. 2022-10-26 14:05:08 +08:00
tianshujie 935faa00bd * Finish task #73752. 2022-10-26 14:01:04 +08:00
wangyidong ed271d5360 * fix bug #28961. 2022-10-26 13:56:38 +08:00
tianshujie 9d5c06cc6d * Finish task #73748. 2022-10-26 13:30:28 +08:00
tianshujie cea28c452c * Finish task #73749. 2022-10-26 13:25:40 +08:00
tianshujie 308a8b9f5e * Finish task #73750. 2022-10-26 13:15:38 +08:00
tianshujie 826eb771b9 * Finish task #73732. 2022-10-26 11:04:29 +08:00
tianshujie 012e867e40 * Finish task #73731. 2022-10-26 10:52:42 +08:00
tianshujie 38e08733f9 * Finish task #73733. 2022-10-26 09:58:46 +08:00
tianshujie 970f06cf05 * Finish task #73734. 2022-10-26 09:55:51 +08:00
wangyidong 6854d16d4e * code for task #71672. 2022-10-24 14:44:20 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
tianshujie 4245745bec * Finish task #72351. 2022-10-17 16:31:40 +08:00
曹延义 5a91f0130a * Adjust code. 2022-10-11 16:42:42 +08:00
曹延义 d4b88eaf41 * Adjust code. 2022-10-11 16:41:10 +08:00
曹延义 7cd098a613 * Fix bug #28453. 2022-10-11 16:15:33 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
zhouxin 0cfb69ac5b * Finish task #71836. 2022-10-10 15:23:22 +08:00
wangyidong 50c365d5b0 * code for task #71604. 2022-10-09 14:26:59 +08:00
wangyidong cd92d5bc1b * code for task #71604. 2022-10-09 10:45:23 +08:00
wangyidong bd2f3df6af * code for task #71602. 2022-10-09 09:24:04 +08:00
liugang 7d5afa5d62 * Finish task #70751. 2022-09-26 17:43:09 +08:00
tanghucheng d8e0bae8c8 * Finish task #69594. 2022-09-19 16:56:30 +08:00
sunguangming c1300115e7 * Code for task #69026/69027. 2022-09-15 09:29:17 +08:00
wangyidong 4092d95876 * code for task #68204. 2022-09-07 15:01:27 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
孙广明 a321b87f1c Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
2022-09-06 00:42:27 +00:00
liumengyi ed38cf6969 * Fix bug #25409. 2022-09-05 14:31:53 +08:00