Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
24,573 Commits 2 Branches 292 Tags
1d6ffcd6b4506138e93ff8e8a98b40cb23dd22c2
Commit Graph
24573 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie98 1d6ffcd6b4 * Fix bug #13170. 2021-06-21 14:49:16 +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
Yagami fbd2d87db8 * Verify branch name. 2021-06-16 16:01:57 +08:00
Yagami 93ba2dce18 * Fix an error. 2021-06-16 13:45:07 +08:00
Yagami 93430eae9f * Fix details. 2021-06-16 13:20:19 +08:00
wangyidong 3e626efb0b Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-15 17:28:32 +08:00
wangyidong 17578d3a8c * fix bug. 2021-06-15 17:28:14 +08:00
Yagami 4c84e02be8 * Add new sql. 2021-06-15 14:01:38 +08:00
wangyidong 5e371ace2d * add new version and upgrade. zentaopms_15.0.2_20210612 2021-06-12 15:46:12 +08:00
wangyidong d13ef4c690 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-11 16:51:40 +08:00
wangyidong 4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00
Yagami c8b77f1b0d * Fix bug #1552. 2021-06-08 15:49:10 +08:00
wangyidong 3f7fdecfc4 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-08 13:33:47 +08:00
wangyidong 3893084999 * adjust for mhtml. 2021-06-08 13:33:34 +08:00
holan20180123 64be23b2c5 * Fix bug #12627. 2021-06-07 16:06:09 +08:00
wangyidong 608b41e153 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 14:37:47 +08:00
wangyidong dd9214da2f * adjust for upgrade. 2021-06-07 14:37:32 +08:00
hufangzhou f67ee188dc * Fix bug #13004. 2021-06-07 14:26:03 +08:00
wangyidong aacf8c1e1b Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 14:13:17 +08:00
wangyidong 08de61a26c * fix bug and merge from master. 2021-06-07 14:13:01 +08:00
holan20180123 0080c97b0f Merge branch '15.0' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 13:28:11 +08:00
holan20180123 a055980108 * Add English language file for automation. 2021-06-07 13:27:51 +08:00
hufangzhou fedd2ddc87 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 12:26:32 +08:00
hufangzhou 0942d6a4f7 * Adjust the code. 2021-06-07 12:26:28 +08:00
wangyidong 8d75769726 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-07 11:31:32 +08:00
wangyidong 773356c97c * fix bug for xuanxuan get dept. 2021-06-07 11:30:10 +08:00
holan20180123 af0a85083b * Fix bug #12627. 2021-06-07 09:15:44 +08:00
holan20180123 206dea63bd * Add comments. 2021-06-07 08:56:57 +08:00
wangyidong 9a0512f334 * add zh-tw lang. 2021-06-06 09:46:11 +08:00
wangyidong b6676572f0 * merge from 15.0.beta3. 2021-06-06 09:05:34 +08:00
wangyidong 968c88329a * fix bug. 2021-06-05 15:40:09 +08:00