 朱金勇
|
ee2fc5b7c6
|
Merge branch 'phpcs-zhanrunyu' into 'master'
Fix compatibility with PHP 5.4
See merge request easycorp/zentaopms!1371
|
2022-01-13 04:28:02 +00:00 |
|
|
朱金勇
|
973eff4a6e
|
Merge branch 'sprint/182_sunhao/bug18315' into 'master'
* Bug #18315, fix wrap lines not show in roadmap.
See merge request easycorp/zentaopms!1360
|
2022-01-13 04:00:32 +00:00 |
|
|
tianshujie
|
59b210c0a8
|
* Fix the problem that the related story project ID is wrong.
|
2022-01-13 11:31:12 +08:00 |
|
|
zhangrunyu
|
39e30fc64f
|
Fix compatibility with PHP 5.4
|
2022-01-13 10:14:15 +08:00 |
|
|
李玉春
|
1b64b9a888
|
Merge branch 'sprint/zhouxudong_fixnbug_18036' into 'master'
*Fix bug #18036.
See merge request easycorp/zentaopms!1366
|
2022-01-12 09:14:53 +00:00 |
|
|
zhouxudong
|
cc9aae99c7
|
*Fix bug #18036.
|
2022-01-12 15:55:25 +08:00 |
|
|
Hao Sun
|
d7998c8b99
|
* Bug #18315, fix wrap lines not show in roadmap.
|
2022-01-12 14:09:04 +08:00 |
|
|
zhujinyong
|
0a06531912
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-01-12 13:32:02 +08:00 |
|
|
zhujinyong
|
fef8e440df
|
* Compatability for PHP8.
|
2022-01-12 13:31:47 +08:00 |
|
|
zhouxudong
|
919a355220
|
*Code for language.
|
2022-01-12 11:38:39 +08:00 |
|
|
zhouxudong
|
a25933c371
|
*Fix buf #17419.
|
2022-01-12 09:54:31 +08:00 |
|
|
zhouxudong
|
96fdc4465a
|
*Fix bug #17388.
|
2022-01-12 09:10:47 +08:00 |
|
|
zhouxudong
|
0f958a378d
|
*Fix bug #17388.
|
2022-01-12 09:07:01 +08:00 |
|
|
zhouxudong
|
82f0cd2fd6
|
*Fix bug #17388.
|
2022-01-12 08:41:15 +08:00 |
|
|
zhouxudong
|
84c9e3aa58
|
*Fix bug #17388.
|
2022-01-12 08:34:41 +08:00 |
|
|
朱金勇
|
893d1856e0
|
Merge branch 'sprint/183_zhouxudong_firstmerge' into 'master'
*Fix bug #18037.
See merge request easycorp/zentaopms!1347
|
2022-01-11 08:06:02 +00:00 |
|
|
zhouxudong
|
edf96f4485
|
*Fix bug #18037.
|
2022-01-11 15:52:59 +08:00 |
|
|
songchenxuan
|
6667a3c19a
|
*Fix reactive bug.
|
2022-01-11 14:45:19 +08:00 |
|
|
孙广明
|
aa1a28a20c
|
Merge branch 'Fixbug_zhengrunyu' into 'master'
*Fix bug 18290.
See merge request easycorp/zentaopms!1338
|
2022-01-11 03:18:33 +00:00 |
|
|
zhengrunyu
|
919ea9d8d0
|
*Fix bug 18290.
|
2022-01-11 10:28:33 +08:00 |
|
|
孙广明
|
770e577102
|
Merge branch 'sprint/182_tianshujie_47314' into 'master'
* Fix bug #47314.
See merge request easycorp/zentaopms!1335
|
2022-01-11 02:10:43 +00:00 |
|
|
tianshujie
|
378abd8527
|
* Modify variable name.
|
2022-01-11 10:09:40 +08:00 |
|
|
tianshujie
|
4a5ec8d84b
|
* Modify variable name.
|
2022-01-11 10:06:47 +08:00 |
|
|
tianshujie
|
0c50201fa6
|
* Modify the code logic.
|
2022-01-11 10:04:48 +08:00 |
|
|
tianshujie
|
fc081f1d21
|
* Modify the code logic.
|
2022-01-11 10:03:22 +08:00 |
|
|
tianshujie
|
353d85ed86
|
* Delete code.
|
2022-01-11 09:42:11 +08:00 |
|
|
tianshujie
|
0755e5a4af
|
* Add comment of kanban model file.
|
2022-01-11 09:39:40 +08:00 |
|
|
tianshujie
|
eac960afe5
|
* Fix bug #47314.
|
2022-01-11 09:38:21 +08:00 |
|
|
孙广明
|
0abf6e40db
|
Merge branch '180_hufangzhou_package' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!1334
|
2022-01-11 01:21:03 +00:00 |
|
|
hufangzhou
|
d0cfa7531e
|
* Add the new version.
|
2022-01-11 09:19:47 +08:00 |
|
|
孙广明
|
76b750f955
|
Merge branch 'sprint/182_liumengyi_18293' into 'master'
* Fix bug #18293.
See merge request easycorp/zentaopms!1333
|
2022-01-11 00:56:24 +00:00 |
|
|
liumengyi
|
dc8da347b6
|
* Fix bug #18293.
|
2022-01-11 08:54:15 +08:00 |
|
|
孙广明
|
cf15aa2f19
|
Merge branch 'sprint/182_tianshujie_bugmodule' into 'master'
* Change the die of the bug module to return print.
See merge request easycorp/zentaopms!1330
|
2022-01-11 00:50:39 +00:00 |
|
|
孙广明
|
3598466d9b
|
Merge branch 'sprint/182_tianshujie_47309' into 'master'
* Fix bug #47309.
See merge request easycorp/zentaopms!1332
|
2022-01-11 00:48:28 +00:00 |
|
|
tianshujie
|
0176c8689a
|
* Fix bug #47309.
|
2022-01-11 08:47:17 +08:00 |
|
|
王怡栋
|
9f778e38b5
|
Merge branch 'revert-3e9bcdb8' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
See merge request easycorp/zentaopms!1328
|
2022-01-11 00:43:35 +00:00 |
|
|
孙广明
|
1cae18380b
|
Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
|
2022-01-11 00:39:37 +00:00 |
|
|
孙广明
|
3ab13aa61e
|
Merge branch 'sprint/182_songchenxuan_action_lang' into 'master'
*Case action lang.
See merge request easycorp/zentaopms!1322
|
2022-01-11 00:36:32 +00:00 |
|
|
孙广明
|
b57562e99e
|
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
|
2022-01-11 00:35:04 +00:00 |
|
|
songchenxuan
|
bb13431274
|
*Fix bug 18074.
|
2022-01-11 08:34:55 +08:00 |
|
|
tianshujie
|
1c28a0462f
|
* Change the die of the bug module to return print.
|
2022-01-11 08:09:13 +08:00 |
|
|
孙广明
|
714471e03b
|
Merge branch 'sprint/182_liumengyi_47483' into 'master'
* Finish task #47483.
See merge request easycorp/zentaopms!1327
|
2022-01-10 09:40:44 +00:00 |
|
|
liumengyi
|
cc3c90291d
|
* Finish task #47483.
|
2022-01-10 17:32:31 +08:00 |
|
|
hufangzhou
|
0b9e2c0fa3
|
* Finish task #47331.
|
2022-01-10 17:18:18 +08:00 |
|
|
孙广明
|
db9681654b
|
Merge branch 'sprint/182_hufangzhou_47330' into 'master'
* Finish task #47330.
See merge request easycorp/zentaopms!1324
|
2022-01-10 08:36:39 +00:00 |
|
|
hufangzhou
|
075ac6efc5
|
* Adjust the lang item order.
|
2022-01-10 15:58:01 +08:00 |
|
|
hufangzhou
|
63226a2e84
|
* Finish task #47330.
|
2022-01-10 15:45:24 +08:00 |
|
|
tianshujie
|
0601474a78
|
* Fix bug #18289.
|
2022-01-10 15:41:24 +08:00 |
|
|
songchenxuan
|
721cdba3d3
|
*Case action lang.
|
2022-01-10 14:11:28 +08:00 |
|
|
孙广明
|
3c2fe9e87f
|
Merge branch 'tianshujie_fixBug' into 'master'
* Fix bug #18287.
See merge request easycorp/zentaopms!1321
|
2022-01-10 05:35:22 +00:00 |
|