 tianshujie
|
2c6aeb6c19
|
* Fix bug #25014.
|
2022-07-08 10:15:18 +08:00 |
|
|
tianshujie
|
102326db4f
|
* Fix the problem of expired login prompt on the login page of the newly installed source package.
|
2022-07-08 09:48:08 +08:00 |
|
|
孙广明
|
118e1f7854
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4420
|
2022-07-08 01:20:53 +00:00 |
|
|
孙广明
|
8ce405dec0
|
Merge branch 'sprint/213_mayue_bug#24848#24817' into 'master'
* Fix bug #24848#24817.
See merge request easycorp/zentaopms!4423
|
2022-07-08 01:20:09 +00:00 |
|
|
mayue
|
1df55e32a7
|
* Fix bug #24848#24817.
|
2022-07-08 09:18:53 +08:00 |
|
|
孙广明
|
6b33905ac8
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4422
|
2022-07-08 01:10:03 +00:00 |
|
|
mayue
|
f6d94ad4cb
|
* Fix bug #24848#24817.
|
2022-07-08 09:06:39 +08:00 |
|
|
孙广明
|
fc08eb2060
|
Merge branch 'fixbug_24248' into 'master'
fixbug_24248
See merge request easycorp/zentaopms!4413
|
2022-07-08 01:05:19 +00:00 |
|
|
孙广明
|
f6ed1804b3
|
Merge branch 'sprint213_zg_24761' into 'master'
* Fix bug#24761，Adjuct cfd stat
See merge request easycorp/zentaopms!4414
|
2022-07-08 01:05:07 +00:00 |
|
|
tianshujie
|
ce191b4f9e
|
* Fix bug #24945.
|
2022-07-08 09:04:57 +08:00 |
|
|
孙广明
|
47011a1823
|
Merge branch 'liyuchun_59432' into 'master'
* Finish task #59432.
See merge request easycorp/zentaopms!4418
|
2022-07-08 01:04:54 +00:00 |
|
|
孙广明
|
a9a21cd6b8
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug for sort module.
See merge request easycorp/zentaopms!4421
|
2022-07-08 01:04:31 +00:00 |
|
|
liumengyi
|
1681419642
|
* Fix bug for sort module.
|
2022-07-08 09:03:00 +08:00 |
|
|
tianshujie
|
a2fbd1f47e
|
* Fix bug #24961.
|
2022-07-08 08:56:55 +08:00 |
|
|
tianshujie
|
b4a9f36ad9
|
* Fix bug #24972.
|
2022-07-08 08:50:07 +08:00 |
|
|
tianshujie
|
d976a4caa8
|
* Fix bug #24697.
|
2022-07-08 08:28:36 +08:00 |
|
|
tianshujie
|
be1ca95624
|
* Fix bug #24977.
|
2022-07-08 08:15:42 +08:00 |
|
|
刘刚
|
6d59cccaec
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.
See merge request easycorp/zentaopms!4419
|
2022-07-08 00:01:15 +00:00 |
|
|
xieqiyu
|
38dcc95cb4
|
* Code for task#59543.
|
2022-07-07 18:08:59 +08:00 |
|
|
xieqiyu
|
05a1b2be02
|
* Code for task#59543.
|
2022-07-07 17:52:30 +08:00 |
|
|
xieqiyu
|
29efcab628
|
* Code for task#59543.
|
2022-07-07 17:42:30 +08:00 |
|
|
liuruogu
|
63fe5c2750
|
* Fix bug #24865.
|
2022-07-07 09:23:56 +00:00 |
|
|
xieqiyu
|
07231be2d2
|
* Code for task#59543.
|
2022-07-07 17:23:09 +08:00 |
|
|
zenggang
|
24b36766fb
|
* Adjuct cfd stat
|
2022-07-07 09:14:30 +00:00 |
|
|
liyuchun
|
18c28227bb
|
* Finish task #59432.
|
2022-07-07 09:00:25 +00:00 |
|
|
王怡栋
|
938358b7e7
|
Merge branch 'sprint/211_liumengyi_24920' into 'master'
* Fix bug #24920.
See merge request easycorp/zentaopms!4417
|
2022-07-07 08:59:51 +00:00 |
|
|
liumengyi
|
bb9ce6dd49
|
* Fix bug #24920.
|
2022-07-07 16:58:27 +08:00 |
|
|
王怡栋
|
9ef8354d1d
|
Merge branch 'sprint/211_tianshujie_fixbug' into 'master'
* Fix bug #24946.
See merge request easycorp/zentaopms!4416
|
2022-07-07 08:51:25 +00:00 |
|
|
xieqiyu
|
2e733795f6
|
* Code for task#59543. Update bug to story.
|
2022-07-07 16:49:24 +08:00 |
|
|
王怡栋
|
0465854678
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix task #60100
See merge request easycorp/zentaopms!4415
|
2022-07-07 08:47:03 +00:00 |
|
|
lanzongjun
|
31109d6519
|
* fix task #60100
|
2022-07-07 16:36:24 +08:00 |
|
|
zenggang
|
030a3ea89f
|
* Fix bug#24761
|
2022-07-07 08:27:31 +00:00 |
|
|
tianshujie
|
105304ce57
|
* Fix bug #24946.
|
2022-07-07 16:18:22 +08:00 |
|
|
xieqiyu
|
2f81269858
|
* Code for task#59543.
|
2022-07-07 16:13:55 +08:00 |
|
|
王怡栋
|
a97b35f2bc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* code rollback
See merge request easycorp/zentaopms!4410
|
2022-07-07 08:13:20 +00:00 |
|
|
孙广明
|
57fc7c642e
|
Merge branch 'sprint/211_liumengyi_59480' into 'master'
* Finish task #59480, #59481.
See merge request easycorp/zentaopms!4411
|
2022-07-07 08:07:09 +00:00 |
|
|
lanzongjun
|
f51027b090
|
* fix bug #24280
|
2022-07-07 16:06:48 +08:00 |
|
|
liumengyi
|
696183b811
|
* Fix bug of task #59480.
|
2022-07-07 16:01:26 +08:00 |
|
|
liumengyi
|
ef6ffd019b
|
* Fix bug of task #59480, #59481.
|
2022-07-07 15:46:36 +08:00 |
|
|
lanzongjun
|
6555c7a30a
|
* fix bug #24937
|
2022-07-07 15:40:38 +08:00 |
|
|
liumengyi
|
d24c7185f5
|
* Fix bug of task #59480, #59481.
|
2022-07-07 15:35:19 +08:00 |
|
|
liumengyi
|
ecdd330102
|
* Fix bug of task #59480,#59481.
|
2022-07-07 14:41:10 +08:00 |
|
|
liumengyi
|
e709c4bbda
|
* Finish task #59480, #59481.
|
2022-07-07 14:12:45 +08:00 |
|
|
孙广明
|
b2dac0d660
|
Merge branch 'liyuchun_59430'
|
2022-07-07 14:01:18 +08:00 |
|
|
李玉春
|
ce18e2e476
|
Merge branch 'master' into 'liyuchun_59430'
# Conflicts:
# module/repo/control.php
|
2022-07-07 05:59:30 +00:00 |
|
|
李玉春
|
c392efc4e4
|
Merge branch 'cyy_59430' into 'master'
* Finish task #59430.
See merge request easycorp/zentaopms!4404
|
2022-07-07 05:57:05 +00:00 |
|
|
liyuchun
|
7784dfa80d
|
* Finish task #59434.
|
2022-07-07 05:56:33 +00:00 |
|
|
李玉春
|
e06426f77f
|
Merge branch 'cyy_bug' into 'master'
* Modify back btn.
See merge request easycorp/zentaopms!4397
|
2022-07-07 05:54:54 +00:00 |
|
|
liyuchun
|
92988c9386
|
* Finish task #59432,59434.
|
2022-07-07 05:53:56 +00:00 |
|
|
王怡栋
|
7c432a46b0
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #24937
See merge request easycorp/zentaopms!4407
|
2022-07-07 05:36:54 +00:00 |
|