Commit Graph

1216 Commits

Author SHA1 Message Date
滔哥
52bcaad547 * Test task#4278 2018-05-25 14:07:59 +08:00
daitingting
e851690722 * Adjust space between btn. 2018-05-25 10:59:29 +08:00
wangyidong
4205a87992 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-25 10:02:45 +08:00
wangyidong
f8bd140942 * finish task #4155. 2018-05-25 10:02:12 +08:00
daitingting
ad44994c82 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-25 09:15:27 +08:00
Catouse
cf906f6e61 * remove chosen-simple class. 2018-05-24 17:49:29 +08:00
Catouse
3ece82b0e9 * remove line numbers in import lines modal. 2018-05-24 16:54:01 +08:00
Catouse
94fbe8fa9a * improve UI of task/batchcreate view. 2018-05-24 16:18:26 +08:00
Catouse
b6b41ae2da * refactor codes. 2018-05-24 11:10:05 +08:00
wangyidong
244a261be4 * finish task #4217. 2018-05-23 16:25:50 +08:00
daitingting
b7de0d5e8f * Adjust width for actions. 2018-05-23 16:13:49 +08:00
chenfeiCF
7388d561c3 * Adjust contact list box. 2018-05-23 14:51:09 +08:00
滔哥
950315d46e * Finish task#4275 2018-05-23 10:22:53 +08:00
滔哥
3af004c58b Task #4284 2018-05-23 08:59:56 +08:00
滔哥
de4b1b81c5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-22 11:17:47 +08:00
滔哥
a11b0f9a9f * Task#4180. 2018-05-22 10:50:14 +08:00
Catouse
df043be491 * change style of task/create view. 2018-05-22 10:46:43 +08:00
daitingting
dc60a11e93 * Add title for team member. 2018-05-21 17:07: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
Catouse
258f2cad9c * refactor codes. 2018-05-21 11:29:00 +08:00
Catouse
d27fb779c3 * refactor codes. 2018-05-21 09:08:08 +08:00
wangyidong
eec9dbd8f7 * fix bug. 2018-05-18 15:58:56 +08:00
liugang
a51a4c48f1 * Remove $mode == 'table'. 2018-05-18 14:27:01 +08:00
daitingting
71d60671f8 * Remove contactListMenu when submit form. 2018-05-18 14:12:19 +08:00
daitingting
18db97acfe * Adjust position for color. 2018-05-18 13:48:42 +08:00
daitingting
9eda304837 * Adjust linkButton. 2018-05-18 13:46:36 +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
dc4de1a658 * finish task #4166. 2018-05-18 13:18:40 +08:00
daitingting
50e6f8e15f * Add english language. 2018-05-18 10:29:20 +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
滔哥
eafa14bdca * Task#4159. 2018-05-18 09:28:19 +08:00
Catouse
582d1b1a2c * refactor codes. 2018-05-17 18:14:46 +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
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
Catouse
b9aa9568c5 * improve UI of forms elements. 2018-05-17 13:26:27 +08:00
daitingting
6c109c04af * Set requiredFields. 2018-05-17 10:54:19 +08:00
Catouse
cf333e3b36 * fix icon missing. 2018-05-17 10:02:23 +08:00
daitingting
0056609d9c * Adjust button style. 2018-05-16 17:44:42 +08:00
liugang
e9ecb1fd9e * Optimize codes. 2018-05-16 10:42:42 +08:00