Commit Graph
3222 Commits
Author SHA1 Message Date
liyuchun 5724bd4fc5 * Fix bug #18435,#18437. 2022-01-17 13:37:11 +08:00
caoyanyi 8dff489e72 * Finish task #47224. 2022-01-11 02:50:35 +00:00
孙广明 b57562e99e Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
2022-01-11 00:35:04 +00:00
hufangzhou 0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
王怡栋 7001079844 * adjust for block priv. 2022-01-04 11:28:43 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
Hao Sun e6a1f039b1 * move picker lib to zui. 2021-12-30 15:38:05 +08:00
孙广明 3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
zhujinyong a0797b61db * Fix bug: remove $this. 2021-12-28 08:19:59 +08:00
Mr曹 465fbda7f4 * Add language to zentao app. 2021-12-24 17:12:19 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
zhouxin 5285fc3ac4 Fix bug #17797. 2021-12-22 01:41:09 +00:00
李玉春 c474449b54 Merge branch 'sgm_fixbug' into 'master'
* Fix project priv bug.

See merge request easycorp/zentaopms!1012
2021-12-21 09:47:11 +00:00
hufangzhou 863965e61a * Finish task #46097. 2021-12-21 15:53:27 +08:00
tianshujie 171045fab4 * Fix bug #17756,#17755,#17754,#17752,#17747. 2021-12-21 13:59:03 +08:00
tianshujie 8ea2cc8e9e * Fix bug #17704,17740,17694. 2021-12-21 09:53:44 +08:00
tianshujie 5863beeb76 * Remove extra spaces. 2021-12-21 09:01:53 +08:00
tianshujie d364b7c362 * Remove useless attributes. 2021-12-21 08:53:21 +08:00
tianshujie c04c2506ae * Finish task #46245. 2021-12-21 08:51:03 +08:00
孙广明 f5bc141f55 * Fix project priv bug. 2021-12-20 17:08:30 +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
朱金勇 c0fd222c18 Merge branch 'sprint/178_xieqiyu_46102' into 'master'
* Code for task#46102.

See merge request easycorp/zentaopms!990
2021-12-17 07:45:23 +00:00
孙广明 6ee1345b07 * Reset project priv. 2021-12-17 10:13:49 +08:00
xieqiyu 788c1c3f42 * Code for task#46102. 2021-12-16 09:42:50 +08:00
Hao Sun 2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
tianshujie cc414d4e14 * Fix Kanban dynamic issue. 2021-12-13 17:45:42 +08:00
孙广明 006fca3fe3 * Finish task #45818. 2021-12-09 16:53:53 +08:00
孙广明 14b272a1af * Merge 169 untrack file to master. 2021-12-09 10:34:47 +08:00
tanghucheng bca881ebec * Fix bug #17126. 2021-12-09 10:34:47 +08:00
孙广明 114629ec8d Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Fix bug #17126.

See merge request easycorp/zentaopms!797
2021-12-08 07:08:40 +00:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
tianshujie 7176ef2b55 * Remove useless code. 2021-12-07 16:12:45 +08:00
tianshujie 9f2364c021 * Modify zone to space. 2021-12-07 16:07:50 +08:00
tianshujie b69d36f0d1 * Add Kanban first level navigation. 2021-12-07 14:59:30 +08:00
tanghucheng 5d1da3d0f5 * Fix bug #17126. 2021-12-07 09:33:52 +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
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
孙广明 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
zhengrunyu cda9cdf969 *Fixbug . 2021-12-03 10:04:54 +08:00
tanghucheng 579d98ada1 * Merge programplan into stage. 2021-12-03 09:39:37 +08: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
朱金勇 789a419696 Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Support for using kanban in old browsers without CSS flex.

See merge request easycorp/zentaopms!757
2021-12-03 00:50:26 +00:00
孙广明 24c613bba9 * Fix bug. 2021-12-02 17:01:33 +08:00