Commit Graph
11770 Commits
Author SHA1 Message Date
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
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
tengfei acc3341e84 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 11:21:41 +08:00
tengfei 5818b4cbef * minor translation change 2018-05-17 11:20:09 +08:00
Catouse 4432a36f1a * change buttons style. 2018-05-17 11:18:19 +08:00
Catouse 5d22f7daa7 * change subtask label style. 2018-05-17 11:13:16 +08:00
Catouse b3b8583b93 * update zui css file. 2018-05-17 11:11:11 +08:00
Catouse 4607381f64 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 11:04:19 +08:00
Catouse eecaeee8c4 * adjust elements in dashboard style by update zui css file. 2018-05-17 11:04:08 +08:00
daitingting 5c3e27a6b0 * Set requiredFields.
* Adjust style for title color.
2018-05-17 11:02:52 +08:00
Catouse b3f882f7dd * change searchbox style. 2018-05-17 11:01:20 +08:00
tengfei 51350fbeb7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 10:59:04 +08:00
daitingting 6c109c04af * Set requiredFields. 2018-05-17 10:54:19 +08:00
Catouse 6986b5721f * add fade effection to user/login view. 2018-05-17 10:53:40 +08:00
daitingting e1b933e3f0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 10:43:54 +08:00
Catouse 17f9f2550c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 10:43:28 +08:00
Catouse f84adc3086 * refactor codes. 2018-05-17 10:43:18 +08:00
daitingting d47879c736 * Set required fields.
* Adjust style of title color.
2018-05-17 10:43:07 +08:00
daitingting e81c3c5bb5 * Adjust submitButton. 2018-05-17 10:29:12 +08:00
daitingting 7e7bc2b356 * Adjust codes. 2018-05-17 10:27:18 +08:00
daitingting 6a95b2a5a9 * Set submit button in center. 2018-05-17 10:12:54 +08:00
daitingting 92aaca1f0c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 10:09:00 +08:00
daitingting 435eac9450 * Adjust required fields. 2018-05-17 10:08:40 +08:00