Commit Graph
1876 Commits
Author SHA1 Message Date
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
liuruogu c41c562767 * Fix bug for menu. 2022-09-19 06:45:18 +00: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
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
liuruogu 04824e964b * Finish task #69016. 2022-09-15 05:12:30 +00:00
xieqiyu 62b51f7c9e * Code for task#66954,66959. 2022-09-07 14:20:33 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
李玉春 6399c58056 Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976

See merge request easycorp/zentaopms!5017
2022-08-18 09:57:34 +00:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
王怡栋 f3d49ef75f Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939

See merge request easycorp/zentaopms!5010
2022-08-18 05:54:12 +00:00
mayue e95ecf9244 * Finish task #64939. 2022-08-17 16:20:17 +08:00
caoyanyi 8c1a24d3b5 Merge branch 'master' into zenops_41 2022-08-17 16:03:23 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
tanghucheng 517fd4b79e * Fix bug for gantt menu. 2022-08-15 15:44:47 +08:00
tanghucheng 2bc6e7a1e8 * Sort execution and project gantt menu . 2022-08-15 14:28:31 +08:00
liyuchun a4b8a6eba2 Merge branch 'master' into zenops_41 2022-08-15 09:38:48 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
hufangzhou b44ed94231 * Finish task #62965. Fix bug #26130, #26129, #26120. 2022-08-08 16:31:20 +08:00