 王怡栋
|
297a416762
|
Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
# module/story/control.php
|
2022-08-25 00:51:00 +00:00 |
|
|
王怡栋
|
00b8ffc6f7
|
Merge branch 'sprint/unittest_liumengyi_bug' into 'master'
* Unit test of bug.
See merge request easycorp/zentaopms!4993
|
2022-08-24 05:47:55 +00:00 |
|
|
zenggang
|
c424e450cb
|
* Adjust code
|
2022-08-24 03:28:59 +00:00 |
|
|
zenggang
|
73c8091a82
|
* Finish task#65782,65779
|
2022-08-24 03:24:03 +00:00 |
|
|
tianshujie
|
3a99afd287
|
* Finish task #65808,65807.
|
2022-08-23 16:12:52 +08:00 |
|
|
tianshujie
|
44d270da18
|
* Finish task #65808.
|
2022-08-23 15:48:20 +08:00 |
|
|
tianshujie
|
dca2784559
|
* Finish task #65808.
|
2022-08-23 15:02:57 +08:00 |
|
|
liumengyi
|
545d74f7d0
|
* Optimize code for task #65808, #65807.
|
2022-08-23 14:50:40 +08:00 |
|
|
tianshujie
|
4e1ca8bd60
|
* Finish task #65808.
|
2022-08-23 13:40:34 +08:00 |
|
|
liumengyi
|
20041ea696
|
* Fix bug #26723.
|
2022-08-22 11:12:38 +08:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
liumengyi
|
63c69a104e
|
* Unit test of bug.
|
2022-08-17 14:35:27 +08:00 |
|
|
tianshujie
|
6bd27a7aeb
|
* Finish task #63687.
|
2022-08-15 19:33:12 +08:00 |
|
|
tianshujie
|
4f08c31607
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687
|
2022-08-15 10:48:36 +08:00 |
|
|
tanghucheng
|
935cb51b5b
|
* Fix bug for port showimport.
|
2022-08-14 13:14:48 +08:00 |
|
|
tianshujie
|
4cc14dfe59
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687
|
2022-08-11 11:04:58 +08:00 |
|
|
liumengyi
|
61b7e90275
|
* Load language file.
|
2022-08-10 15:44:06 +08:00 |
|
|
王怡栋
|
d51846a966
|
Merge branch 'importExport' into 'master'
* Code for port.
See merge request easycorp/zentaopms!4875
|
2022-08-10 01:32:04 +00:00 |
|
|
王怡栋
|
1ef8043796
|
Merge branch 'sprint/devplat_31' into 'master'
* Finish task #63896.
See merge request easycorp/zentaopms!4877
|
2022-08-10 01:08:40 +00:00 |
|
|
tianshujie
|
1838710b42
|
* Finish task #63696,63695,63687.
|
2022-08-10 09:02:49 +08:00 |
|
|
tanghucheng
|
5544a9ded5
|
* Code for port.
|
2022-08-09 21:11:36 +08:00 |
|
|
daitingting
|
088a414920
|
* Finish task #63896.
|
2022-08-09 09:21:43 +00:00 |
|
|
xieqiyu
|
f323e7ad91
|
* Code for task#63772.
|
2022-08-09 10:46:05 +08:00 |
|
|
liuhong
|
47db91c402
|
*Finish task #63772.
|
2022-08-08 15:25:34 +00:00 |
|
|
tanghucheng
|
2eec12eeac
|
* Format code for port.
|
2022-08-08 12:15:28 +08:00 |
|
|
tanghucheng
|
08b92c0ee8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-08 09:48:29 +08:00 |
|
|
liumengyi
|
911ba77fea
|
* Fix bug #25992.
|
2022-08-05 16:16:05 +08:00 |
|
|
tanghucheng
|
3bfdc7d342
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 13:07:31 +08:00 |
|
|
zhouxin
|
d4f4f06117
|
* Delete useless param.
|
2022-08-05 01:25:59 +00:00 |
|
|
zhouxin
|
6c1f9f0568
|
* Fix a bug.
|
2022-08-05 00:52:40 +00:00 |
|
|
wangyidong
|
7796bc8499
|
Merge branch 'sprint/devplat_30'
|
2022-08-05 08:46:26 +08:00 |
|
|
daitingting
|
a292bc7438
|
* Add createdBy,createdDate fields in build table.
|
2022-08-04 07:39:24 +00:00 |
|
|
tanghucheng
|
5f4699ceec
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-04 14:10:36 +08:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
|
tanghucheng
|
a8fbdff6ba
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-04 00:03:14 +08:00 |
|
|
zhouxin
|
d55a19884c
|
* Fix bug #25995.
|
2022-08-03 08:25:11 +00:00 |
|
|
liugang
|
1712298192
|
* Finish task #63383.
|
2022-08-03 14:37:01 +08:00 |
|
|
tanghucheng
|
08073876bd
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-02 17:50:50 +08:00 |
|
|
liumengyi
|
a90490cc26
|
* Finish task #62939.
|
2022-08-02 09:05:55 +08:00 |
|
|
tanghucheng
|
e642e85411
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-28 17:25:03 +08:00 |
|
|
liumengyi
|
c9753f5490
|
* Fix bug #25814.
|
2022-07-28 13:22:32 +08:00 |
|
|
liumengyi
|
95c7c2ccfc
|
* Fix bug #25814.
|
2022-07-28 13:01:06 +08:00 |
|
|
tanghucheng
|
81e9c63e5b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-28 11:05:51 +08:00 |
|
|
liumengyi
|
60b32e04da
|
* Fix bug #25797.
|
2022-07-28 09:54:42 +08:00 |
|
|
tanghucheng
|
46a8117b2d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-27 14:50:21 +08:00 |
|
|
zenggang
|
7973da34a6
|
* Finish task#61964
|
2022-07-26 06:03:35 +00:00 |
|
|
tanghucheng
|
004561024f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-21 17:37:48 +08:00 |
|
|
tianshujie
|
03f9bca910
|
* Fix bug #25465.
|
2022-07-21 08:46:07 +08:00 |
|
|
tanghucheng
|
d0694aae7e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-20 16:02:00 +08:00 |
|