Commit Graph
100 Commits
Author SHA1 Message Date
wangyidong dd1331d853 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 17:42:02 +08:00
wangyidong 3384f53fa9 * fix bug. 2021-07-21 17:41:43 +08:00
wangyidong f0bb1eb52b * adjust for changelog. 2021-07-21 08:26:59 +08:00
wangyidong 26bef8c7de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 16:48:34 +08:00
wangyidong eab9f17636 * adjust for english. 2021-07-20 16:48:14 +08:00
wangyidong 68c2583a38 * change AUTHORIZATION to TOKEN. 2021-07-20 14:35:56 +08:00
wangyidong 6f8222ae97 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 14:18:19 +08:00
wangyidong c757f08599 * remove gitlab. 2021-07-20 14:18:06 +08:00
wangyidong 49215a71e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 14:03:21 +08:00
wangyidong 6d897cf2d1 * fix bug for sessionID. 2021-07-20 14:03:06 +08:00
wangyidong 2499c19069 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 11:48:11 +08:00
wangyidong e93daa531e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 11:46:13 +08:00
wangyidong 8aa8534f73 * adjust for sql. 2021-07-20 11:45:53 +08:00
wangyidong d687dbb8f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 11:30:23 +08:00
wangyidong 5377eef475 * adjust for api. 2021-07-20 11:30:09 +08:00
wangyidong c47b37d8d7 * fix bug. 2021-07-20 11:28:10 +08:00
wangyidong 4a5a4956f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 09:59:33 +08:00
wangyidong 54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
wangyidong ab108bd178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 09:05:19 +08:00
wangyidong 8ce3d4de2a * fix error. 2021-07-20 09:04:54 +08:00
wangyidong ad51c0ec88 * adjust for upgrade. 2021-07-19 17:25:59 +08:00
wangyidong 9a88eb8231 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-19 16:48:15 +08:00
wangyidong f11a030bfc * adjust for company dynamic. 2021-07-19 16:47:56 +08:00
wangyidong 9fcf997f96 * adjust for locate url. 2021-07-19 15:11:42 +08:00
wangyidong afa59e5190 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-19 14:43:54 +08:00
wangyidong 53ea62affd * fix bug #13705. 2021-07-19 14:43:36 +08:00
wangyidong 21a3689bb2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 16:49:59 +08:00
wangyidong aa9871385a * fix bug #13618. 2021-07-16 16:49:35 +08:00
wangyidong 2c3c0ce27d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 16:25:19 +08:00
wangyidong 8c43cd0fa6 * adjust for batchedit. 2021-07-16 16:25:02 +08:00
wangyidong 782bb743cd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 15:58:14 +08:00
wangyidong d12f9bd00c * fix bug #13620. 2021-07-16 15:57:41 +08:00
wangyidong 0f11bf5a2c * fix bug #13648. 2021-07-16 15:49:26 +08:00
wangyidong 0eda274189 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 15:01:15 +08:00
wangyidong 4fe3d248cd * fix bug #13699. 2021-07-16 15:00:36 +08:00
wangyidong c787551eb0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:41:25 +08:00
wangyidong eb93e37b04 * fix error. 2021-07-16 14:41:13 +08:00
wangyidong 4c43ac17b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:38:17 +08:00
wangyidong d18d3e3024 * fix error. 2021-07-16 14:37:56 +08:00
wangyidong 5f2f502fc6 * finish task #40312. 2021-07-16 14:32:25 +08:00
wangyidong 3f25c7db97 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 13:49:47 +08:00
wangyidong 5133fd164a * finish task #40311. 2021-07-16 13:45:56 +08:00
wangyidong f63bb9135f * finish task #40307. 2021-07-16 13:45:01 +08:00
wangyidong 6a973517de * finish task #40306. 2021-07-16 13:43:54 +08:00
wangyidong 143d8336b1 * finish task #40304. 2021-07-16 13:28:46 +08:00
wangyidong 92ea15541f * finish task #40299. 2021-07-16 13:03:55 +08:00
wangyidong 268c4e47b7 * finish task #40293. 2021-07-16 13:02:42 +08:00
wangyidong 4c80b77454 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 11:46:01 +08:00
wangyidong f2620f53ec * finish task #40292. 2021-07-16 11:45:43 +08:00
wangyidong 425280996a * finish task #40289. 2021-07-16 11:21:10 +08:00
wangyidong 2017a9cc78 * finish task #40291. 2021-07-16 11:20:23 +08:00
wangyidong 22abf816b9 * finish task #40290. 2021-07-16 11:19:08 +08:00
wangyidong 09f87bbd47 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 13:48:54 +08:00
wangyidong 085f39bc3e * adjust for lang. 2021-07-14 13:48:23 +08:00
wangyidong 83d78bab5f * fix for webhook. 2021-07-14 13:45:19 +08:00
wangyidong 753943fe07 * adjust for pinyin abbr. 2021-07-13 17:38:25 +08:00
wangyidong 9fe62d4386 * finish task #40121. 2021-07-13 17:37:55 +08:00
wangyidong 637acf434a * adjust for show image. 2021-07-13 14:10:27 +08:00
wangyidong c523e60eb0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 13:30:15 +08:00
wangyidong 503815289a * finish task #40114. 2021-07-13 13:29:50 +08:00
wangyidong 6078ae465f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 10:26:36 +08:00
wangyidong ba2c8018d6 * fix for update userview. 2021-07-13 10:24:57 +08:00
wangyidong 71d91cdc54 * fix error. 2021-07-13 09:52:53 +08:00
wangyidong 0cba64db6a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 09:39:25 +08:00
wangyidong 9d95d960e5 * finish task #40005. 2021-07-13 09:38:27 +08:00
wangyidong 3034d24f2c * adjust for task #40020. 2021-07-12 10:09:39 +08:00
wangyidong 846e9f46ba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-09 09:55:58 +08:00
wangyidong 8a8d8c18f3 * adjust for get gitlab by api. 2021-07-09 09:55:07 +08:00
wangyidong 7be1de8381 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-08 13:11:47 +08:00
wangyidong 834d42610c * finish task #40020. 2021-07-08 13:11:27 +08:00
wangyidong fdc8ed02fa * fix bug for richtext in flow. 2021-07-08 13:10:59 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong 396954c678 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-06 17:41:22 +08:00
wangyidong 353529bb6c * adjust for ci-commitResult. 2021-07-06 17:37:03 +08:00
wangyidong 001e93c1f9 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-06 13:50:50 +08:00
wangyidong 3f0aeaf173 * finish task #39793. 2021-07-06 13:34:44 +08:00
wangyidong 79c27570e8 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-05 13:27:12 +08:00
wangyidong b49812bfb6 * finish task #39793. 2021-07-05 13:26:30 +08:00
wangyidong d49a333837 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-05 11:45:27 +08:00
wangyidong 2d47b0e755 * finish task #39793. 2021-07-05 11:45:02 +08:00
wangyidong 790dcefa53 * remove ztCloud. 2021-07-02 16:16:22 +08:00
wangyidong f3681dc1f6 * adjust for gitlab. 2021-07-02 15:00:07 +08:00
wangyidong 6c250a97f9 * finish task #39794. 2021-07-02 14:08:08 +08:00
wangyidong 5016d4751d * finish task #39796. 2021-07-02 11:26:13 +08:00
wangyidong 04faa67fc7 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-02 10:54:43 +08:00
wangyidong 6f4b4588ab * fix for gitlab. 2021-07-02 10:54:24 +08:00
wangyidong c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
wangyidong f98d12dee8 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-01 08:20:21 +08:00
wangyidong f407f70700 * adjust for book. 2021-07-01 08:19:49 +08:00
wangyidong 69e62a08da * adjust for style. 2021-06-29 16:01:06 +08:00
wangyidong cefd614900 * fix bug and adjust for createLink params. 2021-06-29 14:31:58 +08:00
wangyidong bfb6b438dc * adjust for gitlab. 2021-06-29 13:07:56 +08:00
wangyidong 9aec0e4450 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-29 09:11:11 +08:00
wangyidong 5fb6d97efd * adjust error. 2021-06-29 09:10:57 +08:00
wangyidong eba2dbfaab * adjust for svn diff to repo. 2021-06-25 11:19:09 +08:00
wangyidong 18d9724e14 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-25 09:37:41 +08:00
wangyidong d8d49be51f * adjust for check compile status. 2021-06-25 09:36:52 +08:00
wangyidong b77d480ce0 * fix bug. 2021-06-24 15:00:01 +08:00
wangyidong aedf5935d1 + add version and upgrade. 2021-06-24 13:17:04 +08:00
wangyidong d5890caba7 * finish task #38738. 2021-06-24 11:39:43 +08:00