Commit Graph
9697 Commits
Author SHA1 Message Date
daitingting 2fafe58dbe Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 13:33:49 +08:00
daitingting 1c78423a24 * Adjust backButton. 2018-05-18 13:33:25 +08:00
Catouse 10ba857796 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 13:32:35 +08:00
Catouse 2f46170191 * change style of task/batchcreate form. 2018-05-18 13:32:18 +08:00
wangyidong 679d42132f Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 13:30:14 +08:00
wangyidong cb99d6e0e0 * adjust for high light. 2018-05-18 13:29:47 +08:00
daitingting 7cf41ee696 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 13:23:56 +08:00
daitingting cbb127c726 * Adjust collect style and title. 2018-05-18 13:23:29 +08:00
wangyidong 522bb7a74b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 13:19:16 +08:00
wangyidong dc4de1a658 * finish task #4166. 2018-05-18 13:18:40 +08:00
Catouse 60b5cb7816 * refactor codes. 2018-05-18 12:50:42 +08:00
Catouse b0ce690299 * change style of buildcontactlists view. 2018-05-18 12:31:28 +08:00
Catouse ae0b1ebbb6 * improve markdown editor UI. 2018-05-18 12:07:34 +08:00
Catouse 5295dbef07 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 11:33:08 +08:00
Catouse 69ebbbc0f6 * change doc/createLib modal style. 2018-05-18 11:33:02 +08:00
Catouse d4bd3ca5a7 * fix chosen drop position. 2018-05-18 11:32:45 +08:00
daitingting 7ede06b0dd Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 11:27:27 +08:00
daitingting 82ce0b3d84 * Add th for actions. 2018-05-18 11:27:12 +08:00
liugang 9e04d4714a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 11:19:12 +08:00
liugang 770db7df13 * Hide theme menu. 2018-05-18 11:19:01 +08:00
wangyidong 5704ec43a0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 11:07:39 +08:00
wangyidong 36a1bec648 * adjust for style. 2018-05-18 11:07:19 +08:00
daitingting 3ca7269f8b * Adjust btn. 2018-05-18 11:06:21 +08:00
daitingting 10433564c2 * Adjust style. 2018-05-18 11:03:45 +08:00
daitingting 61bfafbc5b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:56:47 +08:00
daitingting f6450d8c37 * Adjust button. 2018-05-18 10:56:23 +08:00
Catouse da161f111b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:33:49 +08:00
Catouse 61c2e0c6e7 * improve modal UI. 2018-05-18 10:33:42 +08:00
daitingting 44de16b021 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:29:48 +08:00
daitingting 50e6f8e15f * Add english language. 2018-05-18 10:29:20 +08:00
wangyidong eb937c9e59 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 10:27:44 +08:00
wangyidong bb7b76e803 * adjust for only test. 2018-05-18 10:27:06 +08:00
liugang 0f26c55cab Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:05:23 +08:00
liugang ddb33c2a34 * Fix button style. 2018-05-18 10:05:13 +08:00
滔哥 a5c48d625e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:49:33 +08:00
滔哥 8f4fbd18ab * Format code for testcase. 2018-05-18 09:48:23 +08:00
滔哥 61a7474744 * Format code. 2018-05-18 09:47:34 +08:00
daitingting e87d6eb9cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:39:39 +08:00
daitingting 01e8f79b55 * Merge it. 2018-05-18 09:39:21 +08:00
滔哥 6b487c7cfd Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:38:42 +08:00
滔哥 7d1dc5a5e9 * Format code. 2018-05-18 09:38:35 +08:00
daitingting 2bc846055c Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/task/css/create.css
2018-05-18 09:37:56 +08:00
daitingting 6c6601ae46 * Adjust button positon in name. 2018-05-18 09:37:19 +08:00
chenfeiCF 9ebca72c86 * Finish task #4151. 2018-05-18 09:31:17 +08:00
滔哥 e52e1a9373 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:28:26 +08:00
滔哥 eafa14bdca * Task#4159. 2018-05-18 09:28:19 +08:00
wangyidong 66cf0a2572 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 09:26:16 +08:00
wangyidong 6b548f637f * adjust for team. 2018-05-18 09:25:53 +08:00
liugang 59229b0c52 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:06:11 +08:00
liugang 1ec3ae0f8d * Fix status and severity style. 2018-05-18 09:05:39 +08:00