Commit Graph
14422 Commits
Author SHA1 Message Date
wangyidong ca688aa2f8 * finish task #5182. 2018-12-29 14:54:51 +08:00
wangyidong 0435d14b74 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 14:24:59 +08:00
wangyidong 0e3ef4a715 * finish task #5185. 2018-12-29 14:24:31 +08:00
Yagami e8c04da4b0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-29 14:04:27 +08:00
Yagami 851bcc28b3 * Finish task #5192. 2018-12-29 14:04:09 +08:00
wangyidong 4e2a7e8189 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 13:58:39 +08:00
wangyidong 0db6ff757c * finish task #5189. 2018-12-29 13:58:07 +08:00
Yagami 3d850bdc0a * Fix task 5190. 2018-12-29 13:43:29 +08:00
Yagami 3d34eb42e8 * Finish task #5190. 2018-12-29 13:41:36 +08:00
wangyidong 5f5ee0f9cd Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 09:11:37 +08:00
wangyidong 659b454228 * finish task #5168. 2018-12-29 09:10:58 +08:00
Catouse 16e6d54a97 * finish task #5173 and bug #2325. 2018-12-28 21:01:51 +08:00
Catouse 00b075ad9c * finish task #5175 and fix bug #2304. 2018-12-28 20:35:21 +08:00
Yagami 125fecef58 * Fix task #5170. 2018-12-28 14:27:38 +08:00
Yagami 5b98a87ddd * Finish task #7219. 2018-12-28 10:57:41 +08:00
wangyidong b883da3ec9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-26 15:53:19 +08:00
Catouse 798350dc73 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-26 15:52:58 +08:00
Catouse 841cb608cc * hide sidebar when collapsed. 2018-12-26 15:52:47 +08:00
wangyidong 8735d788e6 * adjust for task #5180. 2018-12-26 15:51:53 +08:00
wangyidong e5f728c77b Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-26 11:08:00 +08:00
wangyidong 0063b4a86d * update zentao-integrated. 2018-12-26 11:07:21 +08:00
Yagami 923e4fb8fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-26 10:30:57 +08:00
Yagami da57fc447d * Finish task #5170. 2018-12-26 10:30:34 +08:00
wangyidong 4554a44aae * finish task #5172. 2018-12-26 09:47:05 +08:00
wangyidong 2bd37a479e * fix bug for tutorial. 2018-12-26 09:34:26 +08:00
wangyidong d2a90b0287 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-25 17:41:25 +08:00
wangyidong a7996d0b51 * adjust for xx server. 2018-12-25 17:40:42 +08:00
Yagami e724e43770 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-25 17:16:05 +08:00
Yagami b17a9b5262 * Fix xuanxuan priv. 2018-12-25 17:15:30 +08:00
wangyidong 5a36a96970 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-25 14:15:37 +08:00
wangyidong 46cfd4c19a * adjust for xuanxuan server. 2018-12-25 14:14:08 +08:00
Catouse 267834a69e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-25 13:56:40 +08:00
Catouse be7391f643 * fix close button not show when open datetimepicker panel by update zui. 2018-12-25 13:56:22 +08:00
Yagami f0e2285964 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-25 13:02:38 +08:00
Yagami b390c49da8 * Finish task #5167. 2018-12-25 13:02:09 +08:00
wangyidong 815b60d9e4 * update zentao-integrated.zip. 2018-12-25 09:05:13 +08:00
Yagami 184bb7114d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-24 16:38:43 +08:00
Catouse 2e8e82f65e * update zui css file. 2018-12-24 16:37:04 +08:00
Yagami 55a9c65279 * Fix task create view. 2018-12-24 15:05:54 +08:00
wangyidong 9602746cab * replace zentao-integrated. 2018-12-24 14:48:00 +08:00
Yagami 3f7d659bcc * Move my/ext/view to block/ext/view. 2018-12-24 10:45:02 +08:00
wangyidong 60cbbfe8a1 * fix bug for onlybody. 2018-12-24 10:32:06 +08:00
wangyidong 89efeaca7f * adjust for with xuanxuan. 2018-12-21 15:02:48 +08:00
chenfeiCF 391d407c9f * Adjust submit lable. 2018-12-21 14:27:12 +08:00
wangyidong 94af546018 * hide back button in xuanxuan. zentaopms_11.0.stable_20181221 2018-12-21 13:49:22 +08:00
wangyidong 4fd5c5f4ef * change for zh-tw lang. 2018-12-21 13:37:59 +08:00
chenfeiCF ba46426f03 * Add client help manual link. 2018-12-21 13:36:30 +08:00
wangyidong 0db5be7da1 * fix for upgrade. 2018-12-21 13:19:34 +08:00
wangyidong 1586f7428c * add zh-tw lang. 2018-12-21 13:06:14 +08:00
wangyidong 73ef25cd9c * add for xuanxuan group. 2018-12-21 12:03:36 +08:00