Commit Graph
1228 Commits
Author SHA1 Message Date
zhujinyong 72b41be5b0 - Remove die() of action module. 2021-12-20 09:05:16 +08:00
liumengyi 23bec4a9ed * Modify code format. 2021-12-20 08:43:34 +08:00
liumengyi 79c523399b * Modify kanban judgment in recycle bin. 2021-12-20 08:28:18 +08:00
liumengyi 7d3ad08bc6 * Finish task #46158, and fix bug #17657,#17655. 2021-12-17 15:39:41 +08:00
caoyanyi d9a5f136b1 * Add gitlab tag create function and page. 2021-12-16 05:13:43 +00:00
xieqiyu fde47bebb6 * Fix bug#17516. 2021-12-14 16:56:59 +08:00
tianshujie cc414d4e14 * Fix Kanban dynamic issue. 2021-12-13 17:45:42 +08:00
liyuchun 4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
李玉春 fbe7f981ab Merge branch 'sprint/devops16_17345' into 'sprint/devops16'
* Fix bug#17345

See merge request easycorp/zentaopms!890
2021-12-13 03:26:13 +00:00
zhujinyong ad8b03c73f * Refactoring of getDynamic. 2021-12-13 11:03:58 +08:00
王怡栋 49cd37e6de * code task #45436. 2021-12-10 14:38:08 +08:00
tianshujie 5d7a3c9215 * Add dynamic link. 2021-12-10 14:24:16 +08:00
zenggang 03a729542c * Fix bug#17345 2021-12-10 05:51:55 +00:00
王怡栋 e3e5325efb * code for task #45436. 2021-12-09 16:49:46 +08:00
王怡栋 43555ed066 * code for task #45436. 2021-12-09 16:31:51 +08:00
孙广明 f447e44833 Merge branch 'kanban' into 'sprint/177_liumengyi_45823'
# Conflicts:
#   module/kanban/control.php
2021-12-09 06:41:49 +00:00
liumengyi 840082e4c1 * Finish task #45823. 2021-12-09 14:27:21 +08:00
hufangzhou 32c7a078a7 * Fix the code error. 2021-12-09 10:34:47 +08:00
liumengyi f0e55ad2a4 * Fix bug #17227. 2021-12-09 10:34:47 +08:00
李玉春 30aa071426 Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-09 10:34:47 +08:00
liyuchun 76748224eb * Finish task #45491. 2021-12-09 10:34:47 +08:00
liumengyi 7ea719984d * Add kanban space edit function. 2021-12-09 08:59:40 +08:00
tianshujie a0e40c020d * Add Kanban space creation function. 2021-12-08 15:38:45 +08:00
孙广明 87c24eae5a Merge branch 'sprint/174_hufangzhou_action' into 'master'
* Fix the code error.

See merge request easycorp/zentaopms!817
2021-12-08 00:55:02 +00:00
hufangzhou 5c53afeeed * Fix the code error. 2021-12-08 08:47:00 +08:00
liumengyi 07cd32ed75 * Fix bug #17227. 2021-12-07 18:11:43 +08:00
李玉春 3f2793e5bd Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-07 08:50:57 +00:00
王怡栋 cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
2021-12-07 08:49:16 +00:00
王怡栋 ff06288dc8 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803
2021-12-07 08:21:33 +00:00
liyuchun b11dd3af4e * Finish task #45491. 2021-12-07 16:15:21 +08:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
孙广明 664ba5336a * Add lang. 2021-12-06 08:20:21 +08:00
孙广明 9144c435bc * Fix bug #17068. 2021-12-03 13:49:57 +08:00
zenggang 4b53f349df * Fix bug#16736,17037,16844 2021-12-03 01:59:04 +00:00
zenggang a48f584ca8 * Fix bug#16765,16771 2021-12-02 07:14:31 +00:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
zenggang 660108cc17 * Fix bug#16773 2021-12-01 03:30:02 +00:00
liumengyi bba0c40dfe * Fix bug #16882, #16924. 2021-12-01 11:25:02 +08:00
zenggang f6049dbe00 * Fix bug#16771 2021-11-30 07:25:03 +00:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
zenggang 5d192a8413 * Fix bug#16764 2021-11-30 06:37:17 +00:00
孙广明 e5a9358acd Merge branch 'sprint/29_zhouxin_45106' into 'sprint/168'
Finish task #45106.

See merge request easycorp/zentaopms!649
2021-11-30 05:11:52 +00:00
zhouxin 2fa0124ed8 Finish task #45106. 2021-11-30 04:27:11 +00:00
liumengyi bd6a007e6a * Add comment. 2021-11-30 10:55:51 +08:00
liumengyi 4b9ee832e1 * Add comment. 2021-11-30 10:20:50 +08:00
liumengyi 3e346ef8d9 * Modify refactor. 2021-11-30 09:31:08 +08:00
liumengyi 62907853b4 * Finish task #45156. 2021-11-30 09:10:42 +08:00
王怡栋 21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
liumengyi f164f0cdd0 * Fix bug #16892. 2021-11-29 15:19:19 +08:00