Commit Graph
1902 Commits
Author SHA1 Message Date
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
xieqiyu 60444fd796 * Code for task#73360,#73366,#73363. 2022-10-25 16:46:56 +00:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
wangyidong 723b0a02e1 * code for task #72778. 2022-10-20 11:26:12 +08:00
Yagami 03fe10a21c * Finish task #72675. 2022-10-20 10:07:48 +08:00
Yagami b4bdcd0ca3 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 15:36:28 +08:00
Yagami 187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
wangyuting2 ecaff099cd * Finish task #72773. 2022-10-19 05:45:15 +00:00
Yagami c330b6bc06 * Finish task #72673. 2022-10-19 13:07:04 +08:00
Yagami de225ca01f Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 09:24:15 +08:00
Yagami 6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00
wangyidong 78dad96c26 * code for task #72778. 2022-10-18 13:45:12 +08:00
wangyidong 617f801769 * adjust for #71672,71671,71670,71669,71668,71667,71666. 2022-10-17 10:10:43 +08:00
wangyidong 36f9aa8ad5 * code for task #71660.#71661,#71662,#71663,#71664,#71665. 2022-10-11 15:54:40 +08:00
wangyidong deb373941a Merge branch 'zentaopms_239_task#71585' into zentaopms_239 2022-10-10 17:23:09 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
wangyidong c13286de9e * code for task #71659. 2022-10-10 14:13:25 +08:00
李玉春 be9e0b7ff9 Merge branch 'zentaopms_239_wangjianhua_70792' into 'zentaopms_239'
* Finish task #70792: Create code repository in module of project without product.

See merge request easycorp/zentaopms!5687
2022-10-10 01:08:30 +00:00
liuruogu 18a6694b4c * Fix bug #28289. 2022-10-09 09:00:41 +00:00
wangjianhua fbf7bd7907 * Finish task #70792: Create code repository in module of project without product. 2022-10-09 14:43:52 +08:00
wangzemei 54f94d95c0 * finish task #71898 2022-10-09 10:42:30 +08:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
wangyuting2 39c364df74 * Finish task #70851. 2022-09-28 01:38:51 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
sunguangming 80430df79d * Finish task #70101. 2022-09-26 14:20:42 +08:00
wangyuting2 645e068158 * Finish task #69722. 2022-09-22 07:44:03 +00:00
daitingting 8490bf7dbf * Rename noExecution to noSprint.
* Optimize codes.
2022-09-21 01:12:39 +00:00
wangyidong 64689cbd17 * code for task #69707. 2022-09-20 15:44:33 +08:00
liyuchun db22664fbc Merge branch 'master' into zenops_46 2022-09-20 08:22:38 +08:00
liuruogu c41c562767 * Fix bug for menu. 2022-09-19 06:45:18 +00:00
liyuchun b348850046 * Finish task #68711. 2022-09-19 14:38:07 +08:00
刘刚 2c85588d1a Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Finish task #69017.

See merge request easycorp/zentaopms!5387
2022-09-19 02:02:08 +00:00
liyuchun 62c6b45d70 * Add function to select template. 2022-09-16 15:47:10 +08:00
liuruogu cfc214c776 * Finish task #69017. 2022-09-16 07:42:20 +00:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
tanghucheng ebeb74af0f * * Fix bug for common lang. 2022-09-16 13:36:40 +08:00
唐胡成 960e138526 Merge branch 'zentaopms_239' into 'zentaopms_239_tanghucheng'
# Conflicts:
#   module/common/lang/en.php
#   module/common/lang/fr.php
#   module/common/lang/menu.php
2022-09-16 05:21:43 +00:00
tanghucheng 14dd9807e9 * Finish task #69006. 2022-09-16 13:13:26 +08:00
liuruogu b8d30bed93 * Fix bug for lang. 2022-09-16 03:21:31 +00:00
liuruogu 788741caf8 * Light menu. 2022-09-16 02:45:28 +00:00
liuruogu 34bfa0e423 * Light menu. 2022-09-16 02:43:34 +00:00
daitingting c44bc35ec6 * Adjust language. 2022-09-16 02:38:51 +00:00
liuruogu 234cf3ff97 * Finish task #69013. 2022-09-16 01:05:29 +00:00
daitingting fe13c4de38 * Doing task #69253. 2022-09-16 01:02:13 +00:00
liuruogu 8296ebbb9f * Finsih task #69013. 2022-09-15 08:49:10 +00:00
liuruogu 17392ef1ac * Finsih task #69013. 2022-09-15 08:45:57 +00:00
liyuchun 18496b20b5 * Code for task #68710. 2022-09-15 14:12:21 +08:00