Commit Graph

3185 Commits

Author SHA1 Message Date
孙广明
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
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
Hao Sun
62efd53edb * update kanban lib and refactor usage of it. 2021-12-02 16:54:56 +08:00
zhengrunyu
bd075ac17d *Fixbug #16978. 2021-12-02 11:18:53 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
李玉春
686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
2021-12-01 05:23:47 +00:00
zhujinyong
c1750bffca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 11:32:38 +08:00
zhujinyong
8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
tanghucheng
0224791b5a * Fix waterfall menu. 2021-12-01 11:08:13 +08:00
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
王怡栋
fc591306b5 * code for task #45297. 2021-12-01 09:17:20 +08:00
Hao Sun
5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun
88e67add78 * refactor usage of kanban. 2021-11-30 14:21:24 +08:00
Hao Sun
39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
李玉春
4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
mayue
d89aa24c8c * Finish task #44987,44988,44989. 2021-11-30 10:32:11 +08:00
王怡栋
ef2385a150 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-11-30 09:38:44 +08:00
王怡栋
85d498c5cb * replace lib for markdown to html. 2021-11-30 09:38:12 +08:00
李玉春
0cf53a32e0 Merge branch 'sprint/174_songchenxuan_45048' into 'master'
* Finish task 45048.

See merge request easycorp/zentaopms!650
2021-11-29 09:37:35 +00:00
songchenxuan
908f51250b * Fix bug #15737. 2021-11-29 16:17:04 +08:00
王怡栋
21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
mayue
a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
王怡栋
d41d6cf262 * adjust for api. 2021-11-26 13:28:45 +08:00
孙广明
c5e7bd91c3 * Fix php 5.3 bug. 2021-11-24 15:06:09 +08:00
孙广明
c6d990a3f5 * Fix bug #16530. 2021-11-23 16:26:30 +08:00
王怡栋
74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
Hao Sun
b011796c15 * fix php syntax error. 2021-11-22 15:33:59 +08:00
Hao Sun
6619652319 * append special class to body in client mode. 2021-11-22 15:10:00 +08:00
liumengyi
e477c580bf * Fix Bug #16505. 2021-11-22 10:28:18 +08:00
liyuchun
8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
李玉春
ba8ec26e96 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Add realBegan for program.

See merge request easycorp/zentaopms!529
2021-11-18 09:21:25 +00:00
zhouxin
88938892b0 Add realBegan for program. 2021-11-18 16:49:11 +08:00
xiawenlong
c7081db530 * Finish task 29162,29163 2021-11-18 15:31:26 +08:00
李玉春
3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00