Commit Graph
24602 Commits
Author SHA1 Message Date
wangyidong b77d480ce0 * fix bug. 2021-06-24 15:00:01 +08:00
wangyidong aedf5935d1 + add version and upgrade. zentaopms_15.0.3_20210624 2021-06-24 13:17:04 +08:00
wangyidong d5890caba7 * finish task #38738. 2021-06-24 11:39:43 +08:00
wangyidong e22638852f Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-24 11:24:48 +08:00
wangyidong 11b261b4ca * adjust for upgrade. 2021-06-24 11:24:32 +08:00
wangyidong 7556d9cdb3 * adjust for merge xuanxuan. 2021-06-24 10:03:54 +08:00
wangyidong 0da52a84a5 * fix bug #13302. 2021-06-24 10:02:31 +08:00
Hao Sun 7556df707c * add new icon: icon-assets and icon-diamond. 2021-06-23 15:06:53 +08:00
Hao Sun c898114c7c * bug #13286, fix xxs bug. 2021-06-22 16:51:14 +08:00
wangyidong 53baebf38e * finish task #38728. 2021-06-22 16:45:45 +08:00
wangyidong cb31662f7f Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-22 16:02:53 +08:00
wangyidong 353278f136 * adjust for dev module. 2021-06-22 16:01:24 +08:00
Yagami 0cb06aaa53 * Fix code error. 2021-06-22 16:00:57 +08:00
wangyidong 2ca2752120 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-22 15:39:40 +08:00
wangyidong 4e65665a40 * code for task #38701. 2021-06-22 15:39:14 +08:00
Yagami 00e9c35cff * Fix btn border. 2021-06-22 14:25:52 +08:00
wangyidong 4cc730a685 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-22 11:36:46 +08:00
wangyidong 74f01e94bb * finish task #38705. 2021-06-22 11:36:26 +08:00
wangyidong d90c25c7f7 * finish task #38701. 2021-06-22 10:24:42 +08:00
tianshujie98 ff5efc984f * Fix bug of doc module. 2021-06-22 09:22:12 +08:00
Hao Sun f8c9d4ff34 * skip to watch changes for search form. 2021-06-21 17:24:38 +08:00
wangyidong 1af22a4ae1 * finish task #38717. 2021-06-21 16:09:21 +08:00
wangyidong b1b3b88759 * finish task #38722. 2021-06-21 15:58:57 +08:00
wangyidong 4c196fc621 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-21 15:10:22 +08:00
wangyidong 205129859f * finish task #38732. 2021-06-21 15:02:35 +08:00
Yagami b6b31de401 * Finish task #38715. 2021-06-21 14:51:35 +08:00
tianshujie98 14b887c714 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-21 14:49:32 +08:00
tianshujie98 1d6ffcd6b4 * Fix bug #13170. 2021-06-21 14:49:16 +08:00
Yagami 2e0f114c2f * Remove unused field. 2021-06-21 14:40:35 +08:00
Yagami 2366219f2a * Fix error for story link requirement. 2021-06-21 14:37:37 +08:00
tianshujie98 2323481feb * Fix bug #13263. 2021-06-21 14:32:44 +08:00
tianshujie98 61b2439593 * Fix bug 13268. 2021-06-21 14:30:54 +08:00
Yagami b08c1e4fd5 * Finish task #38710. 2021-06-21 14:28:29 +08:00
Yagami b916291293 * Fix code error. 2021-06-21 14:15:12 +08:00
wangyidong b20038e6c2 * finish task #38734. 2021-06-21 13:14:13 +08:00
wangyidong ad99443429 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-21 10:56:17 +08:00
wangyidong d30e533e92 * finish task #38761. 2021-06-21 10:56:04 +08:00
Yagami af3db56e35 * Adjust getRemind condition. 2021-06-21 10:03:51 +08:00
Hao Sun 48a50f9e0a * update datetimepicker. 2021-06-18 09:53:35 +08:00
Hao Sun 16adebed5e * fix remind in dashboard page not show after refresh. 2021-06-17 17:22:00 +08:00
wangyidong d45bb9c4f2 * finish task #38726. 2021-06-17 14:57:30 +08:00
wangyidong ae771f7405 * finish task #39379. 2021-06-17 14:53:29 +08:00
wangyidong 683e3b40e4 * adjust for api send error. 2021-06-17 14:52:18 +08:00
wangyidong 0f9f9ae9f5 * fix bug. 2021-06-17 14:48:58 +08:00
wangyidong 6a0674c3db * fix for api. 2021-06-17 14:48:24 +08:00
wangyidong 82c3c82d23 * adjust for convert to pinyin for picker. 2021-06-17 14:46:54 +08:00
wangyidong aaf5288a6d Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-17 14:30:48 +08:00
wangyidong 6441e05b1d * finish task #38735. 2021-06-17 14:30:30 +08:00
Hao Sun b4d60b8edc * task #38754, bug #11135, only auto append child when user toggle type manually. 2021-06-17 13:33:56 +08:00
Hao Sun 4bc2653e59 * task #38754, bug #11135, support for adding child step for group automatically. 2021-06-17 13:21:16 +08:00