Commit Graph

646 Commits

Author SHA1 Message Date
zhouxin
735c0eae85 Fix bug #18245. 2022-01-06 02:37:08 +00:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
liyuchun
adc4c9ad98 * Fix bug #18088. 2021-12-31 10:23:49 +08:00
tianshujie
593cabd96c * Modify variable name. 2021-12-27 17:20:47 +08:00
tianshujie
27319feba9 * Finish task #46657. 2021-12-27 17:11:29 +08:00
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
liyuchun
178a45b6b5 Merge branch 'devops17' 2021-12-23 15:15:21 +08:00
王怡栋
2eac7ba0d1 * adjust for get repo rules api. 2021-12-21 17:42:38 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
王怡栋
56437f6418 Merge branch 'master' into 'apiext'
# Conflicts:
#   config/routes.php
2021-12-17 09:58:59 +00:00
王怡栋
b96a5b286d * adjust for task #46002. 2021-12-17 13:03:56 +08:00
王怡栋
1a66159617 * code for task #46002. 2021-12-17 08:47:23 +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
zhujinyong
b6cfb2a715 + Add repos api. 2021-12-09 11:07:58 +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
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
zhujinyong
ebf78059e8 * Rename actions of productplan. 2021-12-02 15:55:20 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
孙广明
1a9a2cb624 Merge branch 'spirnt/175_liyuchun_bug' into 'master'
* Finish task #45152.

See merge request easycorp/zentaopms!686
2021-12-01 02:56:55 +00:00
zhujinyong
d8cefe71d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 10:01:02 +08:00
zhujinyong
74a4cd7470 + Add productplan methods for api. 2021-12-01 10:00:06 +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
王怡栋
3050ba859d * add ping for api. 2021-11-29 15:49:26 +08:00
zhujinyong
be26a7c731 * Fix errors of api. 2021-11-29 13:09:05 +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
王怡栋
c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +08:00
朱金勇
8cdf02366c Merge branch 'sprint/174_hufangzhou_45079' into 'master'
* Add the branch switcher in tree browse page.

See merge request easycorp/zentaopms!614
2021-11-25 05:05:20 +00:00
hufangzhou
e431847c58 * Add the branch switcher in tree browse page. 2021-11-25 12:22:56 +08:00
王怡栋
9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
王怡栋
c849afe0cd * code for task #44324. 2021-11-19 15:55:13 +08:00
王怡栋
4f5308aefa * code for task #44320. 2021-11-19 10:17:59 +08:00
王怡栋
5afccaf417 * code for task #44314. 2021-11-19 09:22:02 +08:00
王怡栋
eb63a17885 * code for task #44313. 2021-11-19 09:08:03 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
王怡栋
27bd5770b1 * code for task #44332. 2021-11-18 16:03:06 +08:00
王怡栋
26b110b73a * code for task #44331. 2021-11-18 13:45:32 +08:00
王怡栋
3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
王怡栋
fc50ece3e2 * code for task #44319. 2021-11-18 08:56:53 +08:00
王怡栋
f9473570e0 * code for task #44317. 2021-11-17 15:15:18 +08:00
王怡栋
7cc9e9f875 * code for task #44308. 2021-11-17 09:59:39 +08:00
dingguodong
2d9d95cc98 * Correct or Optimize codes to meet code styles. 2021-11-16 10:46:48 +08:00
xiawenlong
f1de062231 * Fix function name. 2021-11-15 19:27:43 +08:00