Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
6,800 Commits 2 Branches 292 Tags
3911fb5bd75f766d9ce3ecd37607dbd27c40c708
Commit Graph
233 Commits
Author SHA1 Message Date
Catouse 30183548b1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-11-07 09:56:51 +08:00
Catouse c91b4dfd16 * removed debug code. 2014-11-07 09:56:43 +08:00
wangyidong a8be1e9649 * fix bug and adjust code. 2014-11-06 09:06:34 +00:00
wangyidong 31e3daa4c8 * change lang. 2014-11-06 03:07:00 +00:00
wangyidong 9f39bc1e2e * adjust mail. 2014-11-06 03:03:14 +00:00
wangyidong b0b9235673 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-04 03:16:30 +00:00
Catouse 91b5c5deb9 * fixed errors in method ''selectButton". 2014-11-04 11:00:57 +08:00
wangyidong b1af6eac76 * fix a bug #646. 2014-11-04 01:18:40 +00:00
Catouse 23c5fe5d0d * fixed a js naming conflicts among php syntax. 2014-10-30 17:06:19 +08:00
Catouse 61b8f7f9cf * fixed table row select button for datatable. 2014-10-28 16:57:19 +08:00
Catouse 61a43f656b * datatable support check operation. 2014-10-28 15:31:58 +08:00
wangyidong ed8818d5d1 * adjust code. 2014-10-27 02:57:31 +00:00
wangyidong d89b6daa5a * finish task #2043,2094,2098. 2014-10-27 02:56:11 +00:00
wangyidong fc37dcd3bc * change for zh-tw. 2014-08-27 01:10:40 +00:00
wwccss 8e96648e2d * init the $jsLang. 2014-08-26 14:50:57 +08:00
wangyidong 7038cc4b3e * adjust dao.class.php. 2014-08-26 02:49:59 +00:00
wangyidong 3e7235e7fd * fix for removeDuplate. 2014-08-26 02:22:58 +00:00
wangyidong 084182698d * adjust for exportConfigVars. 2014-08-25 07:18:20 +00:00
wangyidong fd8ab3880b * add notice. 2014-08-25 05:38:39 +00:00
chujilu c70b40a8c4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-22 15:25:48 +08:00
chujilu 00627dc835 * activate Bug when importbug if bug postponed. 2014-08-22 15:24:29 +08:00
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