Commit Graph
17404 Commits
Author SHA1 Message Date
wangyidong 5ea2467bee * finish task #7088. 2020-05-06 10:38:09 +08:00
wangyidong d369ccdab6 * adjust for php error. 2020-05-05 09:28:23 +08:00
wangyidong c3dcb85546 Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-30 16:43:14 +08:00
wangyidong dfc8de0b65 * finish task #7085. 2020-04-30 16:42:52 +08:00
leiyong d1c545d078 * Finish task#7104. 2020-04-30 00:56:51 -07:00
leiyong 091ae4cf3d Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-30 00:56:14 -07:00
wangyidong 576c22593d * finish task #7076. 2020-04-30 15:31:26 +08:00
leiyong e8527692f5 * Finish task#7100. 2020-04-29 23:19:51 -07:00
wangyidong d299f0236b Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-30 13:11:18 +08:00
wangyidong 3e26e60560 * finish task #7091. 2020-04-30 13:10:08 +08:00
leiyong 3492d60def Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-29 20:27:00 -07:00
leiyong 98e1d4f45b * Finish task#7102. 2020-04-29 20:26:49 -07:00
wangyidong 1e5576a961 * fix bug. 2020-04-30 11:21:29 +08:00
wangyidong 2a6cfab35e Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-30 10:40:24 +08:00
wangyidong 3e837dc80e * finish task #7087. 2020-04-30 10:31:49 +08:00
leiyong 14e489b812 * Fix bug#7109. 2020-04-29 02:54:46 -07:00
leiyong c551170d6b * finish task#7112,#7113,#7111. 2020-04-29 02:02:51 -07:00
leiyong ad0c86afde Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-29 00:44:59 -07:00
wangyidong 3b21a74564 * finish task #7081. 2020-04-29 13:25:08 +08:00
leiyong 85a55e41bd * Finish task#7109. 2020-04-28 02:29:20 -07:00
wangyidong 2d8fcc75e5 * adjust for get dingding user. 2020-04-28 16:56:34 +08:00
wangyidong 2372831886 * finish task #7075. 2020-04-28 16:31:18 +08:00
wangyidong 1c29b742a0 * finish task #7079. 2020-04-28 13:26:10 +08:00
wangyidong 43c181767b * finish task #7083. 2020-04-28 13:22:32 +08:00
wangyidong 442d70773a * finish task #7074. 2020-04-27 14:22:20 +08:00
wangyidong c92500975c * finish task #7071. 2020-04-27 13:42:01 +08:00
wangyidong 19b3819fd6 * finish task #7070. 2020-04-27 13:33:51 +08:00
wangyidong 08c8461844 * finish task #7069. 2020-04-27 13:23:39 +08:00
wangyidong 7ae499cf70 * finish task #7068. 2020-04-27 11:29:08 +08:00
wangyidong e0b54c87ef * fix bug for search testcase. 2020-04-27 11:13:03 +08:00
wangyidong 1a0090189a * finish task #7064. 2020-04-27 10:13:30 +08:00
wangyidong 899cd6f78b * fix bug #2404. 2020-04-26 17:35:15 +08:00
wangyidong 7407085500 * adjust for show import. 2020-04-26 17:33:42 +08:00
wangyidong 1e54605dcc * fix bug #3109. 2020-04-24 16:30:26 +08:00
wangyidong 468c11e1c3 * code for bug #3099. 2020-04-23 15:30:52 +08:00
wangyidong fc5de2944e * fix bug #3099. 2020-04-23 14:47:32 +08:00
wangyidong 3e1701b360 * fix bug for show hignlight. 2020-04-22 08:16:13 +08:00
wangyidong df7c4cd39d Merge branch 'master' of github.com:easysoft/zentaopms 2020-04-17 08:28:52 +08:00
wangyidong 3e1795e257 * fix bug and config ur and sr. 2020-04-17 08:19:55 +08:00
Catouse ba78293a26 * fix help link in ja language. 2020-04-15 10:41:13 +08:00
Catouse a620a53fa5 * fix help link in ja language. 2020-04-15 10:23:49 +08:00
chenfei 22489cc23b * Could add extra attribute when create data by editor. 2020-04-15 09:53:44 +08:00
wangyidong 5f912e1a2f * fix for sync commit. 2020-04-13 14:19:36 +08:00
wangyidong 63f545f870 * adjust var name. 2020-04-13 12:07:31 +08:00
wangyidong 2f3e0b3199 Merge branch 'master' of github.com:easysoft/zentaopms zentaopms_12.3.stable_20200413 2020-04-13 11:04:23 +08:00
wangyidong 3aded5bbff * fix vi lang bug. 2020-04-13 11:03:40 +08:00
Catouse 4e54cf859f * fix code syntax highlighter not work. 2020-04-13 10:27:22 +08:00
Catouse 499c71fd71 * fix expand/collapse buttons in histories view not work as expected in modal. 2020-04-13 10:27:22 +08:00
wangyidong a6dc715a73 * fix bug. 2020-04-13 09:40:09 +08:00
wangyidong 04f23e6334 * adjust for show result. 2020-04-10 17:04:02 +08:00