Commit Graph
155 Commits
Author SHA1 Message Date
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
孙广明 612c6e0728 * Add weekly and holiday. 2021-11-08 09:07:16 +08:00
孙广明 75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
liyuchun d0b9dda4d7 * Finish task #43519,#43503. 2021-10-27 15:41:36 +08:00
tianshujie 546edae92a * Adjust code of kanban. 2021-10-25 16:11:36 +08:00
tianshujie 3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
xiawenlong 2f28bb8c85 fix all level 1 and 3 bugs. 2021-10-19 17:49:39 +08:00
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
xiawenlong 4f9086045a finish api release. 2021-10-14 15:57:38 +08:00
thanatos 9b9d95f923 update params 2021-09-28 08:58:55 +08:00
thanatos 0d116021db finish api doc. first commit 2021-09-16 16:10:49 +08:00
liyuchun 974633de86 * Finish task #42143. 2021-09-09 19:44:03 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
liyuchun af3ee3ea36 * Fix global create doc error. 2021-09-06 10:52:06 +08:00
hufangzhou eda39dafe8 * Add the setTutorialConfig method to open method. 2021-08-31 14:09:55 +08:00
dingguodong c7f53c574a * Add TABLE_MR config. 2021-08-13 15:47:01 +08:00
qiyu-xie 6b299017c1 * Task#41220. Transfer the cookie to the method to add. 2021-08-11 15:38:20 +08:00
qiyu-xie 89d0a5c23e * Task#41220. 2021-08-11 10:03:41 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
qiyu-xie 3c09c80ffa * Modify file source type name for requirement. 2021-07-30 10:59:06 +08:00
wangyidong 546ed93e74 * finish task #40477. 2021-07-22 09:42:30 +08:00
hufangzhou c3d74652be * Fix bug #13713. 2021-07-20 14:46:56 +08:00
dingguodong 0ca193a73c * Optimize action moments for gitlab module. 2021-07-15 09:25:51 +08:00
Guan Xiying 1c802f2a36 Merge branch 'jihu' 2021-07-14 09:48:58 +08:00
tianshujie98 4c3af55bbb * Add the language item of the project. 2021-07-08 14:31:03 +08:00
Guan Xiying ab37633ba6 * Add openmethod config. 2021-06-21 10:01:41 +08:00
Guanxiying f27fef0b00 * Call pipeline model in gitlab model. 2021-06-08 13:16:58 +08:00