wangyidong
|
58529a4e79
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-24 17:27:56 +08:00 |
|
wangyidong
|
3eb18b024f
|
* remove space in php file.
|
2017-08-24 17:27:11 +08:00 |
|
pengjiangxiu
|
0965b0520b
|
* add version stable.
zentaopms_9.5.stable_20170824
|
2017-08-24 14:21:23 +08:00 |
|
pengjiangxiu
|
ea306d3f3b
|
* change lang file.
|
2017-08-24 14:03:58 +08:00 |
|
wangyidong
|
15ebe3b532
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-24 13:55:27 +08:00 |
|
wangyidong
|
66eabe8717
|
* fix for mail no subject.
|
2017-08-24 13:54:58 +08:00 |
|
pengjiangxiu
|
37b6e7eb5f
|
添加了v9.5 upgrade信息.
|
2017-08-24 10:46:37 +08:00 |
|
pengjiangxiu
|
a96bb17752
|
* * Adjust for bug batch activate.
|
2017-08-24 09:40:53 +08:00 |
|
wangyidong
|
affcf9b642
|
* adjust for block safe.
|
2017-08-24 09:20:45 +08:00 |
|
wangyidong
|
153006237e
|
* not save session in json.
|
2017-08-23 15:59:08 +08:00 |
|
wangyidong
|
51d786989c
|
* adjust for action.
|
2017-08-23 15:48:05 +08:00 |
|
wangyidong
|
9dce33c3df
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-23 14:56:32 +08:00 |
|
wangyidong
|
094c960bf4
|
* finish task #3088.
|
2017-08-23 14:55:49 +08:00 |
|
pengjiangxiu
|
202d76db45
|
* Adjust code.
|
2017-08-23 13:08:06 +08:00 |
|
wangyidong
|
0ee04f80d1
|
* adjust for browse type style in show files page.
|
2017-08-23 09:53:09 +08:00 |
|
wangyidong
|
386f68277d
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-23 09:53:05 +08:00 |
|
wangyidong
|
64880a3071
|
* fix for search in import case from lib.
|
2017-08-23 08:21:53 +08:00 |
|
Catouse
|
22ed90761e
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2017-08-22 15:33:51 +08:00 |
|
Catouse
|
7a318c92ab
|
* support open todo view modal on load page with hash prefix 'todo-'.
|
2017-08-22 15:33:45 +08:00 |
|
Catouse
|
caf304be98
|
* finish task #3155 and fix bug #1093.
|
2017-08-22 14:36:33 +08:00 |
|
Catouse
|
c0237c0648
|
* remove console.log.
|
2017-08-22 14:35:54 +08:00 |
|
Catouse
|
4ae7325f5b
|
* update zui.
|
2017-08-22 14:35:40 +08:00 |
|
wangyidong
|
b09ad76835
|
* adjust for safe.
|
2017-08-22 14:18:56 +08:00 |
|
wangyidong
|
b0c67d90bb
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-22 13:44:49 +08:00 |
|
wangyidong
|
34b794e39a
|
* fix error.
|
2017-08-22 13:44:34 +08:00 |
|
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 |
|
Catouse
|
27c423399d
|
* finish task #3721.
|
2017-08-21 19:15:19 +08:00 |
|
Catouse
|
9194c158b8
|
* finish task #3194.
|
2017-08-21 18:53:33 +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 |
|