Commit Graph
14262 Commits
Author SHA1 Message Date
Yagami 699e5458d0 * Finish task #5149. 2018-12-12 17:12:43 +08:00
Yagami 83465688f8 * Finish task #5148. 2018-12-12 16:56:08 +08:00
wangyidong 55d9d0fb6f Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-12 16:40:38 +08:00
wangyidong 87209adcb7 * finish task #5152. 2018-12-12 16:39:34 +08:00
Yagami 5307a1fd6c * Finish task #5150. 2018-12-12 15:20:52 +08:00
Yagami 8208a1ea42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-12 10:58:05 +08:00
Yagami 9f48f58bb0 * Fix xuanxuan bug. 2018-12-12 10:57:54 +08:00
wangyidong 89409fe3ef * change for supper xhtml. 2018-12-11 16:38:03 +08:00
wangyidong dfe6066d78 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-11 08:55:20 +08:00
chenfeiCF d0637a83c3 * Finish task #5162. 2018-12-10 15:04:05 +08:00
wangyidong 672b811fe0 * fix bug #2320. 2018-12-10 10:25:11 +08:00
wangyidong a46b37266c * fix bug #2247. 2018-12-10 10:01:53 +08:00
wangyidong 641e48d2d6 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-10 09:45:38 +08:00
wangyidong 71e7c86e3a * fix bug #2318. 2018-12-10 09:44:44 +08:00
Yagami 1974dc2c17 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-10 09:15:16 +08:00
Yagami e08e8fa353 * Fix downloadxxd view. 2018-12-10 09:14:57 +08:00
wangyidong 7e5e4577ec Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-10 09:11:40 +08:00
wangyidong 462e273a9c * finish bug #2330. 2018-12-10 09:11:07 +08:00
chenfeiCF ba34a24db6 * Code for task #5162. 2018-12-09 19:16:09 +08:00
wangyidong 3e74b16398 * adjust for Notification. 2018-12-07 14:52:59 +08:00
wangyidong a34f925fc5 * finish task #5158. 2018-12-07 14:51:47 +08:00
chenfeiCF f476a0acc9 * Code for task #5162. 2018-12-06 18:58:15 +08:00
Yagami 0a8622231f * Finish task #5163,5160. 2018-12-06 10:53:16 +08:00
Yagami 930bca4a11 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-05 14:58:45 +08:00
Yagami adc63ba1fb * Finish task #5163. 2018-12-05 14:57:48 +08:00
wangyidong 0c8f891767 * finish task #5158. 2018-12-05 14:49:13 +08:00
chenfeiCF efdce81b19 * Add zentao extension for xuanxuan and modified Makefile. 2018-12-05 10:43:17 +08:00
chenfeiCF a05b7d4d4e * Add download client method. 2018-12-04 15:52:00 +08:00
chenfeiCF aab0d16d14 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-04 14:52:03 +08:00
chenfeiCF d4b4e911c0 * Code for task #5162. 2018-12-04 14:46:34 +08:00
wangyidong 854caa780e * adjust for 10.1 standard sql. 2018-12-04 14:15:16 +08:00
Yagami 8e296a179b * Delete message modified. 2018-12-04 10:42:33 +08:00
Yagami 930c89e6f9 * Add zentao client setting. 2018-12-04 10:16:45 +08:00
Yagami ae1466a9d4 * Fix bug #2313. 2018-12-03 10:16:18 +08:00
Yagami 9db7dbd35c * Fix doc view css. 2018-12-03 09:33:27 +08:00
Yagami e77c2831eb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-03 09:05:49 +08:00
Yagami 1616c75317 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-03 08:57:06 +08:00
wangyidong c6d628164e * change for zh-tw lang. 2018-11-30 10:57:43 +08:00
wangyidong 9dece26563 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-29 09:53:02 +08:00
wangyidong b0734bc5b8 * fix bug. 2018-11-29 09:52:36 +08:00
Yagami 10f320c56c * Fix feedback bug. 2018-11-28 17:24:50 +08:00
reneeteng 326fb72494 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-28 15:49:24 +08:00
reneeteng 732f7caa68 *Minor change. 2018-11-28 15:48:58 +08:00
Yagami ddef43324a * Fix feedback moudle placeholder. 2018-11-28 15:12:03 +08:00
Yagami a287a86e85 * Fix module for feedback. 2018-11-28 13:49:10 +08:00
Yagami fb9e498ef6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-28 13:05:10 +08:00
Yagami f65f6db2a4 * Add module to feedback. 2018-11-28 13:04:45 +08:00
wangyidong c617950ac2 * adjust code. 2018-11-28 08:57:04 +08:00
wangyidong f69fd87feb * fix bug. 2018-11-27 09:03:01 +08:00
wangyidong 78441e51f9 * adjust for product statistic block. 2018-11-26 10:46:25 +08:00