 guanxiying
|
a1ebb34bb5
|
* Fix quote of storyCommon.
|
2019-11-22 13:50:54 +08:00 |
|
|
Catouse
|
294082c425
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-22 15:35:34 +08:00 |
|
|
Catouse
|
1bbb21bd11
|
* fix scrollInside option not work as expectly in ie11.
|
2019-11-22 15:34:48 +08:00 |
|
|
guanxiying
|
d4f8465fe8
|
* Add forward concept setting codes.
|
2019-11-22 12:08:31 +08:00 |
|
|
Yagami
|
5cfb8cc8d8
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-22 13:10:19 +08:00 |
|
|
Yagami
|
f207e3e12d
|
* Finish task #6495.
|
2019-11-22 13:09:44 +08:00 |
|
|
wangyidong
|
35aa95d49e
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-22 11:10:50 +08:00 |
|
|
wangyidong
|
0ad697012f
|
* set concept setted in upgrade.
|
2019-11-22 11:10:09 +08:00 |
|
|
Catouse
|
723b36f2e7
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-22 11:07:01 +08:00 |
|
|
Catouse
|
a3a9897f6e
|
* upgrade jquery.
|
2019-11-22 11:06:57 +08:00 |
|
|
Catouse
|
cfeda25b43
|
* task #6513, bug #2805.
|
2019-11-22 11:06:48 +08:00 |
|
|
wangyidong
|
41c693d07a
|
* finish task #6488.
|
2019-11-22 10:37:50 +08:00 |
|
|
guanxiying
|
e4d0ca4ff6
|
* Fix bug 2790.
|
2019-11-21 17:15:18 +08:00 |
|
|
wangyidong
|
2d500ae75c
|
* code for task #6566.
|
2019-11-21 16:49:08 +08:00 |
|
|
wangyidong
|
c0e0423c09
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 16:20:45 +08:00 |
|
|
wangyidong
|
b93dd94b05
|
* code for task #6548.
|
2019-11-21 16:19:59 +08:00 |
|
|
Catouse
|
8833851bee
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 16:15:49 +08:00 |
|
|
Catouse
|
f98ea2c6de
|
* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787.
|
2019-11-21 16:15:44 +08:00 |
|
|
wangyidong
|
ebf78655dc
|
* fix error.
|
2019-11-21 16:03:39 +08:00 |
|
|
wangyidong
|
5ce0a2ca78
|
* code for task #6566.
|
2019-11-21 16:02:44 +08:00 |
|
|
guanxiying
|
0f74d12896
|
* Revert httponly param when set lang and theme cookie.
|
2019-11-21 15:41:41 +08:00 |
|
|
Catouse
|
4cba83d9ed
|
* update zui.js, disabled fixHeader and fixFooter option in ie11 in table.
|
2019-11-21 15:20:42 +08:00 |
|
|
Catouse
|
b374a515a1
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 15:19:23 +08:00 |
|
|
Catouse
|
4b53a604b8
|
* task #6530, bug #2782.
|
2019-11-21 15:19:18 +08:00 |
|
|
guanxiying
|
62c2d8cb9d
|
* Add ini_set session.cookie_httponly.
|
2019-11-21 14:33:07 +08:00 |
|
|
guanxiying
|
5aa701c747
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 14:23:06 +08:00 |
|
|
Catouse
|
624cd00335
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 14:22:30 +08:00 |
|
|
Catouse
|
7734d23fea
|
* fix border of input-group controls in task/create view.
|
2019-11-21 14:22:10 +08:00 |
|
|
guanxiying
|
adcd079064
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 14:21:08 +08:00 |
|
|
wangyidong
|
79271a23db
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 14:20:52 +08:00 |
|
|
guanxiying
|
bad6bbd39c
|
* Add httpOnly param when setcooki.
|
2019-11-21 14:20:11 +08:00 |
|
|
Catouse
|
827db2d03f
|
* task #6525, bug #2791.
|
2019-11-21 14:19:33 +08:00 |
|
|
wangyidong
|
861ec58fcb
|
* code for task #6566.
|
2019-11-21 14:17:52 +08:00 |
|
|
Catouse
|
60f0192d57
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 14:03:32 +08:00 |
|
|
Catouse
|
e572742f27
|
* task #6501, bug #2819.
|
2019-11-21 14:03:07 +08:00 |
|
|
reneeteng
|
9e46b973ad
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 14:01:21 +08:00 |
|
|
reneeteng
|
5888e67b28
|
* Dingding lang updated.
|
2019-11-21 14:00:16 +08:00 |
|
|
wangyidong
|
79155cd834
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 13:59:51 +08:00 |
|
|
wangyidong
|
c0ab373ce7
|
* code for task #6566.
|
2019-11-21 13:57:49 +08:00 |
|
|
reneeteng
|
742510a708
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 13:52:48 +08:00 |
|
|
Yagami
|
abab3bb475
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 13:50:40 +08:00 |
|
|
Yagami
|
6a0af253dc
|
* Fix task #6489.
|
2019-11-21 13:50:01 +08:00 |
|
|
guanxiying
|
27e470b249
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 13:35:12 +08:00 |
|
|
Catouse
|
e29bf8e2e9
|
* task #6498, bug #2826.
|
2019-11-21 13:34:34 +08:00 |
|
|
guanxiying
|
aa22a31176
|
* Use projectCommon.
|
2019-11-21 13:32:27 +08:00 |
|
|
guanxiying
|
4e481bed19
|
* Add httpOnly param when setcookie.
|
2019-11-21 13:31:35 +08:00 |
|
|
guanxiying
|
230dcd7dd7
|
* Setcookie with httpOnly param.
|
2019-11-21 13:30:49 +08:00 |
|
|
Catouse
|
cba8bc5b32
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-11-21 13:22:19 +08:00 |
|
|
Catouse
|
deea96e652
|
* task #6514, bug #2804.
|
2019-11-21 13:22:10 +08:00 |
|
|
wangyidong
|
485fdde5e0
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2019-11-21 13:16:41 +08:00 |
|