Commit Graph
11072 Commits
Author SHA1 Message Date
wangyidong a4e7756fd5 * finish task #4851. 2018-09-20 17:34:53 +08:00
wangyidong 36ced48147 * adjust for block. 2018-09-20 16:31:32 +08:00
wangyidong ab890a2606 * adjust for task #4895. 2018-09-20 15:02:50 +08:00
Yagami c3f808434e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-20 14:43:16 +08:00
Yagami 2f468832aa * Fix groupModel-updateUser method. 2018-09-20 14:42:37 +08:00
wangyidong 8e8b464f48 * code for task #4874. 2018-09-20 14:39:36 +08:00
wangyidong f3e026d2da Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-20 14:25:50 +08:00
wangyidong 0b085311b4 * finish task #4874. 2018-09-20 14:25:28 +08:00
Yagami 3e6f30bf9a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-20 14:10:29 +08:00
Yagami 9f1abd17e6 * Finish task #4723. 2018-09-20 14:10:13 +08:00
Catouse c3e5709701 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-20 13:42:59 +08:00
Catouse 8618df7b57 * change UI of flowchart block. 2018-09-20 13:42:54 +08:00
Catouse 3559387c5f * fix style of list-group in dropdown-menu. 2018-09-20 13:42:39 +08:00
Yagami 8946190150 * Finish task #4879. 2018-09-20 13:35:33 +08:00
wangyidong ea149d56fd Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-20 13:18:16 +08:00
wangyidong fa38ced902 * finish task #4897. 2018-09-20 13:17:27 +08:00
Yagami ef95081be3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-20 13:15:39 +08:00
Yagami b874048996 * Fix block count status css. 2018-09-20 13:15:12 +08:00
Catouse d8bab691b5 * finish task #4772. 2018-09-20 13:07:10 +08:00
wangyidong e3a1b2f2a2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-20 10:24:19 +08:00
wangyidong 46173702a5 * finish task #4887. 2018-09-20 10:23:53 +08:00
滔哥 663577b1ad * Fix task#4846. 2018-09-20 08:26:01 +08:00
滔哥 3cb02d06ce * Fix task#4845. 2018-09-20 07:55:40 +08:00
Catouse 27e1bdd753 * change login background color. 2018-09-19 16:58:55 +08:00
Catouse 576752be69 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 16:47:47 +08:00
Catouse 7bdf2996f2 * finish task #4844. 2018-09-19 16:47:21 +08:00
wangyidong 40d662e996 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-19 16:01:07 +08:00
wangyidong 1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
Yagami 6684f4a817 * Finish task #4738. 2018-09-19 15:57:00 +08:00
Yagami 42d3cd0e5e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 15:16:32 +08:00
Yagami fbeef27821 * Finish task #4790. 2018-09-19 15:16:18 +08:00
chenfeiCF 2fa7eb9e83 * Finish task #4863. 2018-09-19 15:12:59 +08:00
chenfeiCF d91291455b * Fix float action button on actions column. 2018-09-19 15:04:04 +08:00
chenfeiCF 933660e633 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-19 14:59:34 +08:00
chenfeiCF 9e19e3fc85 * Remove label-dot which in list page. 2018-09-19 14:58:48 +08:00
Catouse c52c99a1fa Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 14:44:11 +08:00
Catouse 16bd3fadee * fix btn class in productplan/browse view. 2018-09-19 14:44:05 +08:00
Yagami f7bfe9fab2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 13:58:30 +08:00
Yagami dc9eb1fff7 * Finish task #4847. 2018-09-19 13:58:16 +08:00
滔哥 c6bef0c536 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 13:42:49 +08:00
Yagami 4e7d9a8ab7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 13:29:48 +08:00
Yagami 9044c9569e * Finish task #4856. 2018-09-19 13:29:21 +08:00
chenfeiCF 76db6e160c Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-19 11:23:58 +08:00
chenfeiCF e16f9853f4 * Move the assignTo btton to actions column and remove label-dot near status. 2018-09-19 11:22:18 +08:00
wangyidong 8a19206927 * finish task #4876. 2018-09-19 11:18:49 +08:00
wangyidong c9db0cac7a Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-19 10:48:36 +08:00
wangyidong c78de38680 * finish task #4896. 2018-09-19 10:48:18 +08:00
Catouse 8bcac87dc1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-19 10:26:36 +08:00
wangyidong 4949606cbe * finish task #4904. 2018-09-19 10:24:57 +08:00
Catouse 9983b0ff19 * improve UI of table, datatable and tablesorter. 2018-09-19 10:23:29 +08:00