Commit Graph
785 Commits
Author SHA1 Message Date
Catouse 389b7d77c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-27 11:27:22 +08:00
Catouse f8064bb042 * finish task #4950. 2018-09-27 11:27:17 +08:00
wangyidong 25c19f97b3 * finish task #4948. 2018-09-27 10:52:54 +08:00
wangyidong e0950c3e8b * finish task #4940. 2018-09-26 15:11:54 +08:00
Yagami 373741ee78 * Change report default button icon. 2018-09-26 14:15:33 +08:00
Yagami ce80ed9c4e * Fix groupcase view css. 2018-09-25 09:06:00 +08:00
Yagami 8946190150 * Finish task #4879. 2018-09-20 13:35:33 +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
chenfeiCF d91291455b * Fix float action button on actions column. 2018-09-19 15:04:04 +08:00
chenfeiCF 9e19e3fc85 * Remove label-dot which in list page. 2018-09-19 14:58:48 +08:00
滔哥 0b83fffbe0 * Finished task#4854 2018-09-19 07:41:28 +08:00
chenfeiCF 67bfd87a0c * Finish task #4843, #4883. 2018-09-18 10:39:27 +08:00
Yagami d5bdf6d834 * Finish task #4902. 2018-09-18 10:25:41 +08:00
Catouse 69091fc300 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-13 12:03:29 +08:00
Catouse a22350a027 * finish task #4728. 2018-09-13 12:03:03 +08:00
Yagami ae2183f901 * Fix testtask groupcase pri width. 2018-09-13 10:42:30 +08:00
Yagami 2ddb4a35d1 * Fix report default button. 2018-09-13 10:29:23 +08:00
wangyidong 8fb91427a5 * finish task #4718. 2018-09-12 13:19:28 +08:00
Yagami 0742e37f89 * Finish task #4715. 2018-09-12 11:02:40 +08:00
Yagami be25ee3bd3 * Finish task #4717. 2018-09-11 15:33:07 +08:00
chenfeiCF a3dd13ddc0 * Finish task #4727, #4756. 2018-09-11 13:01:31 +08:00
Yagami 9ef2f028c2 * Fix groupcase method. 2018-09-11 10:20:56 +08:00
wangyidong 800a77fff6 * finish task #4764. 2018-09-10 15:23:59 +08:00
wangyidong fb9e21ffa4 * adjust code. 2018-09-07 14:10:14 +08:00
Yagami d45210d7bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 10:19:31 +08:00
Yagami cd3ab96967 * Finish task #4767. 2018-09-07 10:18:56 +08:00
wangyidong 0c5a8851f6 * finish task #4785. 2018-09-06 17:34:08 +08:00
wangyidong 7a49b3b6c7 * finish task #4834. 2018-09-06 08:51:26 +08:00
wangyidong 897ad0fdae Merge branch 'master' of github.com:easysoft/zentaopms 2018-07-23 15:07:46 +08:00
wangyidong 38b3d7e6fd * fix bug #2068,2065,2064,2053. 2018-07-23 15:06:49 +08:00
daitingting 323e4f80ad * Add space. 2018-07-19 15:29:34 +08:00
daitingting db8632234f * Use html for link in mail, fix bug #1235. 2018-07-18 17:12:43 +08:00
liugang d7cd324f90 * Remove defaultChosenOptions. 2018-07-12 09:17:50 +08:00
chenfeiCF 1992a70e9c * Adjust for task #4496. 2018-07-11 14:58:30 +08:00
liugang 80a5334c7a * Finish task #4485 2018-07-10 13:34:32 +08:00
Catouse 07dcbac2fe * add title attributes. 2018-07-09 15:35:56 +08:00
dajiao007 cb13c64e9c * modify english labels 2018-07-09 09:39:49 +08:00
Catouse fb093f7f95 * fix modal header style and add title attribute. 2018-07-05 13:39:33 +08:00
wangyidong f055eed1ef * finish task #4590. 2018-07-04 09:48:19 +08:00
wangyidong bbae037e9f * finish task #4529. 2018-07-04 09:08:20 +08:00
daitingting 537699060f * Adjust codes. 2018-07-03 16:26:44 +08:00
daitingting fd2754f293 * Remove fixedTableHead for these reports. 2018-07-03 09:41:10 +08:00
daitingting 2b4a58c118 * Adjust width for product name. 2018-07-02 15:04:53 +08:00
daitingting ea34c73c9b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-07-02 13:43:20 +08:00
daitingting 6892137d99 * Display menu that can link by bug. 2018-07-02 13:42:13 +08:00
wangyidong 02b2a38ac2 * finish task #4492. 2018-07-02 10:39:28 +08:00
daitingting eced83d13a * Adjust $config => $this->config. 2018-06-28 16:25:48 +08:00