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 |
|
wangyidong
|
16af1cd290
|
* finish task #3099.
|
2017-08-17 16:29:15 +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 |
|
wangyidong
|
79b4d4d97c
|
* finish task #3104.
|
2017-08-16 15:15:05 +08:00 |
|
wangyidong
|
9c0875d961
|
* finish task #3143.
|
2017-08-16 15:00:41 +08:00 |
|
wangyidong
|
84e91fc75a
|
* finish task #3102.
|
2017-08-16 14:24:58 +08:00 |
|
wangyidong
|
ef4cbfd1e3
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-16 13:33:11 +08:00 |
|
wangyidong
|
a25a10d542
|
* finish task #3147 and update HTMLPurifier.
|
2017-08-16 13:32:34 +08:00 |
|
pengjiangxiu
|
0480e28e67
|
* Finish task #3116.
|
2017-08-16 10:03:20 +08:00 |
|
wangyidong
|
d805329387
|
* finish task #3087.
|
2017-08-16 09:51:47 +08:00 |
|
wangyidong
|
bd622e3d23
|
* finish task #3086.
|
2017-08-16 09:36:51 +08:00 |
|
wangyidong
|
25530314a7
|
* finish task #3154.
|
2017-08-15 17:17:15 +08:00 |
|
wangyidong
|
27a57e6ee3
|
* finish task #3158.
|
2017-08-15 17:04:15 +08:00 |
|
wangyidong
|
fc3f537836
|
* finish task #3159.
|
2017-08-15 16:25:25 +08:00 |
|
wangyidong
|
bbe6de3e62
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-15 15:54:27 +08:00 |
|
wangyidong
|
68ac8081c6
|
* finish task #3163.
|
2017-08-15 15:53:54 +08:00 |
|
pengjiangxiu
|
4d72b7752e
|
* Finish task #3138.
|
2017-08-15 13:55:14 +08:00 |
|
pengjiangxiu
|
1c59073663
|
* Finish task #3146.
|
2017-08-15 13:10:43 +08:00 |
|
pengjiangxiu
|
6ebfac505a
|
* Finish task #1081.
|
2017-08-15 11:13:40 +08:00 |
|
pengjiangxiu
|
848f5b4664
|
* Finish task #3121.
|
2017-08-15 10:19:31 +08:00 |
|
wangyidong
|
ce6ac2eb3e
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-14 16:47:17 +08:00 |
|
wangyidong
|
6bd68359da
|
* finish task #3167.
|
2017-08-14 16:46:59 +08:00 |
|
pengjiangxiu
|
69c16a2028
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2017-08-14 16:45:29 +08:00 |
|
pengjiangxiu
|
ff0ff006b3
|
* Finish task #3123.
|
2017-08-14 16:45:22 +08:00 |
|
wangyidong
|
d0f3eb3906
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-14 16:32:53 +08:00 |
|
wangyidong
|
07af0d08b4
|
* finish task #3168.
|
2017-08-14 16:32:30 +08:00 |
|
pengjiangxiu
|
2573fe9562
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2017-08-14 14:34:53 +08:00 |
|
pengjiangxiu
|
184fbce147
|
+ Add update9.4.sql
|
2017-08-14 14:32:20 +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
|
6a9d811614
|
* finish task #3173.
|
2017-08-14 11:05:51 +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
|
6db420de76
|
* adjust for framework page class.
|
2017-08-11 15:02:01 +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 |
|