Commit Graph
14735 Commits
Author SHA1 Message Date
Yagami 5b2fd6932f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-27 09:23:40 +08:00
Yagami 79b3576354 * Finish task #5267. 2019-02-27 09:23:03 +08:00
wangyidong 4bc280c4e4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 09:12:33 +08:00
wangyidong c9a7fa9d64 * add office doc. 2019-02-27 09:11:49 +08:00
Yagami 1bcf0a3b53 * Fix module icon. 2019-02-26 17:09:20 +08:00
Yagami f6a7d0b07f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-26 17:03:45 +08:00
Yagami a22d3b6c30 * Remove some testcase code. 2019-02-26 17:00:58 +08:00
wangyidong 7cd83b47da Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-26 16:50:14 +08:00
wangyidong 216c6f5c0e * adjust for custom timezone. 2019-02-26 16:49:49 +08:00
Yagami 8505e577ac * Code for task #5295. 2019-02-26 16:40:34 +08:00
Yagami 21ed530fee * Code for task #5306. 2019-02-26 15:24:26 +08:00
Yagami efe734f04a * Code for task #5284. 2019-02-26 14:28:26 +08:00
Yagami e35a268a31 * Code for task #5294. 2019-02-26 14:11:37 +08:00
Yagami a238cff296 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-26 14:06:55 +08:00
Yagami c31b04da67 * Code for task #5267. 2019-02-26 14:06:07 +08:00
reneeteng fbc7a9c274 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-26 13:42:09 +08:00
reneeteng 97f55a77fa *Lang change. 2019-02-26 13:41:41 +08:00
wangyidong 2d9d78fd8c * adjust for sort lib. 2019-02-26 11:45:18 +08:00
wangyidong 337e3771e5 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-26 11:03:27 +08:00
wangyidong 62513a6045 * adjust for remove gtalk field. 2019-02-26 11:01:38 +08:00
reneeteng ce28283a5a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-26 10:30:28 +08:00
reneeteng c05c534b12 * Lang change. 2019-02-26 10:29:53 +08:00
wangyidong b9b7fbdceb * adjust for doc dropdown-menu max-height. 2019-02-25 17:35:38 +08:00
wangyidong 916844595b Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-25 16:42:34 +08:00
wangyidong 750550d9ed * code task #5302. 2019-02-25 16:42:02 +08:00
reneeteng 8c83211b1a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-25 16:11:38 +08:00
reneeteng 6d62d929c8 *Lang change. 2019-02-25 16:11:00 +08:00
wangyidong 0226ae1a9e * code for task #5302. 2019-02-25 14:52:40 +08:00
wangyidong 0f7f6d4e9a * adjust for hidden module item in tree page. 2019-02-25 14:23:48 +08:00
wangyidong 373aedfc0b * finish task #5297. 2019-02-25 14:09:57 +08:00
wangyidong 5ed0ed92fd * code for task #5302. 2019-02-25 13:59:27 +08:00
wangyidong b392cde948 * code for task #5302. 2019-02-25 11:46:34 +08:00
wangyidong 178527100c * code for task #5271. 2019-02-25 11:26:51 +08:00
wangyidong 5b23f6aba9 * finish task #5275. 2019-02-25 10:51:49 +08:00
wangyidong 62386800f2 * finish task #5308. 2019-02-25 10:46:10 +08:00
wangyidong a1ed14507f * finish task #5302. 2019-02-25 09:13:49 +08:00
wangyidong 7d1a2d4d7f * remove useless code. 2019-02-25 09:01:30 +08:00
wangyidong 36de63e1fe Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-25 08:54:56 +08:00
wangyidong 3e7caa0da1 * finish task #5271. 2019-02-25 08:43:53 +08:00
Yagami 79659b0282 * Fix common lang. 2019-02-24 09:39:12 +08:00
Yagami 8278e84b87 * Code for task #5271. 2019-02-23 16:19:17 +08:00
Yagami 07fe890768 * Code for task #5271. 2019-02-23 14:43:24 +08:00
Yagami 3daae171f0 * Delete yahoo and wangwang field. 2019-02-23 13:44:51 +08:00
Yagami 447b20b53b * Finish task #5298. 2019-02-23 13:21:57 +08:00
Yagami 6225b8aecb * Finish task #5306. 2019-02-23 13:16:24 +08:00
Yagami 7d53d77799 * Fix createLib width. 2019-02-23 09:28:39 +08:00
Yagami 68799f265e * Finish doc type width. 2019-02-22 17:16:53 +08:00
Yagami 344ed8f38b * Finish task #5290. 2019-02-22 15:31:40 +08:00
Yagami 3656c218a9 * Finish task #5292. 2019-02-22 15:25:22 +08:00
Yagami 466667de7e * Finish task #5294. 2019-02-22 15:01:32 +08:00