Commit Graph
301 Commits
Author SHA1 Message Date
songchenxuan 16670c5483 *Fix bug #18074. 2022-01-06 17:36:55 +08:00
songchenxuan 3e5df731bc *Fix bug #18074. 2022-01-06 17:32:48 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
李玉春 2bb6bb8825 Merge branch 'refactor' into 'master'
Refactor

See merge request easycorp/zentaopms!1229
2021-12-31 04:25:42 +00:00
liumengyi 3dd747f40a * Modify judgment for split chid plan. 2021-12-31 10:59:37 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
liumengyi e0d72a4c25 * Refactoring code for update status. 2021-12-31 09:40:46 +08:00
zenggang bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
xieqiyu 2b7249da7a * Code for task#46521. 2021-12-30 08:47:06 +08:00
liumengyi 36e9b91ba0 * Finish task #46660. 2021-12-28 15:11:27 +08:00
liyuchun 178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
liumengyi 259bfef9d9 * Add Kanban View. 2021-12-23 10:30:56 +08:00
孙广明 75a3d20358 Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
#   module/group/lang/resource.php
#   module/kanban/css/space.css
#   module/kanban/js/view.js
2021-12-22 06:03:21 +00:00
tianshujie dab44100d5 * Finish task #46241. 2021-12-22 13:16:32 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08: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
liumengyi 96ded748b6 * Add punctuation. 2021-12-21 13:50:40 +08:00
liumengyi b8166358ad * Finish task #46244, #46243. 2021-12-21 13:46:31 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +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
tianshujie cc414d4e14 * Fix Kanban dynamic issue. 2021-12-13 17:45:42 +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
王怡栋 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
liumengyi 840082e4c1 * Finish task #45823. 2021-12-09 14:27:21 +08:00
liumengyi 7ea719984d * Add kanban space edit function. 2021-12-09 08:59:40 +08: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
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +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
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
liumengyi b264aa3199 * Fix bug 16807,16892. 2021-11-30 09:46:30 +08:00
zenggang 7a53ada4b3 * Fix bug#16734 2021-11-26 03:00:16 +00:00
zenggang 8d458a0a72 * Finish task#44404 2021-11-23 11:08:15 +00:00
zenggang 699204dc87 * Finish task#44395 2021-11-22 07:20:48 +00:00
zenggang 2e677116d7 * Finish task#44399 2021-11-22 02:57:11 +00:00
zhouxin 02c028365b Modified language. 2021-11-19 15:27:52 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
dingguodong 9536d3caa8 * Fill in the missing code of action module for MR review. 2021-11-11 14:05:47 +08:00
hufangzhou 9f77cc6fb6 * Finish task #43898. 2021-11-09 17:16:30 +08:00
xieqiyu e53d644169 * Fix bug#16058. 2021-11-08 19:13:09 +08:00