Commit Graph
957 Commits
Author SHA1 Message Date
wangyidong 6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00
Catouse 1d0ce812f7 * fix error when .main-actions is empty. 2019-12-09 11:06:52 +08:00
Catouse add871b1a8 * prevent hotkey for navigation when page with modal opened, task #6643, bug #2240. 2019-12-06 11:18:58 +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 1bbb21bd11 * fix scrollInside option not work as expectly in ie11. 2019-11-22 15:34:48 +08:00
Catouse a3a9897f6e * upgrade jquery. 2019-11-22 11:06: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
Catouse 4cba83d9ed * update zui.js, disabled fixHeader and fixFooter option in ie11 in table. 2019-11-21 15:20:42 +08:00
Catouse e29bf8e2e9 * task #6498, bug #2826. 2019-11-21 13:34:34 +08:00
Yagami e85b63ec85 * Finish task #6541. 2019-11-19 14:36:19 +08:00
Catouse 6de3055964 * add ja language support by update zui. 2019-11-07 11:00:35 +08:00
Catouse 81a8539a36 * add ja language data to kindeditor. 2019-11-05 17:18:56 +08:00
wangyidong 6e2a0996d9 + add for Françalang. 2019-10-16 17:28:10 +08:00
Catouse 033e031ede Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-14 17:01:34 +08:00
Catouse 496d059ed7 * finish task #6423, fix bug #2727. 2019-10-14 17:00:48 +08:00
wangyidong 219dbdb7f3 * finish task #6446. 2019-10-12 10:44:40 +08:00
Catouse 6109ccd641 * fix chosen ‘middle_highlight’ option not work on enable 'max_drop_width' option. 2019-09-16 10:26:04 +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
Catouse 255048e8ff * update kindeditor. 2019-08-16 14:12:29 +08:00
Catouse b46091a3d1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-08-12 16:07:53 +08:00
Catouse 2e66d11a67 * update zui.js. 2019-08-12 16:07:43 +08:00
wangyidong 083df68ae9 * code task #6180. 2019-08-09 10:28:48 +08:00
wangyidong 0d11f9d881 * code for task #6180. 2019-08-07 13:10:07 +08:00
wangyidong 2503a6bb1a * finish task #6180. 2019-08-07 11:32:08 +08:00
Catouse 1b257668c4 * update zui. 2019-07-30 17:03:08 +08:00
Catouse 0052275e90 * update kindeditor. 2019-07-16 11:19:10 +08:00
Catouse 632a099b7f * use english text as default language in zui components. 2019-07-16 11:10:45 +08:00
wangyidong cb87a2b0cf * finish task #6087. 2019-07-15 17:10:52 +08:00
Catouse c6e8ef42ad * update zui. 2019-07-12 14:54:53 +08:00
Catouse a1ebc953e8 * update zui. 2019-07-12 13:26:05 +08:00
Catouse 318a73e989 * update kindeditor. 2019-07-12 10:13:51 +08:00
Catouse 5e5ac2c12b * update kindeditor. 2019-07-12 10:07:04 +08:00
Catouse 7bcbb43707 * update zui. 2019-07-12 09:39:08 +08:00
wangyidong 7234603458 * finish task #5569. 2019-07-11 17:14:19 +08:00
wangyidong 836c00918b * finish task #5956. 2019-07-10 15:56:35 +08:00
Catouse 4bfd3962c6 * update chosen in zui.js. 2019-07-09 13:31:00 +08:00
Catouse b5b299fb21 * fix chosen drop width autoresize not work on first open in testcase/batchCreate view. 2019-07-02 09:49:48 +08:00
Yagami 9072e52365 * Finish task #5808. 2019-06-19 13:10:28 +08:00
Catouse 1a93ba3bcb * update zui js file. 2019-06-10 16:17:24 +08:00
Catouse 4b1d132e4d * update kindeditor. 2019-06-03 16:37:40 +08:00
Catouse 7cd0307f89 * fix ajax modal trigger not work in datatable. 2019-06-03 15:35:10 +08:00
Catouse 65467ed5d9 * fix table checkbox not work. 2019-05-31 16:13:47 +08:00
Catouse ec7839d30c * update chosen files. 2019-05-31 15:08:02 +08:00
Catouse e462f7fbe9 * change default value of chosen option 'max_drop_width' by update zui js file. 2019-05-31 14:27:49 +08:00
Catouse 84bbe0da93 * update zui kindeditor files. 2019-05-31 10:42:34 +08:00
Catouse f15df4e8c6 * upgrade zui files. 2019-05-31 10:11:51 +08:00
wangyidong 13e6d03e1e * add for fix featureBar. 2019-05-28 16:40:12 +08:00
wangyidong 27b5991f94 * fix bug. 2019-05-17 09:33:00 +08:00
Catouse 2f795511ac Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-15 11:50:33 +08:00