 liumengyi
|
b355559d0e
|
* Finish task #46146.
|
2021-12-22 13:10:12 +08:00 |
|
|
孙广明
|
1b05d78e65
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for enable archive.
See merge request easycorp/zentaopms!1053
|
2021-12-22 01:13:21 +00:00 |
|
|
liumengyi
|
47c35653d6
|
* Fix bug for enable archive.
|
2021-12-22 09:11:15 +08:00 |
|
|
zhujinyong
|
d8979e3e78
|
Merge branch 'sprint/178_hufangzhou_46388'
|
2021-12-22 08:55:40 +08:00 |
|
|
朱金勇
|
c250c080a4
|
Merge branch 'sprint/178_songchenxuan_46095_add' into 'master'
*Restrict the editing of the parent plan branch.
See merge request easycorp/zentaopms!1039
|
2021-12-22 00:51:30 +00:00 |
|
|
hufangzhou
|
10c2f33c2b
|
* Adjust the issue of merge branch.
|
2021-12-22 08:50:42 +08:00 |
|
|
朱金勇
|
3a3c461b51
|
Merge branch 'sprint/178_songchenxuan_fix_action/lang/en.php' into 'master'
Sprint/178 songchenxuan fix action/lang/en.php
See merge request easycorp/zentaopms!1050
|
2021-12-22 00:50:36 +00:00 |
|
|
songchenxuan
|
ebebbe127c
|
*Fix action/lang/en.php.
|
2021-12-22 08:49:06 +08:00 |
|
|
songchenxuan
|
45ea557272
|
*Fix action/lang/en.php.
|
2021-12-22 08:48:15 +08:00 |
|
|
孙广明
|
434e7fb369
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for my meeting.
See merge request easycorp/zentaopms!1038
|
2021-12-22 00:16:44 +00:00 |
|
|
hufangzhou
|
9743ebbb92
|
* Finish task #46388.
|
2021-12-21 22:26:07 +08:00 |
|
|
李玉春
|
c474449b54
|
Merge branch 'sgm_fixbug' into 'master'
* Fix project priv bug.
See merge request easycorp/zentaopms!1012
|
2021-12-21 09:47:11 +00:00 |
|
|
孙广明
|
802f3a2282
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for move card.
See merge request easycorp/zentaopms!1046
|
2021-12-21 09:31:31 +00:00 |
|
|
liumengyi
|
17cd92f7d3
|
* Fix bug for move card.
|
2021-12-21 17:30:37 +08:00 |
|
|
孙广明
|
3481d14020
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17724, #17769, #17768, #17765, #17763, #17737.
See merge request easycorp/zentaopms!1045
|
2021-12-21 09:23:53 +00:00 |
|
|
liumengyi
|
93349c241a
|
* Fix bug.
|
2021-12-21 17:23:21 +08:00 |
|
|
liumengyi
|
6b7cbc74ab
|
* Fix bug #17724, #17769, #17768, #17765, #17763, #17737.
|
2021-12-21 17:16:46 +08:00 |
|
|
孙广明
|
2eb7b428a5
|
Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Finish task 46246.
See merge request easycorp/zentaopms!1044
|
2021-12-21 09:14:05 +00:00 |
|
|
zhengrunyu
|
70e0458aa2
|
*Finish task 46246.
|
2021-12-21 17:12:32 +08:00 |
|
|
孙广明
|
6d7569542c
|
Merge branch 'sprint/179_tianshujie_bug' into 'master'
* Fix bug #17780,#17770,#17760,#17759,#17743.
See merge request easycorp/zentaopms!1043
|
2021-12-21 09:05:28 +00:00 |
|
|
孙广明
|
b8a4936df8
|
Merge branch 'sprint/179_zhengrunyu_46146' into 'master'
*Finish task 46246.
See merge request easycorp/zentaopms!1041
|
2021-12-21 09:04:49 +00:00 |
|
|
zhengrunyu
|
28533a6427
|
*Finish task 46246.
|
2021-12-21 17:04:11 +08:00 |
|
|
tianshujie
|
03a86096c7
|
* Add space.
|
2021-12-21 17:01:47 +08:00 |
|
|
zhengrunyu
|
ec286d6057
|
*Finish task 46246.
|
2021-12-21 16:59:52 +08:00 |
|
|
tianshujie
|
7b918d91f0
|
* Fix bug #17780,#17770,#17760,#17759,#17743.
|
2021-12-21 16:57:06 +08:00 |
|
|
zhengrunyu
|
25feb63a59
|
*Finish task 46246.
|
2021-12-21 16:53:49 +08:00 |
|
|
songchenxuan
|
9a1a55a0f2
|
*Restrict the editing of the parent plan branch.
|
2021-12-21 16:28:13 +08:00 |
|
|
zhujinyong
|
8bd1991c83
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-21 16:13:07 +08:00 |
|
|
zhujinyong
|
42fc345e2a
|
Merge branch 'sprint/176_xieqiyu_mergeBranch'
|
2021-12-21 16:12:48 +08:00 |
|
|
朱金勇
|
7b2c5322a7
|
Merge branch 'sprint/178_hufangzhou_46097' into 'master'
* Finish task #46097.
See merge request easycorp/zentaopms!1037
|
2021-12-21 08:09:12 +00:00 |
|
|
songchenxuan
|
397775b218
|
*Restrict the editing of the parent plan branch.
|
2021-12-21 16:01:26 +08:00 |
|
|
tanghucheng
|
31984c6aa9
|
* Fix bug for my meeting.
|
2021-12-21 15:58:32 +08:00 |
|
|
hufangzhou
|
863965e61a
|
* Finish task #46097.
|
2021-12-21 15:53:27 +08:00 |
|
|
hufangzhou
|
2809bc0b94
|
* Perfect details.
|
2021-12-21 15:42:26 +08:00 |
|
|
孙广明
|
b20d55dc28
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17765, #17763, #17737.
See merge request easycorp/zentaopms!1036
|
2021-12-21 07:24:04 +00:00 |
|
|
liumengyi
|
3825315c6b
|
* Add comment.
|
2021-12-21 15:23:19 +08:00 |
|
|
liumengyi
|
e2cbf7dab7
|
* Fix bug #17765, #17763, #17737.
|
2021-12-21 15:21:18 +08:00 |
|
|
zhujinyong
|
816e2a3e00
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-21 14:53:50 +08:00 |
|
|
zhujinyong
|
5a1e31adf2
|
* Refactor getList of branch.
|
2021-12-21 14:53:05 +08:00 |
|
|
孙广明
|
a29de2106e
|
Merge branch 'fix-die' into 'master'
Fix die naming compatibility
See merge request easycorp/zentaopms!1033
|
2021-12-21 06:37:35 +00:00 |
|
|
hufangzhou
|
872a8b2bbd
|
* Finish task #46096.
|
2021-12-21 14:30:38 +08:00 |
|
|
Yurun
|
c19e44c044
|
Fix die naming compatibility
|
2021-12-21 14:25:53 +08:00 |
|
|
zhujinyong
|
f6e6ef8bff
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-21 14:06:54 +08:00 |
|
|
zhujinyong
|
14ee3504fa
|
* Compatibility from PHP5.4.
|
2021-12-21 14:06:24 +08:00 |
|
|
孙广明
|
0fa8bbfb70
|
Merge branch 'sprint/179_tianshujie_17754' into 'master'
* Fix bug #17756,#17755,#17754,#17752,#17747.
See merge request easycorp/zentaopms!1031
|
2021-12-21 06:03:33 +00:00 |
|
|
朱金勇
|
3a8eabb057
|
Merge branch 'change-die-zhangrunyu' into 'master'
Change die
See merge request easycorp/zentaopms!1029
|
2021-12-21 05:59:10 +00:00 |
|
|
tianshujie
|
171045fab4
|
* Fix bug #17756,#17755,#17754,#17752,#17747.
|
2021-12-21 13:59:03 +08:00 |
|
|
孙广明
|
4de57a92d2
|
Merge branch 'sprint/179_liumengyi_46244' into 'master'
* Finish task #46244, #46243.
See merge request easycorp/zentaopms!1030
|
2021-12-21 05:56:06 +00:00 |
|
|
liumengyi
|
3bb8ba6b1d
|
* Change 'let' to 'var'.
|
2021-12-21 13:55:00 +08:00 |
|
|
朱金勇
|
f2110111fb
|
Merge branch 'sprint/178_songchenxuan_46095' into 'master'
Sprint/178 songchenxuan 46095
See merge request easycorp/zentaopms!1028
|
2021-12-21 05:53:23 +00:00 |
|