wangyidong
|
36c1a6d2c4
|
* finish task #6647.
|
2019-12-04 16:10:06 +08:00 |
|
Yagami
|
383a2e236b
|
* Finish task #6579.
|
2019-11-27 10:05:25 +08:00 |
|
Catouse
|
5b02546da1
|
Revert "* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787."
This reverts commit f98ea2c6de.
# Conflicts:
# www/js/jquery/lib.js
|
2019-11-25 16:37:57 +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 |
|
Yagami
|
7166433796
|
* Fix task #6489.
|
2019-11-21 13:15:08 +08:00 |
|
Yagami
|
97a65c43a7
|
* Finish task #6489.
|
2019-11-21 09:13:31 +08:00 |
|
Yagami
|
e85b63ec85
|
* Finish task #6541.
|
2019-11-19 14:36:19 +08:00 |
|
Catouse
|
81a8539a36
|
* add ja language data to kindeditor.
|
2019-11-05 17:18:56 +08:00 |
|
Catouse
|
033e031ede
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-10-14 17:01:34 +08:00 |
|
Catouse
|
6282d8c6dd
|
* format code.
|
2019-10-14 17:01:18 +08:00 |
|
Yagami
|
e0a667b5f8
|
* Finish task #6405.
|
2019-10-11 14:20:22 +08:00 |
|
wangyidong
|
e841301ad5
|
* fix bug #2723.
|
2019-09-04 16:00:01 +08:00 |
|
Catouse
|
f90da50eb7
|
* fix bug #2608, task #6318, call convertURL immediately to kill bug.
|
2019-09-03 17:33:22 +08:00 |
|
wangyidong
|
e7cc784534
|
* finish task #6281,6282.
|
2019-08-29 10:57:40 +08:00 |
|
liugang
|
9c53dd8e6b
|
* Use the function zget to get users.
|
2019-07-30 17:33:59 +08:00 |
|
Yagami
|
8d26d61fb1
|
* Finish task #6162.
|
2019-07-29 16:53:48 +08:00 |
|
wangyidong
|
5ace83db9a
|
* adjust for sendmail.
|
2019-07-26 17:48:52 +08:00 |
|
wangyidong
|
9b2174e001
|
* adjust for code style.
|
2019-07-26 15:48:56 +08:00 |
|
wangyidong
|
f1b0faf11b
|
* adjust sortable file.
|
2019-07-24 09:35:40 +08:00 |
|
wyd621
|
f858660ceb
|
Merge branch 'master' into zentaopms_workflow
|
2019-07-24 09:14:23 +08:00 |
|
wangyidong
|
169a0fa5fb
|
* adjust for import js/css with js::import/css::import.
|
2019-07-18 16:51:01 +08:00 |
|
wangyidong
|
2671f7a044
|
* finish task #6090.
|
2019-07-15 15:56:31 +08:00 |
|
wangyidong
|
e71d8fa75f
|
* fix bug for select table.
|
2019-07-12 15:23:14 +08:00 |
|
wangyidong
|
49d3fce657
|
* code task #5569.
|
2019-07-12 10:29:44 +08:00 |
|
wangyidong
|
7234603458
|
* finish task #5569.
|
2019-07-11 17:14:19 +08:00 |
|
liugang
|
01674bdde5
|
* Fix bug of sortable.html.php.
|
2019-07-11 15:02:19 +08:00 |
|
Catouse
|
26643f3b79
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2019-07-11 14:29:40 +08:00 |
|
Catouse
|
22de5cc42c
|
* fix orders incorrect.
|
2019-07-11 14:29:33 +08:00 |
|
wangyidong
|
f47be36c0c
|
* finish task #6017.
|
2019-07-11 13:41:06 +08:00 |
|
jinianlan
|
60e7014ef7
|
* finish task #6020,#6009,#6007,#5949
|
2019-07-10 13:41:13 +08:00 |
|
Yagami
|
b6eef9472d
|
* Fix table position.
|
2019-07-01 17:23:09 +08:00 |
|
Yagami
|
f3fe328188
|
* Finish task #5914.
|
2019-07-01 16:15:52 +08:00 |
|
wangyidong
|
20ebda13e2
|
* code for task #5627.
|
2019-06-10 09:18:21 +08:00 |
|
Catouse
|
3dd89c46d0
|
* change kindeditor usage.
|
2019-05-31 10:56:43 +08:00 |
|
wangyidong
|
aca82aeded
|
* finish task #5578.
|
2019-05-30 17:41:44 +08:00 |
|
chenfeiCF
|
ae10b5ad4d
|
* Fix bugs.
|
2018-12-20 16:27:39 +08:00 |
|
wangyidong
|
ad609850ab
|
* code for task #5156,5147.
|
2018-12-18 17:20:57 +08:00 |
|
wangyidong
|
3e74b16398
|
* adjust for Notification.
|
2018-12-07 14:52:59 +08:00 |
|
chenfeiCF
|
d4b4e911c0
|
* Code for task #5162.
|
2018-12-04 14:46:34 +08:00 |
|
Catouse
|
391838d5b5
|
* code for task #5074.
|
2018-11-20 10:43:18 +08:00 |
|
Catouse
|
b8ccb1542e
|
* code for task #5074.
|
2018-11-20 09:10:12 +08:00 |
|
wangyidong
|
4809e3d1ea
|
* adjust code.
|
2018-11-19 14:43:49 +08:00 |
|
Catouse
|
d8250402c4
|
* finish task #5074.
|
2018-11-16 11:00:26 +08:00 |
|
Catouse
|
514b23c7f4
|
* finish task #5115.
|
2018-11-15 16:34:13 +08:00 |
|
Catouse
|
ceed1e4821
|
* finish task #5141.
|
2018-11-15 15:39:42 +08:00 |
|
Catouse
|
f724c7ddb6
|
* fix ajaxform not work.
|
2018-11-15 10:18:14 +08:00 |
|
chenfeiCF
|
2b47dbed37
|
* Finish task #5085.
|
2018-11-12 14:20:59 +08:00 |
|
Catouse
|
94547ee4c7
|
* update kindeditor, finish task #5014 and fix bug #2082.
|
2018-10-15 14:27:08 +08:00 |
|
Catouse
|
f1317bd1d8
|
* finish task #4990 and fix bug #2199.
|
2018-10-12 15:16:26 +08:00 |
|
Catouse
|
f8064bb042
|
* finish task #4950.
|
2018-09-27 11:27:17 +08:00 |
|