Commit Graph
14767 Commits
Author SHA1 Message Date
wangyidong 57a491bbc6 * fix for check priv. zentaopms_11.3.stable_20190228 2019-02-28 08:40:55 +08:00
chenfeiCF e171290300 * Adjust code. 2019-02-27 17:03:16 +08:00
Yagami 5861a3cbd9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-27 17:01:44 +08:00
Yagami dcc120573d * Fix get user data method. 2019-02-27 17:00:49 +08:00
chenfeiCF ab8550d762 * Adjust edit view of doc lib. 2019-02-27 14:47:04 +08:00
wangyidong 22ca9b8fa4 * adjust standard sql. 2019-02-27 14:28:15 +08:00
wangyidong 00ce24a83b * adjust for zentao db. 2019-02-27 14:17:18 +08:00
wangyidong d119c79739 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 14:10:09 +08:00
wangyidong 8846db5269 * fix error. 2019-02-27 14:09:34 +08:00
Yagami fb4b4ad844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-27 13:55:40 +08:00
Yagami b784b389a2 * Fix case title. 2019-02-27 13:55:03 +08:00
Yagami 7c612806dd * Fix testcase buttoni title. 2019-02-27 13:53:39 +08:00
wangyidong 330c083dd2 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 13:48:43 +08:00
wangyidong bf2e434f2c * revert upgrade xuanxuan. 2019-02-27 13:48:19 +08:00
chenfeiCF 7162d7782b Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 13:35:19 +08:00
chenfeiCF 35c33e50ed * Adjust en lang. 2019-02-27 13:34:35 +08:00
wangyidong 366a7de5c5 * adjust for execute xuanxuan. 2019-02-27 13:27:09 +08:00
wangyidong 40062df83f * adjust for zh-tw lang. 2019-02-27 13:11:25 +08:00
wangyidong 050e369d2a * adjust for upgrade. 2019-02-27 12:03:05 +08:00
wangyidong 484b1c5979 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 11:16:36 +08:00
wangyidong c39d922321 * adjust for create doc. 2019-02-27 11:15:34 +08:00
chenfeiCF da31d14cbf * Adjust lang of doc. 2019-02-27 11:13:57 +08:00
wangyidong ee7a90ed2b * adjust for zh-cn lang. 2019-02-27 11:10:24 +08:00
wangyidong 97e3e68add Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 10:53:50 +08:00
wangyidong e3f51c9a19 * adjust for copy title. 2019-02-27 10:53:30 +08:00
chenfeiCF 230f1fd18d * Show acl tips when create doc lib. 2019-02-27 10:49:29 +08:00
wangyidong a92e598a09 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 10:41:31 +08:00
wangyidong 9010446b9e * adjust for get git author. 2019-02-27 10:41:08 +08:00
chenfeiCF 8ec8643dd6 * Adjust doc lib acl. 2019-02-27 10:22:53 +08:00
wangyidong a9d0721eb7 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-27 09:44:09 +08:00
wangyidong 8f1b0fe119 * adjust table width for en lang. 2019-02-27 09:43:14 +08:00
Yagami 02a52aec5a * Fix button. 2019-02-27 09:29:27 +08:00
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