Commit Graph
6044 Commits
Author SHA1 Message Date
Catouse 054e2e863b * fixed method 'linkButton'. 2014-04-03 18:00:55 +08:00
Catouse 859b028150 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-04-03 17:29:30 +08:00
Catouse 5ae05232fb * updated method 'linkButton'. 2014-04-03 17:29:19 +08:00
wyd621 0f3d95c3fa Merge branch 'master' of github.com:easysoft/zentaopms 2014-04-03 08:37:14 +00:00
xia0ta0 b9a1d3e723 Merge branch 'master' of github.com:easysoft/zentaopms 2014-04-03 16:17:34 +08:00
xia0ta0 8f0f8255be * fix bug: chosen had not been refreshed. 2014-04-03 16:13:54 +08:00
Catouse d2a30ecfb0 * ajusted views of moduel 'user'. 2014-04-03 15:01:15 +08:00
wyd621 4744483c11 Merge branch 'master' of github.com:easysoft/zentaopms 2014-04-03 01:09:48 +00:00
wyd621 4c427d8c60 * fix errors. 2014-04-03 01:08:51 +00:00
Catouse f1183fed54 * ajusted views of module 'group' & 'company'. 2014-04-02 17:38:57 +08:00
Catouse f27c705c00 * ajusted views of module 'report'. 2014-04-02 15:03:01 +08:00
Catouse 59bc3f6e65 * ajusted views. 2014-04-02 10:37:35 +08:00
wyd621 e3d60141b9 * fix errors. 2014-04-02 00:47:07 +00:00
Catouse 37fa3e65bd * updated method 'setModal' in 'my.full.js'.
* ajusted views of module 'doc'.
2014-04-01 16:43:18 +08:00
Catouse b0b422a5e1 * ajusted views of module 'doc'. 2014-04-01 15:50:47 +08:00
Catouse 0186028fc5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-04-01 15:15:10 +08:00
Catouse e02f41daa4 * ajusted views of module 'testtask'. 2014-04-01 15:14:58 +08:00
wyd621 9a327f7650 Merge branch 'master' of github.com:easysoft/zentaopms 2014-04-01 06:22:16 +00:00
wyd621 11873405cc * fix a bug. 2014-04-01 06:21:41 +00:00
Catouse 9e1acb9c15 * ajusted views of module 'testcase' & 'testtask'. 2014-04-01 11:34:36 +08:00
Catouse fece501c1c * ajusted views of module 'testcase' & 'testtask'. 2014-03-31 18:08:14 +08:00
xia0ta0 48824e2688 * revert old style. 2014-03-31 16:50:54 +08:00
xia0ta0 92bdf3e61f * fix my.min.js. 2014-03-31 16:11:43 +08:00
Catouse 98afc277a3 * ajusted views of module 'bug'. 2014-03-31 11:38:43 +08:00
wyd621 98efc661af * fix a bug. 2014-03-28 11:43:24 +00:00
Catouse 97ecae2e4f * ajusted views of module 'test'. 2014-03-28 17:53:45 +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 285a010037 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/project/view/build.html.php
2014-03-27 16:38:54 +08:00
xia0ta0 bdb2a4258c * merge branch zui. 2014-03-27 16:34:30 +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
wyd621 91497edc0f * fix a bug for showImport. 2014-03-27 06:59:24 +00:00
Catouse 230ccd34b3 * fixed a css error. 2014-03-27 14:45:15 +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 86b1296734 * ajusted views of module .product'. 2014-03-26 15:43:55 +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 4fb25dbd77 * added language support to the chosen control.
* added some icons definitions.
2014-03-25 16:12:49 +08:00
wyd621 dd0f637ee3 * adjust code. zentaopms_5.3.stable_20140326 2014-03-25 06:39:36 +00:00
Catouse a1c3b8582e * ajusted views of module 'project'. 2014-03-25 14:07:37 +08:00
Catouse c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
wyd621 6b78cbc325 * change for zh-tw. 2014-03-25 02:43:14 +00:00
wyd621 f9b210c075 * change for burn. 2014-03-25 02:43:02 +00:00
wyd621 0ceae4a8b2 * fix for upgrade. 2014-03-25 02:42:27 +00: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 3c35abc8af * fix a bug. 2014-03-24 08:09:51 +00:00
wyd621 515467317b Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 07:29:17 +00:00