Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
9,856 Commits 2 Branches 292 Tags
e1005f67c542e9fc7666fff0694ff512de4f9352
Commit Graph
9856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
pengjiangxiu e1005f67c5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-22 13:05:43 +08:00
pengjiangxiu 61b5f77f91 * Finish task #3201. 2017-08-22 13:05:13 +08:00
wangyidong 1ccf610088 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-22 10:21:11 +08:00
wangyidong 8ea15d424f * finish task #3198. 2017-08-22 10:20:24 +08:00
pengjiangxiu f33cca51e5 * Fix bug for dev api. 2017-08-22 10:06:25 +08:00
pengjiangxiu 1ee4465a04 * Fix dev bug. 2017-08-22 09:52:16 +08:00
pengjiangxiu 624950cfc9 * Finish task #3187. 2017-08-21 16:04:00 +08:00
wangyidong fa707a1464 * code for task #3100. 2017-08-21 16:00:42 +08:00
wangyidong 2e798743cf Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-21 14:48:02 +08:00
wangyidong bfa5ff7352 * finish task #3190. 2017-08-21 14:47:41 +08:00
wangyidong 975a6ba2b9 * fix for ajaxupdatefile. 2017-08-21 14:46:05 +08:00
wangyidong def8ddc634 * finish task #3197. 2017-08-21 14:44:48 +08:00
sgm0422 ee2ec3bb84 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-21 14:27:41 +08:00
sgm0422 26ac9ca6b6 *Fix Bug #1206 2017-08-21 14:17:18 +08:00
pengjiangxiu 547355168d * Finish task #3195. 2017-08-21 13:29:51 +08:00
wangyidong 0479f33e15 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-21 09:09:44 +08:00
wangyidong 3f431a2110 * finish task #3128. 2017-08-21 09:08:38 +08:00
sgm0422 f294f9b181 * Fix Bug #1195. 2017-08-18 16:26:28 +08:00
sgm0422 4db02b2d4e * Fix Bug # 1200 2017-08-18 16:20:24 +08:00
pengjiangxiu 772b339664 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-18 15:21:14 +08:00
pengjiangxiu ef7000ff45 * Adjust code. 2017-08-18 15:20:13 +08:00
wangyidong 653648b3eb Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-18 15:16:14 +08:00
wangyidong 5e267814d0 * finish task #3129. 2017-08-18 15:15:55 +08:00
pengjiangxiu 7f6274c07d * Finish task #1201. 2017-08-18 15:10:07 +08:00
pengjiangxiu 594310a61a * Finish task #1197. 2017-08-18 13:57:11 +08:00
pengjiangxiu 4732bfaebc * Finish task #3184. 2017-08-18 13:51:29 +08:00
wangyidong 223910e142 * finish task #3192. 2017-08-18 13:28:46 +08:00
wangyidong c06e7bfb03 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-18 13:05:06 +08:00
wangyidong 432d852092 * finish task #3156. 2017-08-18 13:04:45 +08:00
pengjiangxiu a8c478c4f2 * Finish task #3183. 2017-08-18 11:32:25 +08:00
wangyidong f090318a7a * finish task #3135. 2017-08-18 11:05:27 +08:00
wangyidong 1359fddbf1 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-18 11:00:55 +08:00
wangyidong d2485c8e82 * finish task #3106. 2017-08-18 11:00:38 +08:00
pengjiangxiu 1998bb4215 * Finish task #3137. 2017-08-18 11:00:29 +08:00
wangyidong abc1180a2a Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-18 11:00:15 +08:00
wangyidong 70a30eb727 * adjust page for editor edit. 2017-08-18 10:59:46 +08:00
wangyidong 257a478940 * fix for show image in file download page. 2017-08-18 10:58:55 +08:00
pengjiangxiu d4c5c73cf2 * Finish task #3150. 2017-08-18 09:34:33 +08:00
wangyidong 16af1cd290 * finish task #3099. 2017-08-17 16:29:15 +08:00
pengjiangxiu e28ceee2d9 * Adjust code for tab to space. 2017-08-17 11:26:42 +08:00
pengjiangxiu 9e34e50947 * Finish task #3111. 2017-08-17 10:31:21 +08:00
pengjiangxiu 6c19289354 * Finish task #3126. 2017-08-16 17:18:45 +08:00
wangyidong 8d909478e2 * finish task #3136. 2017-08-16 16:52:45 +08:00
wangyidong 865146cc4c Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-16 16:44:43 +08:00
wangyidong 9a974c6c93 * finish task #3142. 2017-08-16 16:44:19 +08:00
pengjiangxiu 22d2a45563 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-08-16 16:27:29 +08:00
pengjiangxiu 282d166ac5 * Finish task #3131. 2017-08-16 16:26:46 +08:00
wangyidong 0508eefd70 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-16 16:13:05 +08:00
wangyidong e3d3d6f573 * finish task #3109. 2017-08-16 16:12:50 +08:00
pengjiangxiu c6165b16d5 * Finish task #1202. 2017-08-16 15:47:57 +08:00