Commit Graph
1166 Commits
Author SHA1 Message Date
王怡栋 6164fa0c69 Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.

See merge request easycorp/zentaopms!6243
2022-11-18 07:18:30 +00:00
wangyuting 5df0b941b1 * Fix bug #29959. 2022-11-18 02:51:50 +00:00
daitingting 6743a6e779 * Fix bug #29931. 2022-11-18 02:40:02 +00:00
wangyuting eb8f8bac5e * Fix bug #29692. 2022-11-16 05:29:40 +00:00
王怡栋 6fc2d1bd23 Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.

See merge request easycorp/zentaopms!6160
2022-11-15 08:31:10 +00:00
daitingting 37caf86461 * Fix bug #29665. 2022-11-15 06:58:54 +00:00
daitingting 8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
liuhong d7f9d55863 * Resolved feedback #1422. 2022-11-15 02:15:12 +00:00
Yagami 7bd15c19ce * Fix bug #75356. 2022-11-10 09:46:25 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting 8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
daitingting 16706253e7 * Finish task #73989, #73990. 2022-10-31 06:27:40 +00:00
daitingting 6a2200647e * Fix bug #29073. 2022-10-28 09:08:37 +00:00
Yagami 644e28c670 * Fix bug #29099. 2022-10-28 16:28:48 +08:00
wangyidong 7050943933 * fix bug #29017. 2022-10-28 15:25:17 +08:00
Yagami 1ec7f132ea * Code for edit product page. 2022-10-28 08:35:15 +08:00
daitingting c338b9a237 * Adjust codes. 2022-10-27 06:30:12 +00:00
daitingting 4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
唐胡成 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