Commit Graph
1715 Commits
Author SHA1 Message Date
Catouse f3f5105ef9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 16:05:41 +08:00
Catouse 19f77b435f * change UI of sidebar. 2018-05-22 16:05:33 +08:00
daitingting 932bb4b7b1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 15:12:03 +08:00
daitingting 5d27c53fd2 * Adjust details about tree page of project. 2018-05-22 15:11:11 +08:00
chenfeiCF f5f0e79ecb * Finish task #4286, #4287, #4288, #4289, #4290. 2018-05-22 15:05:16 +08:00
Catouse a13522f616 * change tables style. 2018-05-22 14:34:55 +08:00
tengfei 83d7c1430c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 13:48:01 +08:00
tengfei c4a8f46313 *fixed undone translation:wq 2018-05-22 13:47:03 +08:00
daitingting a39675dc22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 13:18:19 +08:00
daitingting 996a87bb7c * Add title for task name.
* Adjust style for dropmenu.
2018-05-22 13:15:04 +08:00
Catouse 4b6fbc7b9c * fix double iframe modal issue. 2018-05-22 12:03:30 +08:00
Catouse 51d591615f * adjust kanban style. 2018-05-22 11:19:10 +08:00
Catouse 9f74b34f01 * improve UI of project/task view. 2018-05-22 11:15:03 +08:00
Catouse e7c3b4c99c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-21 16:54:58 +08:00
Catouse 7fea6a86c6 * refactor codes. 2018-05-21 16:54:51 +08:00
daitingting 91b213a105 * Add title for severity. 2018-05-21 16:34:01 +08:00
daitingting 06704f1825 * Add title for pri. 2018-05-21 16:27:32 +08:00
Catouse 98bdda1043 * change buttons style in table. 2018-05-21 14:38:22 +08:00
daitingting 8ac45e17db * Adjust margin between estimate and button. 2018-05-21 14:15:21 +08:00
Catouse d27fb779c3 * refactor codes. 2018-05-21 09:08:08 +08:00
wangyidong 7ab90f9ee7 * fix for page show. 2018-05-18 14:20:04 +08:00
wangyidong 661ea69237 * adjust for zh-tw lang. 2018-05-18 14:05:36 +08:00
daitingting 9eda304837 * Adjust linkButton. 2018-05-18 13:46:36 +08:00
daitingting 50e6f8e15f * Add english language. 2018-05-18 10:29:20 +08:00
wangyidong 6b548f637f * adjust for team. 2018-05-18 09:25:53 +08:00
滔哥 ae39caedad * Task#4141. 2018-05-17 20:02:39 +08:00
daitingting 3ac0602e10 * Adjust codes. 2018-05-17 17:00:24 +08:00
daitingting f88d50c01a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 16:12:36 +08:00
daitingting 5b97fbdc0b * Adjust modulesTree. 2018-05-17 16:12:12 +08:00
Catouse 7e3f890623 Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-05-17 15:40:20 +08:00
Catouse 7b890d9a03 * refactor codes. 2018-05-17 15:40:11 +08:00
tengfei ba2a44a659 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 15:09:59 +08:00
tengfei 44d87c1368 * translation changed 2018-05-17 15:07:58 +08:00
wangyidong c5fec18481 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 14:43:54 +08:00
wangyidong 6e6c82be2b * adjust for page. 2018-05-17 14:43:35 +08:00
chenfeiCF 3ef65f2d83 * Show no assigned if the task assigned to none. 2018-05-17 14:38:30 +08:00
daitingting e80f2cce73 * Adjust codes. 2018-05-17 14:33:04 +08:00
liugang 7b0ce5666d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 13:54:14 +08:00
liugang 1266a30bbc * Remove class btn-default.
* Merge conflicts.
2018-05-17 13:35:56 +08:00
daitingting 07f8ccb1d5 * Adjust width. 2018-05-17 13:32:54 +08:00
daitingting 27915acec1 * Adjust style for whitelistbox. 2018-05-17 13:25:55 +08:00
daitingting 8c713ac2b3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 11:32:14 +08:00
daitingting 39a330601e * Adjust batch page. 2018-05-17 11:31:55 +08:00
Catouse 5d22f7daa7 * change subtask label style. 2018-05-17 11:13:16 +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