Commit Graph
11791 Commits
Author SHA1 Message Date
Catouse 22f8b657e8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:01:03 +08:00
Catouse e2c46ea2a9 * update zui js file. 2018-05-18 09:00:55 +08:00
Catouse 2518ac259e * change savequery dialog style. 2018-05-18 09:00:47 +08:00
Catouse 81fe923a60 * fix query label style. 2018-05-18 09:00:27 +08:00
wangyidong 600bfd300b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 08:58:18 +08:00
wangyidong 3f41de395d * finish task #4149. 2018-05-18 08:57:51 +08:00
滔哥 16762b2bef * Task#4154. 2018-05-18 08:46:53 +08:00
滔哥 ae39caedad * Task#4141. 2018-05-17 20:02:39 +08:00
滔哥 82dd51d2af * Task#4158. 2018-05-17 19:54:06 +08:00
滔哥 5d7d3ceb48 * Task#4161. 2018-05-17 19:47:23 +08:00
Catouse 719471db9a * fix button style in input-group. 2018-05-17 18:34:08 +08:00
Catouse 4d1e624c3b * fix icon style in bug/browse view. 2018-05-17 18:33:48 +08:00
Catouse 07852489c9 * fix savequery modal style. 2018-05-17 18:33:24 +08:00
Catouse 661bcb7ed7 * fix .table-grouped style. 2018-05-17 18:22:53 +08:00
Catouse 10ca7db0ce * remove debug codes. 2018-05-17 18:16:43 +08:00
Catouse bb5a2975d2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 18:14:53 +08:00
Catouse 582d1b1a2c * refactor codes. 2018-05-17 18:14:46 +08:00
wangyidong 98a51a8c2d Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 17:28:42 +08:00
daitingting 430c205805 * Remove split-row when from is not doc.
* Adjust language.
2018-05-17 17:05:28 +08:00
daitingting 3ac0602e10 * Adjust codes. 2018-05-17 17:00:24 +08:00
wangyidong 3591e5732e Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 16:38:06 +08:00
wangyidong 8b78775556 * adjust for report page. 2018-05-17 16:37:40 +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
chenfeiCF dd94a715b8 * Adjust style for team of task. 2018-05-17 14:54:56 +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
Catouse bd12a2c8fb * fix more actions position in firefox. 2018-05-17 14:18:37 +08:00
Catouse e4a06c3fb2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 14:03:59 +08:00
Catouse 27a4f7d55a * refactor codes. 2018-05-17 14:03:51 +08:00
liugang e9cf09ccd8 * Rename btn-default to btn. 2018-05-17 13:55:33 +08:00
liugang 67debd6985 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 13:54:26 +08:00
liugang 7b0ce5666d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 13:54:14 +08:00
Catouse b8c3e70dfa * refactor codes. 2018-05-17 13:49:07 +08:00
Catouse 7465556299 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 13:45:17 +08:00
Catouse 1e0708ad67 * fix icon style. 2018-05-17 13:36:32 +08:00
liugang 1266a30bbc * Remove class btn-default.
* Merge conflicts.
2018-05-17 13:35:56 +08:00
daitingting d81eb365b1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 13:33:08 +08:00
daitingting 07f8ccb1d5 * Adjust width. 2018-05-17 13:32:54 +08:00
Catouse fe09d37f38 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 13:26:38 +08:00
Catouse b9aa9568c5 * improve UI of forms elements. 2018-05-17 13:26:27 +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