Commit Graph

212 Commits

Author SHA1 Message Date
wangyidong
6a1cc1464e * fix a bug for dao. 2014-08-22 01:30:29 +00:00
chujilu
dffe80c44b * rewrite count() method
* change the config of story review
2014-08-21 20:41:42 +08:00
chujilu
e49f102189 * finish change TASK #2051 2014-08-21 10:44:56 +08:00
wangyidong
1cb49786a9 * finish task #1964. 2014-08-19 06:12:52 +00:00
wangyidong
5c879bde70 Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-19 03:03:46 +00:00
wangyidong
4b25f0c8b1 * finish task #2010. 2014-08-19 01:53:19 +00:00
chujilu
b754f968bb * add count() method in dao 2014-08-18 17:58:24 +08:00
wangyidong
32cdbb430a * finish task #2042. 2014-08-15 02:59:50 +00:00
wangyidong
f4121083fb * fix bug. 2014-08-12 09:27:23 +00:00
wangyidong
01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
wangyidong
3117761674 * fix bug #612. 2014-07-29 06:22:04 +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
df0cc53224 * optimized style for mobile devices.
* ajsuted style of pager.
2014-06-09 15:02:53 +08:00
Catouse
87cf62ca03 * ajusted layout of 'story/review'.
* added location param to the function 'closeModal' in my.js and front.class.php.
2014-04-28 15:27:08 +08:00
Catouse
c10aa876e4 * fixed style for firefox, oprea 12 and ie 8. 2014-04-26 22:06:18 +08:00
Catouse
7ca225a37c * ajusted ui of search form.
* fixed save query function of search form.
2014-04-24 17:20:02 +08:00
Catouse
70b618f837 * ajusted style of pager. 2014-04-24 15:00:47 +08:00
Catouse
b399d7d52c * ajusted button color of feature bar.
* ajusted style of 'my/index'.
 * added method 'selectButton' in 'front.class.php'.
2014-04-23 13:17:41 +08:00
xia0ta0
27db9d7ebc * fix bug: can't page after order. 2014-04-22 16:42:29 +08:00
Catouse
f095b6f72f * fixed message error from js. 2014-04-18 16:06:33 +08:00
Catouse
61770a9ce1 * ajusted style of stars. 2014-04-15 11:22:34 +08:00
Catouse
932303986f * added type to method 'checkbox' in 'front.class.php'. 2014-04-10 20:08:55 +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
054e2e863b * fixed method 'linkButton'. 2014-04-03 18:00:55 +08:00
Catouse
5ae05232fb * updated method 'linkButton'. 2014-04-03 17:29:19 +08:00
wyd621
e3d60141b9 * fix errors. 2014-04-02 00:47:07 +00: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
12374a02bc * adjust for output timeout from exportConfigVars. 2014-03-24 01:25:44 +00:00
wyd621
bf552c1fa9 * adjust zdb. 2014-03-21 09:09:02 +00:00
Catouse
1e4d342017 * ajusted views of module prodcut & doc. 2014-03-21 15:04:23 +08:00
Catouse
b08e0446bf * ajusted views of module product. 2014-03-21 11:42:03 +08:00
Catouse
03b66c7152 * changed method name to 'favicon' form 'icon'.
* added icon method.
2014-03-20 17:11:18 +08:00
Catouse
1c6aaba942 * ajusted style of 'my/profileedit'.
* fixed style of 'user/login'.
2014-03-18 10:24:00 +08:00
Catouse
1b8230f645 * ajusted ui of module 'my'. 2014-03-18 09:19:57 +08:00
Catouse
475f420d60 * ajusted style of pager. 2014-03-17 16:21:20 +08:00
Catouse
4f504f6699 * ajusted code with simplify writting in html5. 2014-03-17 15:48:15 +08:00
wyd621
e90b46f7b2 * finish task #1791. 2014-03-17 03:44:46 +00:00
Catouse
3ba4ee5a9f * changed ui of 'my/todo'. 2014-03-14 21:28:53 +08:00
Catouse
cfe5286571 * ajusted style of head part. 2014-03-13 21:11:00 +08:00
Catouse
d3f9657e35 * fixed style of login view. 2014-03-13 11:15:18 +08:00
wyd621
086b20b272 * rewrite the logic of hidden the real path when some error occers. 2013-11-01 02:27:00 +00:00
wyd621
9198ec75da * fix a bug when order has limit string. 2013-09-27 08:06:20 +00:00
wyd621
cce52d785e * fix a bug when field such as t1.id. 2013-09-27 01:54:27 +00:00
wyd621
6a78c2502f * fix a bug for strtolower order. 2013-09-27 01:42:46 +00:00
wyd621
90e5499f1d * fix a bug for order. 2013-09-26 08:05:25 +00:00
Catouse
f5826c1315 * add 'class' parameter for function 'commonButton'. 2013-09-17 13:59:18 +08:00
wwccss
7009656f06 * change app->error to app->triggerError(). 2013-07-22 17:07:49 +08:00
wwccss
7a2dcb0a31 * use app->triggerError(). 2013-07-22 15:45:17 +08:00
wyd621
4038b40e74 * finish task #1576. 2013-07-18 08:30:14 +08:00