Commit Graph
3690 Commits
Author SHA1 Message Date
hufangzhou 2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
zhouxin 18383e225b Fix bug #17665. 2021-12-22 07:44:26 +00:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
孙广明 81378356b6 * Code for project priv. 2021-12-20 11:30:37 +08:00
孙广明 2df43b48b8 * Fix project priv bug. 2021-12-20 11:23:33 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
朱金勇 67ecc5f8c8 Merge branch 'sprint/178_songchenxuan_46099' into 'master'
*Finish task #46099.

See merge request easycorp/zentaopms!974
2021-12-17 07:40:10 +00:00
songchenxuan 63479860a5 *Finish task #46099. 2021-12-17 13:56:24 +08:00
孙广明 6ee1345b07 * Reset project priv. 2021-12-17 10:13:49 +08:00
tianshujie 9ad591fc93 * Realize the function of sub-molecules. 2021-12-17 09:27:50 +08:00
songchenxuan fb8793f1d3 *Finish task #46099. 2021-12-15 17:29:31 +08:00
孙广明 04eb385659 * Fix bug. 2021-12-15 14:34:52 +08:00
Hao Sun 2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
zhouxin 4f5367dae7 made small changes. 2021-12-13 08:56:39 +00:00
zhouxin 40f27795e1 change if...else to switch...case,change now to today. 2021-12-13 08:45:37 +00:00
zhouxin 9567620ff4 Finish task #45800. 2021-12-13 07:53:23 +00:00
朱金勇 f1e97497a3 Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!903
2021-12-13 00:46:27 +00:00
xieqiyu 46ed4772cf * Delete unused code. 2021-12-11 14:39:19 +08:00
xieqiyu 5472859d6e * Code for task#45536. 2021-12-11 14:28:45 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu c33000b578 * Code for task#45536. 2021-12-10 13:11:37 +08:00
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
hufangzhou 1517a800e2 * Fix an error for lang item. 2021-12-09 10:34:47 +08:00
tianshujie 2030bbd11c * Fix bug #17173. 2021-12-09 10:34:47 +08:00
tianshujie ec5d481dc8 * Fix bug #17272. 2021-12-09 10:34:47 +08:00
tianshujie 7c3a8dc753 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
孙广明 14b272a1af * Merge 169 untrack file to master. 2021-12-09 10:34:47 +08:00
hufangzhou 73b43980eb * Fix an error for lang item. 2021-12-09 10:12:08 +08:00
tianshujie 9818fe17de * Fix bug #17173. 2021-12-09 10:04:46 +08:00
tianshujie a2355212ad * Fix bug #17272. 2021-12-08 17:08:10 +08:00
tianshujie 545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
王怡栋 7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
2021-12-06 07:14:51 +00:00
孙广明 f3bd7149f9 Merge branch 'sprint/174_sunhao/improve_kanban' into 'master'
* Improve kanban UI, bug #17063.

See merge request easycorp/zentaopms!787
2021-12-06 05:11:11 +00:00
Hao Sun 18c0ef3210 * Custom dnd rules for project kanban. 2021-12-06 11:30:11 +08:00
Hao Sun 50ad00b1c4 * Fix dnd not work in project kanban. 2021-12-06 11:19:05 +08:00
Hao Sun 8d08be2f57 * Fix cards count incorrect on some kanbans. 2021-12-06 11:18:49 +08:00
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
孙广明 ad1cc7c04f Merge branch 'sprint/174_hufangzhou_17077' into 'master'
* Fix bug #17077.

See merge request easycorp/zentaopms!774
2021-12-06 02:33:35 +00:00
hufangzhou 145fc2a461 * Fix bug #17074. 2021-12-06 10:27:51 +08:00
孙广明 5a8e51a9c6 Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Merge programplan into stage.

See merge request easycorp/zentaopms!760
2021-12-06 00:33:10 +00:00
tanghucheng 613d171dde * Merge programplan into stage. 2021-12-03 09:20:08 +08:00
tanghucheng 686c40396b * Merge programplan into stage. 2021-12-03 09:11:43 +08:00
tanghucheng 19420bef7b * Code for stage. 2021-12-03 00:55:54 +08:00
liumengyi 9d7cd3b29e * Fix bug #17031,#17029. 2021-12-02 16:08:17 +08:00
王怡栋 bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00