Commit Graph
609 Commits
Author SHA1 Message Date
z b1cd0ed599 * code for task #7600. 2020-08-06 13:36:41 +08:00
Catouse c2b35db7d1 * fix picker undefined error in some pages without import picker js. 2020-08-06 10:48:30 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
Catouse 7d1f51118f * task #7372, bug #3196, fix datatable line height in firefox. 2020-07-27 10:24:44 +08:00
z 4502545269 * revert datatable tr height. 2020-07-27 09:15:41 +08:00
Catouse 11f71b3cf4 * fix table setting button now show after hot refresh table. 2020-07-24 09:30:35 +08:00
z be145c47e6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-23 13:02:53 +08:00
Catouse 38a7d60b21 * task #7414, bug #3095, fix file manager not work on upload images in kindeditor. 2020-07-23 11:08:25 +08:00
z 227ccdd17d * finish task #7372. 2020-07-23 09:32:23 +08:00
z a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
z c43f0fd426 * adjust for zh-tw lang. 2020-07-07 11:24:23 +08:00
z 3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +08:00
leiyong 6a2ce5fade * Finish task#7105. 2020-04-30 01:47:19 -07:00
Catouse 4e54cf859f * fix code syntax highlighter not work. 2020-04-13 10:27:22 +08:00
wangyidong 9e83e63996 * code for php7.4. 2020-03-18 16:48:14 +08:00
Catouse 3f608337a0 * fix js error in french language. 2020-03-18 09:35:35 +08:00
wangyidong cb60f926d9 * adjust code. 2019-12-25 17:35:52 +08:00
Catouse 4517f9f4fd * fix cannot select text in kindeditor in ie11, task #6671, bug #2888. 2019-12-17 14:37:38 +08:00
Catouse 4ea90b2f0d * add ja language to zui and kindeditor. 2019-12-17 09:34:42 +08:00
Catouse b45f5c8a68 * add multi-language support, and fix UI of table statistic. 2019-12-16 17:42:26 +08:00
wangyidong b68c0ace0f * finihsh task #6669. 2019-12-12 08:59:19 +08:00
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