Commit Graph
2232 Commits
Author SHA1 Message Date
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
daitingting 1e7ad8f0f2 * Finish task #71588,#71589,#71590,#71591. 2022-10-10 08:22:50 +00:00
tianshujie ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
曹延义 0bff4d85fd * Fix bug #28360. 2022-10-10 15:49:57 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
tianshujie 531f5d2cb8 * Finish task #71905. 2022-10-10 14:14:55 +08:00
wangyuting2 79aca158d8 * Finish task #71645. 2022-10-10 02:05:06 +00:00
wangzemei f0c3b79018 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878 2022-10-09 15:42:16 +08:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08: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
wangzemei ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
dingyongliang 61a485590e * change nest toggle position. 2022-09-30 08:05:04 +00: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
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
sunguangming 4f58d80d64 * Hide bug plan in waterfall project. 2022-09-29 16:05:03 +08:00
wangyidong 101ff49a06 * fix bug #28209. 2022-09-29 15:42:39 +08:00
tianshujie d4182b0360 * Finish task #70503. 2022-09-29 13:55:58 +08:00
sunguangming 595b5f8f83 * Code for task #71167. 2022-09-29 11:36:18 +08:00
wangyidong 1e928ed625 * code for task #70541. 2022-09-29 09:50:11 +08:00
tianshujie 51fb885b08 * Finish task #70482. 2022-09-28 15:10:49 +08:00
曹延义 d16362e3da * Set batch edit checkbox style to cookie. 2022-09-28 08:58:30 +08:00
wangyidong 4f822a5bd5 * code task #70322. 2022-09-27 15:42:53 +08:00
tanghucheng 2fbae5ed72 * Finish task #70759. 2022-09-27 11:10:47 +08:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
曹延义 3f357a3799 * Code for task #70484. 2022-09-26 10:37:39 +08:00
wangyidong 685799b216 * adjust for set no sprint Menu. 2022-09-23 16:22:32 +08:00
王怡栋 4d635243bc Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5509
2022-09-23 03:16:41 +00:00
wangzemei 20ccc81a8a * fix bug 27863 2022-09-23 10:52:47 +08:00
tianshujie 85d0124403 * Fix bug #27778. 2022-09-23 09:48:39 +08:00
wangyidong cd1798bee6 * fix bug #27768. 2022-09-22 16:08:42 +08:00
lanzongjun c4c57794ea * fix bug #27788 2022-09-22 14:49:33 +08:00
zhouxin e095fe4384 * Resolve feedback #854. 2022-09-22 10:52:46 +08:00
lanzongjun bfba29a435 fix noSprint def val 2022-09-22 09:39:48 +08:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
lanzongjun 305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
zhouxin 55dd069752 * Solve feedback #254. 2022-09-19 16:58:56 +08:00
liugang 807952f921 * Finish task #69599. 2022-09-19 15:36:40 +08:00
liugang 2bbf63e9dc * Finish task #69599. 2022-09-19 15:25:17 +08:00
tanghucheng 30ad85c622 * Finish task #69004. 2022-09-16 16:11:55 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
tanghucheng c58ef703a4 * Finish task #69007. 2022-09-15 15:25:25 +08:00
刘刚 02de591f31 Merge branch 'sprint/239_liugang_fixStyle' into 'zentaopms_239'
* Display the products and the plans on the edit page of the project module if...

See merge request easycorp/zentaopms!5342
2022-09-15 05:13:01 +00:00
liugang fefdfe5b49 * Adjust the vertical align. 2022-09-15 13:07:43 +08:00
liugang 93b221c6a6 * Display the products and the plans on the edit page of the project module if the project has product. 2022-09-15 13:06:23 +08:00
liugang 042a9a97c3 * Display the project type on the edit page of the project module. 2022-09-15 13:05:14 +08:00
liuruogu 04cd8275fe * Finish task #69016. 2022-09-15 02:42:40 +00:00
liugang b45b3e3661 * Finish task #68999. 2022-09-14 14:07:00 +08:00
tianshujie ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00