Commit Graph

65 Commits

Author SHA1 Message Date
wangyidong
080ea27752 * code for task #1971,1961. 2014-07-22 09:10:00 +00:00
wangyidong
d81b64dafd * code for task #1971 #1961. 2014-07-22 08:11:04 +00: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
a3985d73d7 * ajusted style. 2014-04-25 18:10:59 +08:00
Catouse
3485b105f0 * ajusted style of 'titlebar' & 'featurebar'.
* updated kindeditor & chosen.
2014-04-25 10:36:40 +08:00
Catouse
4c7561b704 * changed options to call chosen. 2014-04-21 13:12:18 +08:00
Catouse
d6916ee145 * fixed style. 2014-04-18 10:31:14 +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
d425b767a6 * replaced 'colorbox' with 'modal' in zui. 2014-04-08 13:55:05 +08:00
xia0ta0
8f0f8255be * fix bug: chosen had not been refreshed. 2014-04-03 16:13:54 +08:00
Catouse
561f39afe8 * ajusted views.
* fixed iframe modal method in 'my.full.js'.
2014-03-28 11:06:06 +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
1ff011f641 * ajusted views of module 'project'. 2014-03-25 19:57:12 +08:00
wyd621
0c9211a2b1 * fix a bug for batchcreate task. 2014-03-19 01:21:25 +00:00
xia0ta0
26ac079e7b * code for task#1810. 2014-03-13 17:01:39 +08:00
wwccss
b5ef3a87f6 Merge branch 'master' of git@github.com:easysoft/zentaopms 2014-03-12 17:06:28 +08:00
wwccss
38be92fde0 * code for task#1829. 2014-03-12 17:04:01 +08:00
xia0ta0
b88842b4c0 * code for task#1830. 2014-03-12 16:35:57 +08:00
xia0ta0
2afdcdd5cc * code for task#1780. 2014-03-07 14:32:44 +08:00
xia0ta0
a5a87935b9 * code for task#1780. 2014-02-28 10:46:09 +08:00
wyd621
be04f5efac * fix bug #514. 2013-10-09 03:20:14 +00:00
xia0ta0
a215237c50 Merge branch 'master' of github.com:easysoft/zentaopms 2013-08-02 09:57:34 +08:00
xia0ta0
c97dd391ac * code for task#1665. 2013-08-02 08:57:23 +08:00
azhi
ce08eaed8d * adjust the placeholder of chosen. 2013-08-02 08:50:36 +08:00
azhi
3ba16ae13a Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-24 14:06:20 +08:00
azhi
901d6f326d * finish task#1614. 2013-07-24 14:05:30 +08:00
xia0ta0
b56e48890f * code for task#1592. 2013-07-23 16:40:59 +08:00
xia0ta0
01f65195c3 * code for task#1552. 2013-07-22 16:18:27 +08:00
zhujinyong
3c12c7fda5 * fix after location. 2013-07-10 05:49:24 +00:00
zhujinyong
35e221c8b1 * fix a bug : if no story, don't display copy button. 2013-07-10 05:29:09 +00:00
wangyidong
957f01c7ed * Do not use colorbox when pager is in colorbox. 2013-07-03 07:54:05 +00:00
wangyidong
46f14183f2 + finish task #1496. 2013-07-03 07:15:45 +00:00
zhujinyong
1abc0b6546 * code for task#1477. 2013-07-03 05:59:04 +00:00
zhujinyong
8ea77a0215 * code for task#1477. 2013-07-03 02:34:05 +00:00
zhujinyong
006c53bfe7 + add js for mobi. 2013-06-21 09:02:58 +00:00
zhujinyong
75a7383ff2 * fix bug : record.js should be renamed. 2013-03-03 05:39:49 +00:00
zhujinyong
8e065ebad7 - remove transition. 2013-02-27 07:42:17 +00:00
zhujinyong
ad0d88ec1d * adjust datepicker. 2013-02-27 06:43:54 +00:00
zhujinyong
059e3e8a29 + add record link in edit.html.php. 2013-02-27 02:47:26 +00:00
zhujinyong
248a8d33ad * fix for colorbox. 2013-02-26 01:37:26 +00:00
chencongzhi520@gmail.com
7427704392 * finish task#1078. 2013-02-19 07:23:06 +00:00
zhujinyong
ecc0ff7ee1 * fix a bug : fix setAfter. 2013-02-04 07:55:12 +00:00
zhujinyong
ea2bcb1eae * remove transition of task. 2013-01-24 08:51:37 +00:00
zhujinyong
77194dad77 * move checkLeft to common.js. 2013-01-22 09:12:10 +00:00
wangyidong
844dc2ae10 * adjust check onlybody.
* adjust task-record.
2013-01-21 05:26:47 +00:00
chencongzhi520@gmail.com
fce2b8b9ff * adjust the popup way of colorbox. 2013-01-20 09:59:31 +00:00
zhujinyong
ae9da000b1 * code for task#1030. 2013-01-09 06:35:02 +00:00