 孙广明
|
87c24eae5a
|
Merge branch 'sprint/174_hufangzhou_action' into 'master'
* Fix the code error.
See merge request easycorp/zentaopms!817
|
2021-12-08 00:55:02 +00:00 |
|
|
hufangzhou
|
5c53afeeed
|
* Fix the code error.
|
2021-12-08 08:47:00 +08:00 |
|
|
孙广明
|
6300b9d804
|
Merge branch 'sprint/175_liumengyi_17227' into 'master'
* Fix bug #17227.
See merge request easycorp/zentaopms!815
|
2021-12-08 00:46:17 +00:00 |
|
|
liumengyi
|
07cd32ed75
|
* Fix bug #17227.
|
2021-12-07 18:11:43 +08:00 |
|
|
孙广明
|
834684ca51
|
Merge branch 'sprint/174_tianshujie_17173' into 'master'
* Fix bug #17173,17173.
See merge request easycorp/zentaopms!812
|
2021-12-07 09:24:13 +00:00 |
|
|
tianshujie
|
4fdb7107dc
|
* Fix bug #17173,17173.
|
2021-12-07 17:22:14 +08:00 |
|
|
孙广明
|
29fef7581b
|
Merge branch 'sprint/master_tanghucheng_17225' into 'master'
* Fix bug #17225.
See merge request easycorp/zentaopms!810
|
2021-12-07 09:20:26 +00:00 |
|
|
xieqiyu
|
b41aa8a4ef
|
* Fix bug#17193.
|
2021-12-07 17:18:40 +08:00 |
|
|
tanghucheng
|
6f6dc4741a
|
* Fix bug #17225.
|
2021-12-07 17:13:23 +08:00 |
|
|
李玉春
|
3f2793e5bd
|
Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
|
2021-12-07 08:50:57 +00:00 |
|
|
王怡栋
|
ff06288dc8
|
Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.
See merge request easycorp/zentaopms!803
|
2021-12-07 08:21:33 +00:00 |
|
|
liyuchun
|
b11dd3af4e
|
* Finish task #45491.
|
2021-12-07 16:15:21 +08:00 |
|
|
李玉春
|
ee97446441
|
Merge branch 'sprint/174_hufangzhou_xuanxuan' into 'master'
* Fix bug #17185.
See merge request easycorp/zentaopms!802
|
2021-12-07 07:33:22 +00:00 |
|
|
李玉春
|
8fe0d5ddd4
|
Merge branch 'sprint/174_xieqiyu_17113' into 'master'
* Fix bug#17113.
See merge request easycorp/zentaopms!800
|
2021-12-07 07:27:49 +00:00 |
|
|
hufangzhou
|
9359d427f5
|
* Fix bug #17185.
|
2021-12-07 15:25:31 +08:00 |
|
|
xieqiyu
|
f22631ac2a
|
* Fix bug#17113.
|
2021-12-07 14:56:10 +08:00 |
|
|
xieqiyu
|
bccefb7751
|
* Fix bug#17188.
|
2021-12-07 14:22:56 +08:00 |
|
|
zhujinyong
|
e5873a07e0
|
+ Add demo lib for api.
|
2021-12-07 11:06:56 +08:00 |
|
|
hufangzhou
|
d876550d96
|
* Add the traditional Chinese language item.
|
2021-12-07 09:22:58 +08:00 |
|
|
李玉春
|
192cbfd23a
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix project name check unique logic.
See merge request easycorp/zentaopms!793
|
2021-12-07 00:56:27 +00:00 |
|
|
tanghucheng
|
1ee592147a
|
* Fix programplan lang.
|
2021-12-07 08:41:51 +08:00 |
|
|
孙广明
|
379baac86d
|
Merge branch 'master' into 'sprint/master_tanghucheng_project'
# Conflicts:
# module/programplan/lang/en.php
|
2021-12-07 00:38:58 +00:00 |
|
|
tanghucheng
|
ac12590b03
|
* Fix bug #17130,17129,17128.
|
2021-12-06 15:28:53 +08:00 |
|
|
孙广明
|
0f72dcc6ea
|
* Fix project name check unique logic.
|
2021-12-06 15:22:57 +08:00 |
|
|
李玉春
|
3d1d34e383
|
Merge branch 'sprint/174_tianshujie_17115' into 'master'
* Fix bug #17115.
See merge request easycorp/zentaopms!785
|
2021-12-06 07:18:57 +00:00 |
|
|
李玉春
|
9db701d207
|
Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17113.
See merge request easycorp/zentaopms!788
|
2021-12-06 07:18:39 +00:00 |
|
|
李玉春
|
fd5cca16b3
|
Merge branch 'sgm_fixbug' into 'master'
* Fix code error.
See merge request easycorp/zentaopms!790
|
2021-12-06 07:15:25 +00:00 |
|
|
王怡栋
|
7091037194
|
Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade
See merge request easycorp/zentaopms!786
|
2021-12-06 07:14:51 +00:00 |
|
|
李玉春
|
a339b6e024
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!792
|
2021-12-06 07:14:23 +00:00 |
|
|
tanghucheng
|
fb84d28b4a
|
* Fix bug #17128.
|
2021-12-06 15:04:49 +08:00 |
|
|
孙广明
|
bd28d11c75
|
* Fix bug.
|
2021-12-06 15:04:33 +08:00 |
|
|
tanghucheng
|
cb23e8ff2b
|
* adjust for date format for programplan.
|
2021-12-06 14:49:53 +08:00 |
|
|
tanghucheng
|
f2a989e851
|
* adjust for date format for programplan.
|
2021-12-06 14:21:23 +08:00 |
|
|
孙广明
|
22ac002432
|
* Fix code error.
|
2021-12-06 13:59:36 +08:00 |
|
|
孙广明
|
f3bd7149f9
|
Merge branch 'sprint/174_sunhao/improve_kanban' into 'master'
* Improve kanban UI, bug #17063.
See merge request easycorp/zentaopms!787
|
2021-12-06 05:11:11 +00:00 |
|
|
孙广明
|
e24ded1429
|
Merge branch 'sprint/174_hufangzhou_17116' into 'master'
* Fix bug #17116, bug #17117.
See merge request easycorp/zentaopms!789
|
2021-12-06 05:07:38 +00:00 |
|
|
hufangzhou
|
05d9182e31
|
* Fix bug #17116, bug #17117.
|
2021-12-06 12:09:15 +08:00 |
|
|
xieqiyu
|
0dc84860e9
|
* Fix bug#17113.
|
2021-12-06 11:55:46 +08:00 |
|
|
tianshujie
|
bb635e3c48
|
* Modify the code format of caselib js file.
|
2021-12-06 11:36:33 +08:00 |
|
|
Hao Sun
|
18c0ef3210
|
* Custom dnd rules for project kanban.
|
2021-12-06 11:30:11 +08:00 |
|
|
tianshujie
|
78af43d78c
|
* Fix bug #17115.
|
2021-12-06 11:26:27 +08:00 |
|
|
孙广明
|
8debfb8ad8
|
* Remove version.
|
2021-12-06 11:25:34 +08:00 |
|
|
李玉春
|
4a2d21595e
|
Merge branch 'sptint/174_xieqiyu_17079' into 'master'
* Fix bug#17079.
See merge request easycorp/zentaopms!778
|
2021-12-06 03:22:48 +00:00 |
|
|
Hao Sun
|
50ad00b1c4
|
* Fix dnd not work in project kanban.
|
2021-12-06 11:19:05 +08:00 |
|
|
Hao Sun
|
8d08be2f57
|
* Fix cards count incorrect on some kanbans.
|
2021-12-06 11:18:49 +08:00 |
|
|
孙广明
|
b8432110bf
|
Merge branch 'sprint/174_songchenxuan_17111' into 'master'
*Fix bug #17111.
See merge request easycorp/zentaopms!784
|
2021-12-06 03:18:06 +00:00 |
|
|
孙广明
|
7ebdc11ad1
|
Merge branch 'sprint/174_songchenxuan_17109' into 'master'
Sprint/174 songchenxuan 17109
See merge request easycorp/zentaopms!780
|
2021-12-06 03:16:28 +00:00 |
|
|
songchenxuan
|
bb6dba1a78
|
*Fix bug #17111.
|
2021-12-06 11:12:21 +08:00 |
|
|
孙广明
|
69304124b5
|
* Change for upgrade.
|
2021-12-06 10:58:52 +08:00 |
|
|
李玉春
|
7cd00e0d84
|
Merge branch 'revert-aacf4ec4' into 'master'
Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'"
See merge request easycorp/zentaopms!783
|
2021-12-06 02:41:55 +00:00 |
|