Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
7,054 Commits 2 Branches 292 Tags
4046ab3cdda29d9aaa7de0f4cd61ba1ed44847eb
Commit Graph
249 Commits
Author SHA1 Message Date
wangyidong c4a72a6b75 Merge branch 'master' of github.com:easysoft/zentaopms 
Conflicts:
	module/common/lang/en.php
	module/common/lang/menuOrder.php
	module/common/lang/zh-cn.php
 2015-02-28 17:29:16 +08:00
wangyidong c56d8e69c6 * finish task #2206, 2207. 2015-02-28 14:56:35 +08:00
xia0ta0 fc495455bf * adjust submenu of admin. 2015-02-26 16:11:35 +08:00
wangyidong c3e0d714f0 * adjust code. 2015-02-04 10:14:53 +08:00
wangyidong fb4eed1c39 * finish task #2190. 2015-01-28 16:31:03 +08:00
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong 0c0f8d85a9 * adjust code. 2014-12-19 01:05:41 +00:00
Catouse bbaf9039d0 * enhance ui of story search modal with chosen. 2014-12-17 18:10:13 +08:00
wangyidong 8ce86eddbe * finish task #660. 2014-12-16 01:18:39 +00:00
wangyidong 88a59254a0 * finish task #2157. 2014-12-12 09:31:23 +00:00
wangyidong 0c687fcc6d Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-11 02:46:00 +00:00
wangyidong 33cb9fb781 * finish task #2039,2040. 2014-12-11 01:45:10 +00:00
Catouse 85ba11c7ea * finish task #1959, #1958. 2014-12-10 09:50:56 +08:00
wangyidong a8be1e9649 * fix bug and adjust code. 2014-11-06 09:06:34 +00:00
wangyidong 303dbe844d * finish task #2141. 2014-11-03 06:12:00 +00:00
wangyidong 7c96bd88ee * finish task #2878. 2014-11-03 05:51:43 +00:00
wangyidong d89b6daa5a * finish task #2043,2094,2098. 2014-10-27 02:56:11 +00:00
wangyidong 0463c6ab25 * remove clearData function. 2014-08-25 08:46:03 +00:00
wangyidong 8c50180759 * change checkrepeat to removeDuplicate. 2014-08-25 03:08:21 +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
wangyidong fd0f8e02f2 * finish task #1202. 2014-08-13 09:03:41 +00:00
wangyidong 8501046c11 * finish task #1185. 2014-08-13 05:58:51 +00:00
wangyidong 106b29497d * add placeholder for pastetext. 2014-08-05 01:57:18 +00:00
wangyidong f92104dd17 * finish task #1975. 2014-07-25 09:05:47 +00:00
wangyidong e408a3bc2d * finish task #1939. 2014-07-21 06:15:42 +00:00
wangyidong 2bd50ee02f * code for task #1939. 2014-07-21 03:21:09 +00:00
wangyidong 9d29148250 * finish task #1941. 2014-07-18 06:45:07 +00:00
Catouse 28e409542e * added space arround arrow. 2014-06-25 10:44:02 +08:00
Catouse df38ee6e38 * updated themes. 
* added new theme 'blackberry'.
 * ajusted style of user/login.
 * added colorbox method in my.js to compatible with older extensions.
 2014-06-24 10:21:26 +08:00
wangyidong 7d67d5da39 * finish task #1897. 2014-06-18 08:13:54 +00:00
Catouse df0cc53224 * optimized style for mobile devices. 
* ajsuted style of pager.
 2014-06-09 15:02:53 +08:00
wwccss 97127c5e01 * adjust the menu of view page for product and project module. 2014-06-01 23:09:17 +08:00
wwccss 9d32265c5a * rename the clear data feature to reset. 2014-06-01 20:58:00 +08:00
Catouse 6480d853e4 * ajusted style of 'editor/view'. 
* changed icon of usecase.
 * added border to the table in tab pane.
 2014-05-02 11:21:26 +08:00
xia0ta0 a4b32fbc8b * adjust en lang. 2014-04-28 15:36:39 +08:00
Catouse 4eb3027b1e * ajusted style of footer. 
* fixed overflow setting of featurebar.
 2014-04-28 10:08:54 +08:00
Catouse 70b618f837 * ajusted style of pager. 2014-04-24 15:00:47 +08:00
Catouse 5221918158 * ajusted style of dropmenu on 'topNavbar'. 
* updated zui lib.
 2014-04-23 15:14:38 +08:00
wwccss 7a1a175b04 * adjust the license info. 2014-04-23 13:37:37 +08:00
Catouse 875b5f9718 * ajusted dropdown style in 'topNavbar'. 
* renamed theme 'classic blue' to 'light blue'.
 2014-04-22 20:07:21 +08:00
wwccss f0efa665fd * adjust the welcome label. 2014-04-21 13:47:05 +08:00
Catouse 3e312408b2 * fixed style for ie8. 
* ajusted style of 'about'.
 2014-04-17 15:48:34 +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 aa96761a82 * changed css names. 
* added method 'setSyncTrigger' in 'my.full.js'.
 2014-03-26 15:44:57 +08:00
wyd621 b22a14b5f9 * change lang->date->day => $lang->day for common lang. 2014-03-24 03:20:42 +00:00
Catouse bcb765b393 * ajusted style of views in module prodcut. 2014-03-19 17:39:56 +08:00
wyd621 d022e464cb * finish task #1804. 2014-03-14 03:27:53 +00:00
wyd621 8832e3acb1 * finish task #1831. 2014-03-11 06:05:55 +00:00