Commit Graph
4980 Commits
Author SHA1 Message Date
liumengyi 55a2a8b9a9 * Modify css of task #83210. 2023-01-30 16:00:43 +08:00
liumengyi 5e179c8b05 * Finish task #83215, #83210. 2023-01-30 15:39:20 +08:00
王怡栋 dcc2392506 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389.

See merge request easycorp/zentaopms!6787
2023-01-29 05:08:18 +00:00
liuhong 14679274a3 * Fix bug #30389. 2023-01-29 03:08:37 +00:00
liuyongkai 3c02bddefd * Fix project's teamCount displayed incorrectly. 2023-01-29 10:33:41 +08:00
xieqiyu 1a12607799 * Fix bug#25663. 2023-01-19 11:47:54 +08:00
caoyanyi 5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
liuhong 3641ffc165 * Adjust position for required label. 2023-01-06 08:30:00 +00:00
liuhong 913a8d8470 * Fix bug #31537. 2023-01-06 06:04:38 +00:00
孙广明 c29776bbfe Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6667
2023-01-03 05:54:09 +00:00
tianshujie b2142bed14 * Fix bug #30169. 2023-01-03 09:45:11 +08:00
tianshujie c7aaedcd8b * Fix bug #30284. 2023-01-03 09:28:03 +08:00
tianshujie 12b925779c * Fix bug #30285. 2023-01-03 09:13:36 +08:00
wangyidong ccec9bcc16 Merge branch 'zentaopms279' 2023-01-03 08:39:33 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
tanghucheng ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
xieqiyu 4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
wangyidong 56c5cac759 * code for task #81410. 2022-12-28 14:32:22 +08:00
xieqiyu 2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
zenggang f58530fcd8 * Fix bug#26051 2022-12-23 02:56:21 +00:00
wangyidong a65844d582 * fix bug #30008. 2022-12-23 10:48:15 +08:00
wangyidong 0a3df6b5ec * fix bug #30254. 2022-12-23 10:21:12 +08:00
wangyidong 13e8ae5728 * adjust code. 2022-12-23 08:11:36 +08:00
wangyidong 0369dba360 * adjust for execution field width for project build page. 2022-12-22 19:24:49 +08:00
caoyanyi 71bc8ac80a Merge branch 'master' into zenops_46 2022-12-21 13:56:27 +08:00
wangyidong 164cca5ffe * code task #80451. 2022-12-21 10:31:46 +08:00
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
lanzongjun 7e91261485 * Fix Bug #30943 2022-12-19 11:15:51 +08:00
wangzemei e596b31431 * project/manageMembers: optimize the style of the picker 2022-12-15 16:41:34 +08:00
孙广明 7bb5217ea9 Merge branch 'master_xieqiyu_79440' into 'master'
* Code for task#79440.

See merge request easycorp/zentaopms!6556
2022-12-15 07:53:13 +00:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
王怡栋 6fe7f03e7e Merge branch 'feedback_1576' into 'master'
* Resolve feedback#1576

See merge request easycorp/zentaopms!6530
2022-12-15 06:53:08 +00:00
xieqiyu fa65b4a6e0 * Code for task#79440. 2022-12-15 13:43:08 +08:00
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
王怡栋 2f2c098958 Merge branch 'zentaopms273_wyd' into 'master'
* fix bug #30769.

See merge request easycorp/zentaopms!6545
2022-12-14 03:05:49 +00:00
wangyidong c7e2ac395d * fix bug #30769. 2022-12-14 11:04:44 +08:00
zenggang d926fe817d * Resolve feedback#1576 2022-12-13 03:07:29 +00:00
lanzongjun 0a492b61fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-13 09:08:08 +08:00
lanzongjun d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
Yagami 27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
Yagami b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
wangyidong 81d3403a20 * code for task #79279. 2022-12-09 16:54:17 +08:00
孙广明 8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
tanghucheng e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
wangyidong f1b27ca35a * fix bug #30745. 2022-12-09 12:23:09 +08:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
Yagami fb95d28f5a * Fix bug #30569. 2022-12-08 14:17:43 +08:00
孙广明 31ef3e0260 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480

See merge request easycorp/zentaopms!6498
2022-12-08 06:05:50 +00:00
lanzongjun 0f4ef051bf * Finish Bug #30480 2022-12-08 13:44:28 +08:00