Commit Graph
277 Commits
Author SHA1 Message Date
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu 62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
lanzongjun afd4d269a2 * Finish Task #79665 2022-12-14 09:33:20 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
tianshujie 5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
caoyanyi 13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
caoyanyi 7716ba592e * Adjust code. 2022-10-28 10:39:24 +08:00
caoyanyi 284cade04a * Fix bug #28170. 2022-10-28 10:10:41 +08:00
daitingting c800b4101b * Finish task #71576,#71577,#71578,#71579. 2022-10-09 05:20:29 +00:00
liyuchun bf10b415df Merge branch 'zenops_44' into zenops_46 2022-09-20 08:33:44 +08:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
曹延义 d5fa809755 Merge branch 'master' into zenops_44 2022-09-09 10:59:26 +08:00
xieqiyu 80ff723165 * Code for task#67691. 2022-09-07 16:58:54 +08:00
liyuchun 5f04a8d798 Merge branch 'master' into zenops_44 2022-09-05 09:29:53 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
caoyanyi 20d6ee9e10 Merge branch 'master' into zenops_44 2022-08-30 16:39:58 +08:00
liyuchun 05034cc10c * Finish task #65978. 2022-08-29 11:19:25 +08:00
wangyidong 11c3ef03cc * adjust for delete estimate. 2022-08-26 22:14:53 +08:00
xieqiyu edfb5c538c * Fix bug#26898. 2022-08-26 15:16:50 +08:00
sunguangming a27dc9a3f2 * Code for mulit task. 2022-08-26 14:33:50 +08:00
liyuchun 61c88f627c * Finish task #65979,65978,65977. 2022-08-26 14:06:01 +08:00
sunguangming 01172dd284 * Code for muliple task. 2022-08-24 16:05:21 +08:00
王怡栋 378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
zenggang 56b4e30328 * Code for task#61964 2022-07-27 06:45:26 +00:00
tianshujie e73517cfc0 * Modify the style of the task view page return button. 2022-07-26 09:16:28 +08:00
chaideqing 3fc3cf64e0 * remove zentao card's top-right button 2022-07-26 09:12:42 +08:00
xieqiyu 12d9c215ee * Fix bug#25038. 2022-07-15 13:58:53 +08:00
chaideqing 69f20c1205 * replace xhtml to html when click card 2022-07-13 10:54:12 +08:00
tianshujie 8fbf4148c4 * Fix bug #24573. 2022-06-30 10:55:05 +08:00
孙广明 7a80448220 * Code for multi task. 2022-06-30 09:51:35 +08:00
孙广明 793a4ec698 * Code for multi task assignedTo. 2022-06-30 09:41:33 +08:00
孙广明 6c777a0a97 * Finish task #58771. 2022-06-29 13:50:57 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
leiyong c9f1e15c2f * Adjust CSS. 2022-06-17 05:20:32 +00:00
xieqiyu a384279f28 * Finish task#56911. 2022-06-14 13:45:45 +08:00
xieqiyu 030d826624 * Finish task#56912. 2022-06-14 13:34:49 +08:00
xieqiyu d343298490 * Finish task#56913. 2022-06-14 13:28:42 +08:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
leiyong 49604b2248 * Adjust code. 2022-06-08 07:10:02 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
leiyong 6ba36fc282 * Finish task#56387. 2022-06-07 08:16:56 +00:00
tianshujie e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
孙华伟 03e3f26ad5 * 2022-03-08 10:03:06 +08:00