Commit Graph
14797 Commits
Author SHA1 Message Date
reneeteng 75dc4d1bde * Lang change. 2019-04-03 15:43:20 +08:00
reneeteng cb2f2d34ef Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-15 14:47:02 +08:00
reneeteng eadba8d52e * Lang change. 2019-03-15 14:39:36 +08:00
Yagami e741e9e3b2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-15 13:28:08 +08:00
Yagami 08f9a09730 * Fix bug #2467. 2019-03-15 13:27:22 +08:00
reneeteng 817d27221a *Lang change. 2019-03-14 16:07:28 +08:00
reneeteng 76ece9e5eb *Lang change. 2019-03-14 14:20:48 +08:00
reneeteng 305d9cb998 *Lang change. 2019-03-14 09:53:18 +08:00
reneeteng 84e5d05697 *Lang change. 2019-03-14 09:40:46 +08:00
reneeteng e1d0caecc1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-12 14:48:54 +08:00
reneeteng e7eac913f7 *Lang change. 2019-03-12 14:48:24 +08:00
reneeteng abcf528228 *Lang change. 2019-03-12 14:44:29 +08:00
Yagami e05ed035f6 * Fix lastEditDate bug. 2019-03-11 17:17:11 +08:00
reneeteng bdde3be91e *lang change. 2019-03-11 15:48:46 +08:00
reneeteng d2d5b68e4d *lang change. 2019-03-11 14:48:37 +08:00
reneeteng 625f60db4c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-11 14:37:29 +08:00
reneeteng 5ddda7b3af *Lang change. 2019-03-11 14:37:03 +08:00
Catouse 3ff00a6e3c * update zui css file. 2019-03-09 15:47:39 +08:00
Yagami ef5a3f7652 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-08 15:20:05 +08:00
Yagami bcd7340a59 * Fix bug #2452. 2019-03-08 15:19:38 +08:00
wangyidong 1db41e5805 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-08 14:50:00 +08:00
wangyidong 487e802420 * finish task #7499. 2019-03-08 14:48:50 +08:00
reneeteng 5598c283cf *Lang change 2019-03-07 10:52:59 +08:00
reneeteng c829383362 *Lang change. 2019-03-06 17:21:35 +08:00
reneeteng cba64ef5a7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-05 16:47:18 +08:00
reneeteng c0184eca09 * Lang change. 2019-03-05 16:46:10 +08:00
Yagami 64cce4dbb0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-28 15:49:27 +08:00
Yagami 0c9b5eb208 * Fix user icon. 2019-02-28 15:48:52 +08:00
wangyidong ad09223066 * adjust for demo data. 2019-02-28 10:41:31 +08:00
chenfeiCF 296290f9c8 * Set acl default when create product or project. 2019-02-28 09:55:45 +08:00
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