Commit Graph
984 Commits
Author SHA1 Message Date
daitingting 39a330601e * Adjust batch page. 2018-05-17 11:31:55 +08:00
Catouse f84adc3086 * refactor codes. 2018-05-17 10:43:18 +08:00
Catouse 27d88fe998 * merge code. 2018-05-17 09:56:22 +08:00
wangyidong 646079892c Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 09:05:15 +08:00
wangyidong 304653cd65 * fix bug. 2018-05-17 09:04:44 +08:00
daitingting fad7ac2701 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/build/view/linkbug.html.php
	module/build/view/linkstory.html.php
	module/project/view/create.html.php
	module/release/view/linkbug.html.php
	module/release/view/linkstory.html.php
2018-05-16 17:46:01 +08:00
daitingting 0056609d9c * Adjust button style. 2018-05-16 17:44:42 +08:00
Catouse db8155f6ae * improve UI for sortable table. 2018-05-16 15:31:13 +08:00
liugang c0a9d8eb61 * Adjust style. 2018-05-16 15:06:01 +08:00
liugang 82b9d32295 * Optimize codes. 2018-05-16 14:49:46 +08:00
liugang e9ecb1fd9e * Optimize codes. 2018-05-16 10:42:42 +08:00
liugang ec4117c6b9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-15 16:02:44 +08:00
liugang 05b7ecb71e * Optimize pages. 2018-05-15 16:02:31 +08:00
Catouse e522af53b4 * remove btn-gray. 2018-05-15 15:33:33 +08:00
Catouse 431dd77d8c * change kanban style. 2018-05-15 11:15:55 +08:00
Catouse 0fb591c691 * improve UI of project/create form. 2018-05-14 18:28:14 +08:00
wangyidong d4af3e2d00 * finish task #4091. 2018-05-14 14:57:13 +08:00
liugang 0eeaeb1219 * Refact browse page, create page, edit page, view page, linkcase page of testsuite. 2018-05-11 16:07:54 +08:00
liugang fa6ed57b81 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-10 17:43:45 +08:00
liugang 4ad2bdac02 * Refact browse page of bug. 2018-05-10 17:43:29 +08:00
wangyidong 39c95c823d * finish task #4078. 2018-05-10 17:15:06 +08:00
wangyidong 52799cf5b8 * finish task #3978. 2018-05-10 11:18:09 +08:00
wangyidong aede4506ce * finish task #3973. 2018-05-10 10:00:05 +08:00
wangyidong ab4d9a1f2c * fix error and adjust for ux. 2018-05-09 15:18:45 +08:00
滔哥 45f1da3824 * Task#3944 2018-05-09 09:58:48 +08:00
滔哥 325fee5bc7 * Task#3944 2018-05-09 09:18:59 +08:00
滔哥 946436452d * Task#3944 2018-05-09 00:39:26 +08:00
滔哥 7939863a05 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-08 23:13:16 +08:00
滔哥 a16a48a323 * Task#3942 2018-05-08 23:12:49 +08:00
Catouse d67a6ca6b1 * improve UI of task list views. 2018-05-08 19:25:05 +08:00
daitingting 511e67f579 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	db/update9.8.1.sql
	module/doc/css/common.css
	module/doc/view/browse.html.php
2018-05-07 17:28:29 +08:00
daitingting 42c6502b0f * Rewrite allLibs, objectLibs and browse pages of doc. 2018-05-07 17:27:12 +08:00
滔哥 f6289cc53c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-07 17:08:09 +08:00
滔哥 edb2689262 * Format code. 2018-05-07 16:54:52 +08:00
wangyidong ec493368ee Merge branch 'master' of git://github.com/easysoft/zentaopms 2018-05-07 16:50:15 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
滔哥 427afd5674 * Task#3921 2018-05-07 15:07:31 +08:00
滔哥 27466d9cd8 * Task#3921 2018-05-07 15:04:28 +08:00
liugang 70dcc23aca * Refact testtask page of project. 2018-05-07 11:54:54 +08:00
wangyidong 55c68b611d * finish task #3936. 2018-05-04 15:13:22 +08:00
wangyidong 86b84dd5a2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-03 16:12:07 +08:00
wangyidong e6bef8b542 * adjust for task #3947. 2018-05-03 16:05:44 +08:00
daitingting 5c7406e5c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-03 16:00:14 +08:00
daitingting a06796c25b * Replace effort block to burn block.
* Check priviledge.
2018-05-03 15:59:30 +08:00
wangyidong 660e499d74 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-03 15:17:11 +08:00
wangyidong 4a297ee140 * finish task #3953. 2018-05-03 15:16:27 +08:00
daitingting fdfa1bbd22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-03 14:58:34 +08:00
daitingting 46e8569973 * Rewrite view page of project. 2018-05-03 14:58:03 +08:00
chenfeiCF 66443f3eeb * Finish task #3872, #3909. 2018-05-03 14:25:17 +08:00
liugang 7b5698f911 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-02 18:06:31 +08:00