Commit Graph
137 Commits
Author SHA1 Message Date
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
thanatos 9b9d95f923 update params 2021-09-28 08:58:55 +08:00
dingguodong 7ba0c35e35 * Correct the misspelled word. 2021-09-13 10:45:02 +08:00
Hao Sun 2fb4d5842d * upgrade tablesorter to use option cssNoSort. 2021-09-03 10:27:08 +08:00
wangyidong 0696c67339 * finish task #38645. 2021-06-01 09:19:30 +08:00
Catouse bc25baec39 * update jquery for security. 2020-09-09 16:46:05 +08:00
z 9ad6a18008 * revert jquery and compatible this jquery. 2020-08-06 11:00:47 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
z a7ab0a84a4 * finish task #7303,7316. 2020-07-06 13:19:13 +08:00
Catouse 4e54cf859f * fix code syntax highlighter not work. 2020-04-13 10:27:22 +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 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 40e796caf6 * refactor codes. 2018-05-14 15:10:51 +08:00
pengjiangxiu a0779473fc * Finish task #3220. 2017-09-21 09:10:22 +08:00
Catouse 5d3014cc72 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-09-20 11:16:31 +08:00
Catouse cb35c2a358 * update chosen. 2017-09-20 11:16:24 +08:00
wangyidong f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
wangyidong 49f8f606f6 * fix bug for ajax form. 2017-08-25 16:31:23 +08:00
wangyidong 6a9d811614 * finish task #3173. 2017-08-14 11:05:51 +08:00
wangyidong ed0ed35cbe * fix for doc lib priv. 2017-05-09 13:50:21 +08:00
Catouse c1129597d5 * fix getPreventDefault is deprecated warning. fix #bug 999, finish task #3024. 2017-05-02 10:22:03 +08:00
chenfeiCF 3b6ab707ff * delete useless mobile web file. 2017-03-28 09:43:12 +08:00
wangyidong a34edcfd4a * fix bug #913. 2016-12-30 11:47:02 +08:00
Catouse 97ea6de6b2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-22 11:35:28 +08:00
Catouse 24db1cd1fc * update chosen and code for task #2684. 2016-11-22 11:33:23 +08:00
wangyidong 5765831546 + add new file for syntaxhighlighter. 2016-11-22 09:43:46 +08:00
wangyidong a015353dea * fix for http://www.zentao.net/thread/86375.html. 2016-03-23 10:35:39 +08:00
Catouse 4fc1f5286b * update zui. 2016-03-10 17:46:39 +08:00
Catouse 44d380dd34 * update zui to 1.4. 2016-02-22 13:39:17 +08:00
Catouse 119f3bfb20 * fix placeholder for ie. 2015-11-27 13:30:02 +08:00
Catouse 430a09f33d * finish task #2260: update chosen.js. 2015-05-07 16:02:06 +08:00
Catouse e4d1a204c8 * update zui to version 1.3. 2015-05-07 11:23:33 +08:00
Catouse cf330a9264 * chosen suppot change dropmenu direction. 2015-02-02 16:04:33 +08:00
Catouse f8bb612920 * fixed placeholder in ajax form for ie8. 2014-12-01 17:32:57 +08:00
Catouse 7aa36752a0 * updated chosen. 2014-11-25 14:47:42 +08:00
Catouse dad815c40c * updated chosen.
* ajusted style of chosen contro on 'task/batchCreate'.
2014-11-18 11:51:46 +08:00
wangyidong 084182698d * adjust for exportConfigVars. 2014-08-25 07:18:20 +00:00
wangyidong 60595ffa00 * fix a bug. 2014-08-21 01:43:03 +00:00
Catouse d5f73e47cc - removed unused javascript plugs: alert, autocomplete, colorbox, colorize, dropmenu, jquerytools, bgiframe, incsearch, sorttable, sparkline. 2014-08-19 15:47:18 +08:00
wangyidong 2268964697 * finish task 2058. 2014-08-15 01:21:40 +00:00
Catouse 2762a4a7fb * updated tablesorter. now save sort settings with localstorage and cookie fallback. 2014-07-30 15:46:28 +08:00
Catouse 3b854e6224 * updated zui. 2014-06-09 15:32:52 +08:00
Catouse 1ab9a28455 * updated zui.
* removed resize component from jquery/lib.js.
 * added type attribute to the button in 'printicon' of 'common/control'.
2014-05-04 11:12:46 +08:00
Catouse f4e0c5a8cb * removed jquery sourcemap. 2014-04-28 14:12:08 +08:00
Catouse 3485b105f0 * ajusted style of 'titlebar' & 'featurebar'.
* updated kindeditor & chosen.
2014-04-25 10:36:40 +08:00
Catouse 014b894a9f * added resize plug to ajust iframe modal height automatically.
* moved bgiframe plug to seperate file.
2014-04-16 10:04:31 +08:00
Catouse 8841e75071 * ajusted color set by updated zui resouces.
* ajusted style of 'btn-icon'.
2014-04-08 17:14:40 +08:00
Catouse 0a4b2c07f1 * fixed ajaxform. 2014-04-08 10:40:21 +08:00
xia0ta0 a954e09d53 Merge branch 'zui'
Conflicts:
	module/bug/view/activate.html.php
	module/bug/view/assignto.html.php
	module/bug/view/confirmbug.html.php
	module/bug/view/edit.html.php
	module/bug/view/resolve.html.php
	module/build/view/create.html.php
	module/build/view/edit.html.php
	module/common/model.php
	module/common/view/header.lite.html.php
	module/file/view/edit.html.php
	module/my/view/bug.html.php
	module/product/view/browse.html.php
	module/product/view/close.html.php
	module/product/view/edit.html.php
	module/productplan/view/edit.html.php
	module/project/view/activate.html.php
	module/project/view/batchedit.html.php
	module/project/view/burn.html.php
	module/project/view/close.html.php
	module/project/view/edit.html.php
	module/project/view/putoff.html.php
	module/project/view/start.html.php
	module/project/view/story.html.php
	module/project/view/suspend.html.php
	module/project/view/taskheader.html.php
	module/release/view/edit.html.php
	module/search/view/buildform.html.php
	module/story/view/batchclose.html.php
	module/story/view/change.html.php
	module/task/control.php
	module/task/css/batchcreate.css
	module/task/view/activate.html.php
	module/task/view/assignto.html.php
	module/task/view/batchcreate.html.php
	module/task/view/cancel.html.php
	module/task/view/close.html.php
	module/task/view/create.html.php
	module/task/view/edit.html.php
	module/task/view/finish.html.php
	module/task/view/start.html.php
	module/testtask/view/close.html.php
	module/testtask/view/edit.html.php
	module/testtask/view/start.html.php
	www/theme/default/style.css
2014-03-27 16:27:43 +08:00