Commit Graph
6755 Commits
Author SHA1 Message Date
wangyidong 4cabf8b6c6 * adjust extension header. 2014-08-25 07:41:02 +00:00
wangyidong 084182698d * adjust for exportConfigVars. 2014-08-25 07:18:20 +00:00
wangyidong 1d197648db * adjust for needNotReview. 2014-08-25 06:43:25 +00:00
wangyidong ce1b8874c1 * adjust number. 2014-08-25 06:18:21 +00:00
wangyidong 8edba16802 * adjust page. 2014-08-25 05:58:46 +00:00
wangyidong 8a18f5dfb2 * add icon of all project for dropmenu. 2014-08-25 05:11:58 +00:00
wangyidong 2d07bc1f29 Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-25 03:18:40 +00:00
wangyidong 8c50180759 * change checkrepeat to removeDuplicate. 2014-08-25 03:08:21 +00:00
chujilu c11b5a1d27 * format code 2014-08-24 09:49:48 +08:00
chujilu 68312723df * adjust code 2014-08-22 18:21:25 +08:00
chujilu 1368a21cc2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-22 18:02:45 +08:00
chujilu b29af641af * finish task #2051 2014-08-22 18:00:53 +08:00
Catouse e5ccae20a5 * ajusted style of user/edit. 2014-08-22 15:35:26 +08: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
wwccss a59fe005a6 * adjust code format. 2014-08-22 14:06:55 +08:00
wwccss c530038d9a * adjust code format. 2014-08-22 14:06:38 +08:00
wangyidong 565fb4c5ef Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-22 05:17:32 +00:00
wangyidong c5d8317d0a * change upgarde lang. 2014-08-22 05:13:49 +00:00
wwccss c20972b579 Merge branch 'master' of git@github.com:easysoft/zentaopms 2014-08-22 10:48:50 +08:00
wwccss f0a4eebd10 * change the zentao lang item. 2014-08-22 10:43:03 +08:00
wangyidong 60d7b67121 * add restart action. 2014-08-22 01:22:00 +00:00
chujilu f0fab78987 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-21 20:46:14 +08:00
chujilu dffe80c44b * rewrite count() method
* change the config of story review
2014-08-21 20:41:42 +08:00
Catouse f86236e92f * ajusted style of status label in data table. 2014-08-21 17:44:01 +08:00
wangyidong 4a29cd4d2a Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-21 09:19:51 +00:00
wangyidong ffd8af5907 * add pause task when import task. 2014-08-21 09:19:02 +00:00
wangyidong b31d4c7cdd * fix for pause action lang. 2014-08-21 09:10:04 +00:00
chujilu 7b61d60845 * finish change task #2062 #2063 2014-08-21 13:53:19 +08:00
wangyidong e01de20bb1 * change for new version. 2014-08-21 05:19:31 +00:00
chujilu 493ccc4915 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-21 10:59:42 +08:00
chujilu 596b131123 * finish change task #2011 2014-08-21 10:58:57 +08:00
wangyidong a8dacab1e4 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/build/control.php
2014-08-21 02:58:54 +00:00
wangyidong 1f9ad0afd9 * fix a bug. 2014-08-21 02:54:52 +00:00
chujilu 068a33b206 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-21 10:46:09 +08:00
chujilu e49f102189 * finish change TASK #2051 2014-08-21 10:44:56 +08:00
wangyidong 0a6087a146 * fix a bug. 2014-08-21 02:38:30 +00:00
wangyidong b0737245d5 * config for common image size. 2014-08-21 02:02:32 +00:00
wangyidong 1e1e784855 * change for error notice. 2014-08-21 01:56:20 +00:00
wangyidong 5d2a658222 * fix a bug. 2014-08-21 01:54:42 +00:00
wangyidong 60595ffa00 * fix a bug. 2014-08-21 01:43:03 +00:00
xia0ta0 aa2f1f4874 * format jsRoot. 2014-08-20 10:56:21 +08: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
xia0ta0 86adf69f6e * fix warning: jsRoot is not defined. 2014-08-20 10:48:02 +08:00
Catouse 730fdfe415 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-20 09:24:54 +08:00
Catouse 989b653d11 * ajusted style of forms. 2014-08-20 09:24:08 +08:00
chujilu f9e44c0075 Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-20 09:22:34 +08:00
chujilu 026e6cc927 * add $jsRoot in search/view/buildform.html.php 2014-08-20 09:21:19 +08:00
Catouse 57263b444d * ajusted style of history. 2014-08-19 17:35:19 +08:00
Catouse 7032ad8681 * ajusted style of '#titlebar'. 2014-08-19 17:25:04 +08:00