Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
42,489 Commits 2 Branches 292 Tags
2f3a74193d6b9f8adeb61ba15b5d3dfbaba04710
Commit Graph
181 Commits
Author SHA1 Message Date
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
liyuchun 07f8b57e68 * Fix bug #25153. 2022-07-15 05:28:09 +00:00
caoyanyi 8267cfaa94 * Fix bug #25032. 2022-07-08 13:50:23 +08:00
liumengyi 3fd52a833f * Fix bug #24892. 2022-07-06 16:33:53 +08:00
孙广明 d175ae0f5e Merge branch 'master' into 'liyuchun_59437' 
# Conflicts:
#   module/repo/control.php
 2022-07-05 09:20:43 +00:00
liyuchun 8a3d924e2b * Finish task #59451. 2022-07-05 08:42:48 +00:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin' 
# Conflicts:
#   db/update17.1.sql
 2022-06-23 05:00:48 +00:00
孙广明 a58607bbaa * Code for task #58217. 2022-06-22 18:25:02 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
mayue 46c555fb3f * Add max code. 2022-05-12 02:38:33 +00:00
hufangzhou baf4a67ed8 * Fix bug #15633. 2022-04-12 09:51:09 +08:00
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
tianshujie 0194c5b3c7 * Fix bug #21186. 2022-03-28 11:13:23 +08:00
liyuchun 4882c5c6cd * Fix bug #20430. 2022-03-23 09:39:10 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxin 9ecf72d014 Fix bug #17224. 2022-03-16 08:18:14 +00:00
王怡栋 eac22108fe * code for story #31383. 2022-03-16 13:25:44 +08:00
zhouxin bfa1f3940d Fix bug #19818. 2022-03-14 08:40:16 +00:00
孙华伟 31df5afed4 * add permissions. 2022-03-08 15:22:46 +08:00
songchenxuan eb7147bf23 Add translate lang. 2022-02-14 17:28:59 +08:00
xieqiyu 8efd4a500b * Fix bug: activatecard and finishcard add to openmethods. 2022-01-27 16:39:34 +08:00
xieqiyu 2838e9dc76 * Modify import drop menu. 2022-01-24 16:28:00 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
caoyanyi e2d8d506b3 * Fix bug #18370,18371,18372,18379. 2022-01-13 05:08:08 +00:00
孙广明 0afb843ef5 * Refactor kanban code. 2022-01-12 11:23:05 +08:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
李玉春 a19708adeb Merge branch 'master' into 'sprint/32_zhouxin_fixbugs' 
# Conflicts:
#   module/project/config.php
 2022-01-06 04:01:16 +00:00
zhouxin 0b08489176 Fix bug. 2022-01-06 03:57:50 +00:00
孙广明 65f31e5b01 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master' 
Fix bug #18245.

See merge request easycorp/zentaopms!1278
 2022-01-06 02:40:14 +00:00
zhouxin 735c0eae85 Fix bug #18245. 2022-01-06 02:37:08 +00:00
xieqiyu ed73332c41 * Modify the problems. 2021-12-30 17:17:46 +08:00
xieqiyu 5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00
孙广明 d75774cafc Merge branch 'kanban' into 'sprint/177_tianshujie_card' 
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
 2021-12-13 08:11:03 +00:00
tianshujie 6a894bc7fb * Finish task #45829. 2021-12-13 15:37:33 +08:00
孙广明 557afc06ef * Code for task #45819. 2021-12-13 14:42:56 +08:00
孙广明 9824f4c6ac * Code for task #45818. 2021-12-09 14:11:49 +08:00
孙广明 12ce541d9e * Code for task #45818. 2021-12-09 10:50:05 +08:00
tianshujie a0e40c020d * Add Kanban space creation function. 2021-12-08 15:38:45 +08:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun 9e5f01dd7b * Finish task #45152. 2021-12-01 09:59:13 +08:00
liyuchun 3149307967 * Finish task #45152. 2021-12-01 09:50:16 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liyuchun 578d53f5ae * Finish task #45152. 2021-11-29 13:08:18 +08:00
liyuchun 1b63752f83 * Finish task #45152. 2021-11-26 14:00:54 +08:00
leiyong 088a6374df * Finish task#44172,task#44273. 2021-11-11 05:26:27 +00:00
dingguodong cc14a18799 * Add approval for MR(Optimization is required). 2021-11-08 11:37:06 +08:00