Commit Graph

273 Commits

Author SHA1 Message Date
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
fa09186c68 * fix bug for WooYun-2015-137380. 2015-11-03 08:25:03 +08:00
wangyidong
5d7126f5ca * finish task #2335. 2015-11-02 15:30:43 +08:00
wangyidong
abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong
1db6ebc5b1 * fix bug #741. 2015-09-10 14:12:17 +08:00
wangyidong
e0a643cd0b * change projectcommon to projectCommon,productcommon to productCommon. 2015-07-30 15:35:55 +08:00
wangyidong
0345e1a380 * adjust for task #2266. 2015-05-21 13:36:25 +08:00
wangyidong
e673706711 * finish task #2265. 2015-05-04 14:12:55 +08:00
wangyidong
c9f0b9f861 * change for zh-tw. 2015-02-04 15:43:19 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
d1aed6cc98 * fix a bug #652. 2014-11-27 06:46:49 +00:00
Catouse
d330a140c1 * apply status colors. 2014-11-26 10:04:41 +08:00
wangyidong
268435ebe5 * adjust for lang. 2014-11-07 02:35:49 +00:00
ChuJilu
f4a092f574 * finish task #2088 2014-11-04 16:39:26 +08:00
Catouse
989b653d11 * ajusted style of forms. 2014-08-20 09:24:08 +08:00
wangyidong
01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
wangyidong
07c7280a2d * fix a bug. 2014-08-04 05:43:09 +00:00
wangyidong
535a878320 * fix bug #605. 2014-07-29 07:48:55 +00:00
wangyidong
c49bc171fc * finish task #1393. 2014-07-25 05:53:25 +00:00
wangyidong
e1d1c354fb * finish task #1971,1961. 2014-07-23 09:36:03 +00:00
xia0ta0
9b7eb2f9c4 * code for task#1889. 2014-06-17 17:19:15 +08:00
Catouse
e47aa188ae * added default options to datepicker.
* ajusted style of todo/bachcreate opened with modal.
 * added method to jquery object to open iframe modal.
2014-06-06 11:51:11 +08:00
wyd621
26e54d703d * fix a bug. 2014-05-03 03:59:46 +00:00
wyd621
a0e427d4ce * change for zh-tw lang. 2014-05-03 00:52:12 +00:00
wyd621
383d3b7366 + add new version 6.0.beta. 2014-05-03 00:46:55 +00:00
wyd621
d7719a676c * fix a js error. 2014-05-02 09:48:22 +00:00
Catouse
a69a464d8d * fixed style for ie8. 2014-05-02 14:38:06 +08:00
wyd621
1d57b45f1d * fix a js error. 2014-05-02 05:56:34 +00:00
Catouse
d2decf65fc * fixed style. 2014-04-26 19:41:54 +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
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
2f74a7e7e4 * ajusted views of 'todo'. 2014-04-16 13:49:26 +08:00
Catouse
5595ef2e70 * ajusted views of module 'webapp'. 2014-04-14 13:29:01 +08:00
Catouse
33a3e06687 * ajusted views of module 'todo'. 2014-04-09 15:33:40 +08:00
Catouse
d425b767a6 * replaced 'colorbox' with 'modal' in zui. 2014-04-08 13:55:05 +08:00
wyd621
ad56722808 * fix errors. 2014-04-04 03:20:37 +00:00
Catouse
fece501c1c * ajusted views of module 'testcase' & 'testtask'. 2014-03-31 18:08:14 +08:00
Catouse
97ecae2e4f * ajusted views of module 'test'. 2014-03-28 17:53:45 +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
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
wyd621
dd0f637ee3 * adjust code. 2014-03-25 06:39:36 +00:00
Catouse
c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
wyd621
0e6d08a5de * fix a bug #581. 2014-03-20 01:53:04 +00:00
Catouse
9b104801b3 * updated kindeditor, fixed error when edit with code. 2014-03-17 15:37:05 +08:00