Commit Graph
1097 Commits
Author SHA1 Message Date
Catouse ee03da5f04 * update buttons style in btn-group. 2020-12-21 17:27:45 +08:00
Catouse c745808f86 * update $.gotoObject method. 2020-12-14 13:43:18 +08:00
hufangzhou e168ba7313 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-14 08:47:06 +08:00
hufangzhou 119b89ef16 * Adjust the code. 2020-12-14 08:46:40 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
Catouse e82c98d242 * update kindeditor to support transfer events from iframe to parent document. 2020-12-11 16:03:17 +08:00
Catouse 894da720a3 * update kindeditor to support transfer events from iframe to parent document. 2020-12-11 16:04:34 +08:00
Catouse 1ef8caaca3 * update zui.js. 2020-12-11 16:02:07 +08:00
wangyidong c858ae19e3 * fix for undelete project. 2020-12-11 15:48:30 +08:00
hufangzhou 936647a9d8 * Fix a bug. 2020-12-10 09:58:38 +08:00
wangyidong 97392669ff * finish task #8600. 2020-12-09 14:29:23 +08:00
wangyidong f841d670dd * fix bug for change encoding. 2020-12-01 14:36:05 +08:00
Catouse 83c4f27330 * fix transferEvent not work as expect of contextDropdown by update zui.js. 2020-11-26 10:49:31 +08:00
Catouse 3014981b9e * support transfer event for contextDropdown by update zui.js. 2020-11-25 13:57:06 +08:00
Catouse 3d14cd6a52 * task #8506, change dropdown to context-dropdown and fix conflict of dropdown-menu with overflow style. 2020-11-24 17:11:06 +08:00
Catouse d6c3ea7967 * update picker files. 2020-11-24 11:13:44 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Catouse ca280c6ab4 * fix nest table not work as expected. 2020-11-13 16:46:07 +08:00
Catouse 08080a1761 * init nest table after sorted rows. 2020-11-13 16:11:45 +08:00
Catouse 42878a4b4f * update zui.js. 2020-11-13 14:21:13 +08:00
Catouse bbfb174ce8 * fix error for "cannot read property bind of undefined". 2020-11-13 14:20:32 +08:00
Catouse a3f3ce5ee2 * task #8347, add global nest toggle to table in page "program/pgmbrowse". 2020-11-13 11:27:39 +08:00
Catouse aac9e22af6 * task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html
# Conflicts:
#	www/js/kindeditor/kindeditor.min.js
2020-11-11 09:58:38 +08:00
Catouse 2593bbe991 * task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html 2020-11-11 09:56:07 +08:00
Catouse 30efec994c * task #8225, bug #3577, improve UI of picker. 2020-11-10 16:58:32 +08:00
Catouse 691048885f * task #8225, bug #3577, improve UI of picker. 2020-11-10 16:58:10 +08:00
Catouse c9e05720eb * update zui.js. 2020-11-03 13:38:11 +08:00
Catouse 1b545986b2 * update zui.js. 2020-11-03 13:37:18 +08:00
Catouse db06f613cd * update zui.js. 2020-11-03 13:21:11 +08:00
Catouse 6aa711cfa7 * support preserve row collapse state for nested table. 2020-11-03 11:52:39 +08:00
Catouse 4352828337 * update zui.js to fix $.zui.uuid method not work as expect in ie11. 2020-10-30 23:36:47 +08:00
Catouse c29fefc36f * update zui.js to fix $.zui.uuid method not work as expect in ie11. 2020-10-30 23:35:35 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
Catouse a2fdaf94f9 * update zui picker files. 2020-10-30 09:51:53 +08:00
Catouse 34f4b5ecec * update zui picker files. 2020-10-30 09:51:31 +08:00
Catouse 5982687445 * update zui picker files. 2020-10-30 09:50:15 +08:00
Catouse 1e6567abd0 * update zui picker files. 2020-10-23 11:02:54 +08:00
z 443bbd0cef * finish task #8069. 2020-10-10 09:30:40 +08:00
Catouse 297bbd6f54 * fix pager and statistic not update as expect in table. 2020-09-25 14:37:54 +08:00
Catouse ba2f7a461f * fix pager and statistic not update as expect in table. 2020-09-25 14:35:04 +08:00
Catouse 5e3a284c9b * task #7962, bug #3329, fix autosize for textarea not work as expected. 2020-09-24 17:43:34 +08:00
Catouse 6a952773e0 * task #7962, bug #3329, fix autosize for textarea not work as expected. 2020-09-24 17:42:57 +08:00
Catouse 66c49c679e * improve style of pieIcon. 2020-09-24 17:12:13 +08:00
Catouse a36cd7c6fc * add $.fn.pieIcon method to draw progress pie icon in program/pgmproject page. 2020-09-24 17:01:56 +08:00
Catouse 8953a6170b * upgrade zui.js. 2020-09-23 17:25:00 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
Catouse a2038434c7 * update jquery for security. 2020-09-09 16:46:46 +08:00
Catouse bc25baec39 * update jquery for security. 2020-09-09 16:46:05 +08:00
Catouse e9a5fabe65 * improve UI of todo dialog view. 2020-09-09 15:59:51 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00