Commit Graph
1035 Commits
Author SHA1 Message Date
xieqiyu 12844f3dc8 * Fix bug#22496. 2022-05-16 16:39:10 +08:00
tianshujie b715ecd177 * Finish task #53655. 2022-05-11 11:13:41 +08:00
孙华伟 d8d0d71e3e *Optimize the bug. 2022-04-28 15:06:59 +08:00
孙华伟 9395fe3210 *Fix new bug. 2022-04-28 14:33:40 +08:00
孙华伟 c11b818bc0 Update privbygroup.html.php 2022-04-28 05:20:26 +00:00
孙华伟 0cd1a57430 Update en.php 2022-04-28 05:18:35 +00:00
孙华伟 2817457166 *Add english. 2022-04-28 13:17:06 +08:00
孙华伟 95db914e93 *Optimize the bug. 2022-04-28 13:15:24 +08:00
孙华伟 4282d601bc *Fix bug#8180 2022-04-28 11:29:21 +08:00
liyuchun d960846c16 * Fix bug #14805. 2022-04-24 09:10:01 +00:00
liyuchun ade40aaa75 * Fix bug #12931. 2022-04-19 09:26:41 +08:00
xieqiyu bcee37d2a9 * Fix bug#6959. 2022-04-14 14:10:09 +08:00
tianshujie 2e5b43979e * Fix bug #21641. 2022-04-13 09:51:40 +08:00
王怡栋 53b0cd0c57 * code for bug #20133. 2022-04-08 11:27:23 +08:00
孙广明 af9545b817 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.

See merge request easycorp/zentaopms!2756
2022-04-07 07:57:51 +00:00
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
zenggang 2429bc7f6e * Fix bug#20886,16610 2022-04-07 01:58:09 +00:00
孙广明 ed276fb0fe Merge branch 'master_xieqiyu_20882' into 'master'
* Fix bug#20882.

See merge request easycorp/zentaopms!2743
2022-04-02 08:10:56 +00:00
xieqiyu 0ab12f5d80 * Fix bug#20882. 2022-04-02 13:07:33 +08:00
zenggang 8c1b36fb3d * Fix bug#13131,16610 2022-04-01 07:49:52 +00:00
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
孙广明 2907e3171d Merge branch 'fixbugs_zhouxin_15286' into 'master'
* Fix bug #15286.

See merge request easycorp/zentaopms!2645
2022-03-30 09:15:38 +00:00
zhouxin 88982a5e0e * Fix bug #15286. 2022-03-30 08:29:20 +00:00
tianshujie b452680fb3 * Fix bug #14841. 2022-03-30 14:48:34 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tanghucheng b9542612cb * Fix bug. 2022-03-16 09:51:36 +08:00
tanghucheng 9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
tianshujie 3c25a51bf2 * Fix bug #20738. 2022-03-14 16:59:51 +08:00
tianshujie 937c1a64ab * Fix the problem that professional R&D Kanban does not have permission to view. 2022-03-14 16:49:46 +08:00
王怡栋 7f8d7c6593 * fix bug #20490. 2022-03-11 10:26:33 +08:00
zhouxin 97216edb43 Adjust code. 2022-03-08 02:47:43 +00:00
zhouxin 63a6825b95 Fix bug 16448,16449. 2022-03-08 02:28:58 +00:00
孙华伟 664da372f1 *Fix bug #20279 2022-03-04 16:23:51 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明 f9ed1e1dd9 * Fix group bug. 2022-02-24 15:41:12 +08:00
songchenxuan f8bd597b39 *Privilage css. 2022-02-22 14:37:38 +08:00
孙广明 fdd36dce95 Merge branch 'sprint/185_zhouxin_49302' into 'sprint/185'
Sprint/185 zhouxin 49302

See merge request easycorp/zentaopms!1874
2022-02-22 01:58:09 +00:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhouxin 751fec28e8 Finish task #49302. 2022-02-21 08:53:25 +00:00
xieqiyu 4d3e06bce2 * Finish task#49308. 2022-02-18 14:04:20 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zenggang 1c667f6e63 * Finish task#48605 2022-02-08 07:44:24 +00:00
caoyanyi b4766914bc * Finish task #48608. 2022-02-08 03:21:20 +00:00
mayue 8d4ee4d242 * Modify permissions. 2022-01-27 10:39:17 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
liyuchun e9f36e078b * Add auth. 2022-01-25 16:36:43 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
zhengrunyu cc299e0b45 Fix bug 18885. 2022-01-24 14:24:19 +08:00
tianshujie 3c7f9cf529 * Add import permission. 2022-01-24 08:54:03 +08:00