Commit Graph
1196 Commits
Author SHA1 Message Date
唐胡成 122a34b4a5 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Fix bug #29016,#29006,#29020.

See merge request easycorp/zentaopms!5909
2022-10-27 03:19:48 +00:00
tanghucheng ae7589b5e4 * Fix bug #29016,#29006,#29020. 2022-10-27 10:44:59 +08:00
孙广明 7a4179a210 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Finish task #73241.

See merge request easycorp/zentaopms!5889
2022-10-27 01:03:26 +00:00
tanghucheng d96d6bb803 * Finish task #73234,73242. 2022-10-27 08:09:26 +08:00
Yagami 2f04710843 * Finish task #73233. 2022-10-26 15:41:53 +08:00
daitingting fd288a6a3c * Finish task #71566,#71567,#72987. 2022-10-25 08:20:29 +00:00
Yagami 1875b5be0e * Fix bug #73233. 2022-10-25 09:25:07 +08:00
wangyuting2 ee4ffb51eb * Optimize code. 2022-10-24 08:49:37 +00:00
Yagami c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
daitingting ea9b26e581 * Finish task #71574. 2022-10-21 00:52:14 +00:00
wangyuting2 05f6ade106 * Finish task #71569. 2022-10-20 08:30:23 +00:00
Yagami 646dcaec32 * Finish task #72677. 2022-10-20 13:22:07 +08:00
王怡栋 15125e7cd1 Merge branch 'zentaopms_239_task#72763' into 'zentaopms_239'
* Finish task #72763 ~ #72772.

See merge request easycorp/zentaopms!5792
2022-10-19 05:27:22 +00:00
wangyuting2 49901fd7f9 * Finish task #72763 ~ #72772. 2022-10-19 03:03:59 +00:00
daitingting 6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
wangyuting2 206e0d0193 * Finish task #72260 and bug #28496. 2022-10-17 07:59:58 +00:00
wangjianhua 186f0b2828 * Remove repeated codes. 2022-10-13 11:41:28 +08:00
曹延义 704de9685b * Modify stage list data. 2022-10-12 13:16:40 +08:00
wangjianhua baee149721 * Add action logs and check privileges for linking project and Repos. 2022-10-11 17:23:55 +08:00
tianshujie 0b49c19866 * Fix bug #28451. 2022-10-11 14:53:01 +08:00
wangyuting2 c1703e2cb5 * Finish task #71645. 2022-10-11 01:40:45 +00:00
曹延义 bb688e7e49 * Code for task #72179. 2022-10-11 08:52:16 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
王怡栋 e65c5bd607 Merge branch 'zentaopms_239_task#71645' into 'zentaopms_239'
* Finish task #71645.

See merge request easycorp/zentaopms!5700
2022-10-10 03:02:36 +00:00
wangyuting2 79aca158d8 * Finish task #71645. 2022-10-10 02:05:06 +00:00
daitingting 39064a3e22 * Finish task #71580,#71581,#71582,#71583,#71584. 2022-10-09 08:22:27 +00:00
李玉春 ffc0440271 Merge branch 'zentaopms_239' into 'zentaopms_239_wangjianhua_70793'
# Conflicts:
#   module/project/lang/de.php
#   module/project/lang/en.php
#   module/project/lang/fr.php
#   module/project/lang/zh-cn.php
2022-10-09 02:25:26 +00:00
wangjianhua 7edfc6d6c8 * Add lang item and fix codes format. 2022-10-09 09:43:57 +08:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong acc7774419 * adjust for manage members and products for no multiple project. 2022-09-30 13:23:22 +08:00
tanghucheng f6bb08d1e2 * Task#70756 Reduction shadow product. 2022-09-30 10:18:25 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie 75b968bcbb * Fix bug #28216. 2022-09-29 17:46:26 +08:00
sunguangming 4f58d80d64 * Hide bug plan in waterfall project. 2022-09-29 16:05:03 +08:00
sunguangming 3c17a54dc6 * Code for task #71166. 2022-09-29 13:36:21 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
曹延义 5a652d9ef6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 15:57:00 +08:00
tanghucheng 83dbebc5b8 * Task#70759 Add relation productID for copyProject. 2022-09-28 11:16:33 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
wangyidong 2d42ff9e55 * code for task #70197. 2022-09-27 14:25:44 +08:00
tanghucheng 2fbae5ed72 * Finish task #70759. 2022-09-27 11:10:47 +08:00
tianshujie 3243e1d1c2 * Fix bug #27971. 2022-09-27 09:49:13 +08:00
王怡栋 444834b316 Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun'
# Conflicts:
#   module/custom/js/mode.js
#   module/custom/lang/de.php
#   module/custom/lang/en.php
#   module/custom/lang/fr.php
#   module/custom/lang/zh-cn.php
#   module/custom/view/mode.html.php
#   module/project/control.php
#   module/project/lang/zh-cn.php
2022-09-27 00:28:36 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
sunguangming f628589572 * Code for projecr priv. 2022-09-26 14:42:40 +08:00
lanzongjun 905a71ddf7 * fix bug meeting 2022-09-23 17:25:45 +08:00
liugang 5cf52d86dd * Fix bug #27584,27588,27596,27616,27620,27621,27631. 2022-09-23 15:45:00 +08:00
liugang ffc73c5d97 * Fix bug #27578. 2022-09-22 17:38:55 +08:00
lanzongjun 3438ffbbc0 * fix bug #27793 2022-09-22 15:27:04 +08:00