Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
29,346 Commits 2 Branches 292 Tags
06cf26ea9a8182b540e4f3d6d8c13fb775e69335
Commit Graph

306 Commits

Author SHA1 Message Date
chaideqing
06cf26ea9a * add project name in execution card title 2021-12-03 09:58:26 +08:00
Wenrui LI
24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +08:00
chaideqing
45e127be6e * add linkButton tips in card and card do not show cross scroll 2021-12-01 14:59:33 +08:00
chaideqing
17ba1ea184 * add jump-link in xuanxuan_card which can jump to zentao_extension_page 2021-12-01 11:10:22 +08:00
chaideqing
de1a9ddd9b Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857 2021-12-01 10:35:47 +08:00
李玉春
2d1e0bb3dc Merge branch 'sprint/168_sgm_45160' into 'sprint/168' 
* Finish task #45160.

See merge request easycorp/zentaopms!664
 2021-11-30 05:15:34 +00:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
zhengrunyu
e78c876216 *Finish task #45148. 2021-11-30 09:22:04 +08:00
chaideqing
74f7a95902 * optimize zentao buglist/storylist/tasklist show when in xuanxuan card 2021-11-29 14:55:14 +08:00
zhengrunyu
b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
zhengrunyu
9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
zhengrunyu
07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu
119a3fab7d *Finish task #45151. 2021-11-26 08:48:26 +08:00
zhengrunyu
2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu
3340a383f1 *Finish task #45151. 2021-11-25 15:03:43 +08:00
liyuchun
da47c729d9 * Adjust execution button name. 2021-11-22 13:36:52 +08:00
liyuchun
9502610ece * Fix error for task #44358. 2021-11-22 08:39:34 +08:00
liyuchun
8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
Hao Sun
6ad007f06e * task #44357, refactor executions kanban with kanban component and support dnd. 2021-11-17 17:51:20 +08:00
李玉春
68653946e5 Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168' 
Sprint/171 sgm sortwiki

See merge request easycorp/zentaopms!435
 2021-11-12 05:24:19 +00:00
孙广明
70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
liyuchun
4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +08:00
孙广明
b4e9ab871d Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982' 
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
 2021-11-09 08:57:01 +00:00
liyuchun
cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +08:00
李玉春
60766cee16 Merge branch 'sprint/168_sgm_43995' into 'sprint/168' 
* Finish task #43955.

See merge request easycorp/zentaopms!359
 2021-11-09 06:36:52 +00:00
孙广明
954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun
f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +08:00
孙广明
1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +08:00
李玉春
f011907e1f Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168' 
* Change var name.

See merge request easycorp/zentaopms!281
 2021-11-02 06:13:46 +00:00
孙广明
90b6253107 * Fix var name. 2021-11-02 14:12:18 +08:00
李玉春
86c7464aca Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168' 
* Assign btn check priv.

See merge request easycorp/zentaopms!282
 2021-11-02 06:09:04 +00:00
孙广明
cc321393f6 * Change var name. 2021-11-02 14:05:53 +08:00
孙广明
3a61d3e8a6 Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' 
* Fix bug #15852.

See merge request easycorp/zentaopms!275
 2021-11-02 06:04:03 +00:00
孙广明
c7f0e74517 * Assign btn check priv. 2021-11-02 13:59:41 +08:00
liyuchun
03d1e570fc * Fix bug #15844. 2021-11-02 09:58:20 +08:00
孙广明
f7ce0adcd0 Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' 
* Fix bug #15901.

See merge request easycorp/zentaopms!270
 2021-11-02 01:05:03 +00:00
李玉春
cb3e573d30 Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168' 
* Fix bug #15902.

See merge request easycorp/zentaopms!269
 2021-11-02 00:34:38 +00:00
liyuchun
a925bd1d90 * Fix bug #15901. 2021-11-01 17:40:36 +08:00
tianshujie
5444d35cde * Fix bug #15902. 2021-11-01 17:34:25 +08:00
孙广明
1c98dbd28b Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' 
* Fix bug #15887,#15877,#15874.

See merge request easycorp/zentaopms!266
 2021-11-01 09:18:16 +00:00
liyuchun
1631791368 * Fix bug #15887,#15877. 2021-11-01 16:54:02 +08:00
孙广明
065b0d04c9 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' 
* Fix bug #15867.

See merge request easycorp/zentaopms!260
 2021-11-01 08:30:11 +00:00
liyuchun
d8c96a6430 * Fix bug #15867. 2021-11-01 16:13:13 +08:00
李玉春
16b6f5786e Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423' 
# Conflicts:
#   module/execution/js/kanban.js
#   module/kanban/model.php
 2021-11-01 08:12:58 +00:00
孙广明
2b2ec6f202 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' 
* Fix bug #15861.

See merge request easycorp/zentaopms!252
 2021-11-01 08:02:42 +00:00
hufangzhou
f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
孙广明
4099ac4a20 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168' 
Sprint/168 xieqiyu kanban

See merge request easycorp/zentaopms!253
 2021-11-01 05:53:00 +00:00
hufangzhou
702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
liyuchun
7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
dingna
c28e4c1b61 * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-11-01 13:26:57 +08:00