Commit Graph
609 Commits
Author SHA1 Message Date
wangyidong 83710606cc Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/task/view/create.html.php
2014-06-18 08:31:39 +00:00
wangyidong 7d67d5da39 * finish task #1897. 2014-06-18 08:13:54 +00:00
xia0ta0 78ea03f55c * code for task #1894. 2014-06-18 15:40:15 +08:00
xia0ta0 0337b3337f * code for task#1894. 2014-06-18 09:37:01 +08:00
wangyidong c2f16c22cb * finish task #1918. 2014-06-17 06:03:27 +00:00
Catouse bade5dfd2c * fixed a bug: page not reload when close modal on story/view. 2014-06-09 16:16:39 +08:00
Catouse 12a026a0c9 * removed heading prefix from view 'task/editestimate'. 2014-05-04 13:24:06 +08:00
wyd621 9616d8a7a9 Merge branch 'master' of github.com:easysoft/zentaopms 2014-05-03 00:52:41 +00:00
wyd621 a0e427d4ce * change for zh-tw lang. 2014-05-03 00:52:12 +00:00
Catouse 73510fe9bd * fixed error for ie8.
* ajusted style of 'task/recordestimate'.
 * fixed style of 'tree/browse' for ie8-11.
2014-05-03 08:38:33 +08:00
Catouse f48cf3ba98 * fixed style of contact menu in form. 2014-05-02 17:30:25 +08:00
Catouse 4c32052c8d * fixed style for ie8.
* ajuste style of 'project/burn'.
2014-05-02 16:02:17 +08:00
Catouse c5a3cf0be7 * ajusted form padding of 'file/export'.
* fixed size of textarea for firefox.
 * removed unused code from common.css.
2014-05-02 13:39:32 +08:00
Catouse a84ef67f6d * ajusted grid layout.
* ajusted style of treeview.
2014-05-02 10:37:15 +08:00
Catouse 78f6ae4206 * fixed style of featurebar for ie8-11.
* changed side header icon of 'doc/browse'.
 * changed icon of datepicker for 'task/start'.
2014-04-30 09:09:01 +08:00
Catouse 86fbb0201f * ajusted style of 'task/batchcreate'.
* ajusted style of search form.
2014-04-28 20:38:16 +08:00
xia0ta0 a4b32fbc8b * adjust en lang. 2014-04-28 15:36:39 +08:00
Catouse a3985d73d7 * ajusted style. 2014-04-25 18:10:59 +08:00
Catouse fde4ff5610 * remove default text from chosen.
* fixed css class of some tables.
 * ajusted style of form.
 * ajusted ui of searchbox.
2014-04-25 16:20:36 +08:00
Catouse 977f199c83 * ajusted layout. 2014-04-25 14:03:22 +08:00
Catouse 3485b105f0 * ajusted style of 'titlebar' & 'featurebar'.
* updated kindeditor & chosen.
2014-04-25 10:36:40 +08:00
Catouse 359a37cd65 * ajusted style of treeview.
* removed contentedittable instead of orgin textarea.
2014-04-24 15:58:26 +08:00
Catouse 924f8fbc8c * ajusted style. 2014-04-23 17:41:39 +08:00
Catouse 4c7561b704 * changed options to call chosen. 2014-04-21 13:12:18 +08:00
Catouse 8e21998053 * fixed style to compatible with firefox. 2014-04-18 17:41:09 +08:00
Catouse dd38f997ca * ajusted size of form layout. 2014-04-18 15:41:44 +08:00
Catouse d6916ee145 * fixed style. 2014-04-18 10:31:14 +08:00
Catouse 59e08a2c72 * ajusted views. 2014-04-15 17:35:20 +08:00
Catouse 388dcbd8ec * ajusted views of module 'install', 'upgrade'.
* fixed css selector when call chosen method.
2014-04-11 17:04:27 +08:00
Catouse d7f4d75c16 * ajusted views of module 'admin', 'bug', 'doc', 'task' & 'testcase'. 2014-04-10 20:42:44 +08:00
Catouse fad52a610f * ajusted option of chosen.
* removed empty option in selection with chosen.
2014-04-10 16:19:03 +08:00
Catouse d425b767a6 * replaced 'colorbox' with 'modal' in zui. 2014-04-08 13:55:05 +08:00
Catouse 0a4b2c07f1 * fixed ajaxform. 2014-04-08 10:40:21 +08:00
wyd621 ad56722808 * fix errors. 2014-04-04 03:20:37 +00:00
xia0ta0 8f0f8255be * fix bug: chosen had not been refreshed. 2014-04-03 16:13:54 +08:00
Catouse fece501c1c * ajusted views of module 'testcase' & 'testtask'. 2014-03-31 18:08:14 +08:00
Catouse 98afc277a3 * ajusted views of module 'bug'. 2014-03-31 11:38:43 +08:00
Catouse 561f39afe8 * ajusted views.
* fixed iframe modal method in 'my.full.js'.
2014-03-28 11:06:06 +08:00
Catouse fc322ea3cf * ajusted views of module project.
* changed css names.
2014-03-27 17:57:35 +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
Catouse ad3a1c29b8 * ajusted views.
* changed css names.
2014-03-27 14:40:55 +08:00
Catouse 99c8a0554e * ajusted views. 2014-03-27 09:12:38 +08:00
Catouse aa96761a82 * changed css names.
* added method 'setSyncTrigger' in 'my.full.js'.
2014-03-26 15:44:57 +08:00
Catouse e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
Catouse 1ff011f641 * ajusted views of module 'project'. 2014-03-25 19:57:12 +08:00
Catouse c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
xia0ta0 870102ee0f Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 16:38:59 +08:00
xia0ta0 12dac1ce57 * code for task#1835. 2014-03-24 16:33:20 +08:00
wyd621 515467317b Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 07:29:17 +00:00
xia0ta0 0d3c384895 Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 14:25:40 +08:00