Commit Graph
223 Commits
Author SHA1 Message Date
xia0ta0 3477298ca4 Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-10 11:32:38 +08:00
xia0ta0 0399ee3358 * fix bug#647. 2014-12-10 11:27:55 +08:00
Catouse c58c386c59 * fix duplicate references of chosen. 2014-12-09 17:12:30 +08:00
wangyidong ca30b0775f * finish task #2138. 2014-11-03 07:30:41 +00:00
xia0ta0 f5b311cd0f * fix bug: get stories of custom child module error. 2014-10-30 14:50:06 +08:00
xia0ta0 4fedcd4234 * fix bug of fixModulePath. 2014-10-15 15:20:35 +08:00
wangyidong 2088a01aee * fix bug #610. 2014-08-26 07:34:16 +00:00
wangyidong 60595ffa00 * fix a bug. 2014-08-21 01:43:03 +00:00
xia0ta0 41c3ffae4f Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/search/view/buildform.html.php
2014-08-20 10:54:50 +08:00
wangyidong de50683bc3 * finish task #2050. 2014-08-18 09:02:04 +00:00
wangyidong 165f5e86a5 Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-12 08:38:48 +00:00
chujilu f56e7c0b14 * adjust code 2014-08-12 16:16:26 +08:00
wangyidong 01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
chujilu 46f9884495 * adjust code 2014-08-12 15:49:32 +08:00
chujilu e596a80929 * fix bug: can't edit module name 2014-08-12 10:34:02 +08:00
wangyidong e6797bddde * finish task #1945. 2014-07-25 02:44:47 +00:00
Catouse 60410b8185 * fixed errors of function 'setModal' in my.full.js. 2014-07-25 10:03:52 +08:00
wangyidong f062b3cb61 * adjust ajax modal. 2014-07-25 01:31:50 +00:00
wangyidong 0c610eb33f * code for task #1971. 2014-07-24 01:54:48 +00:00
wangyidong e1d1c354fb * finish task #1971,1961. 2014-07-23 09:36:03 +00:00
xia0ta0 6525e86598 * fix error of check.php. 2014-06-24 16:14:33 +08:00
xia0ta0 4f15887eb1 * adjust zh-tw. 2014-06-24 15:33:20 +08:00
xia0ta0 a410db00ca * code for task#1873. 2014-06-20 09:18:07 +08:00
wangyidong 7d67d5da39 * finish task #1897. 2014-06-18 08:13:54 +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 ac8bdc8483 * fixed function 'syncModule' in 'tree/browse.js'. 2014-05-02 16:37:46 +08:00
Catouse a84ef67f6d * ajusted grid layout.
* ajusted style of treeview.
2014-05-02 10:37:15 +08:00
Catouse 6193014130 * change 'featurebar' to 'titlebar' and ajust style. 2014-04-23 17:56:18 +08:00
Catouse dd38f997ca * ajusted size of form layout. 2014-04-18 15:41:44 +08:00
Catouse be03af7fae * ajusted style of tree. 2014-04-18 13:58:06 +08:00
Catouse b8b96ddbaf * ajusted style of tree. 2014-04-16 11:16:17 +08:00
Catouse 59e08a2c72 * ajusted views. 2014-04-15 17:35:20 +08:00
Catouse d425b767a6 * replaced 'colorbox' with 'modal' in zui. 2014-04-08 13:55:05 +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 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 c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
wyd621 b1fbc91821 * adjust code format. 2014-03-21 02:48:50 +00:00
wyd621 3445055125 * change for zh-tw. 2014-03-20 02:43:52 +00:00
Catouse bcb765b393 * ajusted style of views in module prodcut. 2014-03-19 17:39:56 +08:00
wyd621 0c9211a2b1 * fix a bug for batchcreate task. 2014-03-19 01:21:25 +00:00
wyd621 7ce1b3428d * fix a bug for http://www.zentao.net/thread-view-83210.html. 2014-03-18 07:14:27 +00:00
wyd621 34f0183944 * fix a bug. 2014-03-18 01:09:42 +00:00
xia0ta0 a529d5f6a8 * code for task#565. 2014-03-13 15:26:08 +08:00
xia0ta0 de40baa427 * code for task#1844. 2014-03-07 11:06:42 +08:00
xia0ta0 75f57adbfb * code for task#1786. 2014-03-04 14:58:16 +08:00
xia0ta0 427ee4c7f9 * code for task#1786. 2014-03-03 10:24:53 +08:00
xia0ta0 279537e525 * code for task#1786. 2014-03-03 10:10:04 +08:00
xia0ta0 cccc568124 * code for task#1782. 2014-02-28 15:57:29 +08:00