Commit Graph
7831 Commits
Author SHA1 Message Date
wangyidong 6bd68359da * finish task #3167. 2017-08-14 16:46:59 +08:00
wangyidong 07af0d08b4 * finish task #3168. 2017-08-14 16:32:30 +08:00
wangyidong 5954b34fd8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-14 14:31:40 +08:00
wangyidong 4636f763a2 * finish task #3170. 2017-08-14 14:31:10 +08:00
pengjiangxiu 3e86953b4a * Finish task #3124. 2017-08-14 11:34:42 +08:00
wangyidong 4f43386af8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-14 10:05:57 +08:00
wangyidong b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
pengjiangxiu dccebc7b9a * Finish task #3119. 2017-08-14 09:56:39 +08:00
pengjiangxiu fdd13c2297 * Finish task #3122. 2017-08-11 15:40:54 +08:00
pengjiangxiu 3953a542fc * Finish task #3164. 2017-08-11 15:19:10 +08:00
pengjiangxiu fdfe48a904 * Finish task #3165. 2017-08-11 15:03:38 +08:00
wangyidong de0acf67ee Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-11 15:02:29 +08:00
wangyidong 359949f582 * finish task #3118. 2017-08-11 15:00:52 +08:00
pengjiangxiu 2d17fc78ec * Finish task #3169. 2017-08-11 14:36:47 +08:00
sgm0422 24a0ed150e * Fix bug #1189. 2017-08-11 11:03:11 +08:00
zhubaoxin 34cd31b93b * Fix Bug #1162. 2017-08-08 18:03:36 +08:00
zhubaoxin f0d3eb3329 * Fix Bug #1171. 2017-08-08 18:02:03 +08:00
zhubaoxin 5d2796ef23 * Fix Bug #1176 and #1175. 2017-08-08 17:58:46 +08:00
zhubaoxin 78898d425e * Fix Bug #1178. 2017-08-08 17:55:52 +08:00
zhubaoxin 0112ba79f9 * Fix Bug #1179. 2017-08-08 17:45:25 +08:00
wangyidong ff56a58b7d * fix bug for search on menu. 2017-08-08 10:12:01 +08:00
wangyidong da39880a1c * adjust code for zentaobiz and fix bug. 2017-08-08 08:21:58 +08:00
sgm0422 619188a569 *Fix Bug #1148 2017-08-03 17:31:43 +08:00
sgm0422 c0a3efe859 * Fix bug: change 'limit' to 'LIMIT'. 2017-08-03 15:09:52 +08:00
zhubaoxin 4e414fe69d * Fix bug #1143. 2017-08-03 09:52:20 +08:00
zhubaoxin a1c10d3a94 * Fix bug #1184. 2017-08-03 09:38:38 +08:00
zhubaoxin 9015fe0c34 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-03 09:04:57 +08:00
zhubaoxin c257df4e18 * Fix bug #1185. 2017-08-03 09:02:30 +08:00
sgm0422 3f882d43f3 * Fix Bug #1149. 2017-08-02 17:32:54 +08:00
sgm0422 bd76d2bca2 * Fix bug #1181. 2017-08-02 17:16:48 +08:00
wangyidong f77214be22 * adjust for merge ext model. 2017-07-28 13:37:05 +08:00
pengjiangxiu 361521adee * Adjust code. 2017-07-25 13:35:16 +08:00
pengjiangxiu bc5f724eaa * Fix bug #1127. 2017-07-24 17:02:57 +08:00
pengjiangxiu c555c79de7 * Adjust code. 2017-07-24 14:05:18 +08:00
pengjiangxiu e6ab3c3fa0 * Change upgrade to V9.4 2017-07-24 14:04:36 +08:00
pengjiangxiu 93e374ddf6 * Fix bug #1140. 2017-07-24 09:12:25 +08:00
pengjiangxiu 594cea2f8c * Fix bug #1112. 2017-07-21 11:27:26 +08:00
pengjiangxiu 8b6b41b19a * Fix bug #1116. 2017-07-21 10:54:17 +08:00
pengjiangxiu 3d218bc5f4 * Fix bug #1122. 2017-07-21 10:33:11 +08:00
pengjiangxiu 9b2e1ab809 * Fix bug #1154. 2017-07-20 16:51:46 +08:00
pengjiangxiu ede8c60761 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-07-20 16:07:18 +08:00
pengjiangxiu 472c167bbd * Adjust code. 2017-07-20 16:03:10 +08:00
wangyidong 39d9f1ace5 Merge branch 'master' of github.com:easysoft/zentaopms 2017-07-20 14:30:58 +08:00
wangyidong 5cf6bd34b8 * adjust for doc view. 2017-07-20 14:30:43 +08:00
pengjiangxiu 1b1d30c782 * Fix bug #1167. 2017-07-20 14:04:14 +08:00
wangyidong d909f2d826 * remove diff method. 2017-07-20 13:04:53 +08:00
pengjiangxiu 54ea128fde * Fix bug #1097. 2017-07-20 11:19:32 +08:00
pengjiangxiu f2c220e6b8 * Fix bug #1129. 2017-07-19 17:02:43 +08:00
pengjiangxiu a0f2e4b2d6 * Fix bug #1172. 2017-07-19 16:43:33 +08:00
pengjiangxiu 8e55b830e9 * Fix bug #1174. 2017-07-19 15:00:11 +08:00