 xieqiyu
|
8f2deab146
|
* Adjust code style.
|
2021-11-08 17:22:29 +08:00 |
|
|
xieqiyu
|
74c1b31476
|
* Fix bug#16051.
|
2021-11-08 16:37:19 +08:00 |
|
|
李玉春
|
784eba13ab
|
Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170'
* Fix bug.
See merge request easycorp/zentaopms!341
|
2021-11-08 07:59:30 +00:00 |
|
|
李玉春
|
09d50fd19c
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.
See merge request easycorp/zentaopms!338
|
2021-11-08 07:25:33 +00:00 |
|
|
xieqiyu
|
eb8300049f
|
* Fix bug.
|
2021-11-08 15:07:05 +08:00 |
|
|
李玉春
|
7e1412258c
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!339
|
2021-11-08 07:06:48 +00:00 |
|
|
mayue
|
b305831daf
|
* Fix bug #15688.
|
2021-11-08 15:04:55 +08:00 |
|
|
李玉春
|
261d027273
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!336
|
2021-11-08 06:40:53 +00:00 |
|
|
zhouxin
|
92fb767ff9
|
Finish task #43916.
|
2021-11-08 14:34:44 +08:00 |
|
|
mayue
|
35b6e284b7
|
* Fix bug #15688.
|
2021-11-08 14:28:42 +08:00 |
|
|
李玉春
|
5a4456e08b
|
Merge branch 'sprint/170_xieqiyu_merge' into 'sprint/170'
Conflict resolution.
See merge request easycorp/zentaopms!335
|
2021-11-08 06:22:34 +00:00 |
|
|
xieqiyu
|
b483b28d80
|
* Conflict resolution.
|
2021-11-08 14:18:57 +08:00 |
|
|
李玉春
|
7692460500
|
Merge branch 'sprint/170_xieqiyu_44028' into 'sprint/170'
Finish task#44028.
See merge request easycorp/zentaopms!327
|
2021-11-08 06:08:31 +00:00 |
|
|
liyuchun
|
1006db2569
|
Merge branch 'sprint/170_hufangzhou_43891_new' into sprint/170
|
2021-11-08 13:53:59 +08:00 |
|
|
李玉春
|
9fe54a903c
|
Merge branch 'sprint/170' into 'sprint/170_hufangzhou_43891_new'
# Conflicts:
# module/branch/control.php
|
2021-11-08 05:53:39 +00:00 |
|
|
xieqiyu
|
866c7adc75
|
* Code for task#43902.
|
2021-11-08 13:53:16 +08:00 |
|
|
孙广明
|
694c15758f
|
Merge branch 'sprint/170_wangyidong_bug15189' into 'sprint/170'
* fix bug #15189.
See merge request easycorp/zentaopms!322
|
2021-11-08 05:41:38 +00:00 |
|
|
孙广明
|
57f914b0f0
|
Merge branch 'sprint/170_zhengrunyu_43908' into 'sprint/170'
*Finish task #43908
See merge request easycorp/zentaopms!330
|
2021-11-08 05:41:22 +00:00 |
|
|
xieqiyu
|
acd66decf4
|
* Add lang.
|
2021-11-08 13:40:03 +08:00 |
|
|
xieqiyu
|
c15b6e7e61
|
* Code for task#43902.
|
2021-11-08 13:36:43 +08:00 |
|
|
李玉春
|
db0c5df00e
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!333
|
2021-11-08 05:30:29 +00:00 |
|
|
mayue
|
aa116136d0
|
* Fix bug #15688.
|
2021-11-08 13:24:23 +08:00 |
|
|
hufangzhou
|
5d1e3bd65e
|
* Finish task #43904.
|
2021-11-08 13:14:44 +08:00 |
|
|
zhengrunyu
|
26ec2238ee
|
*Finish task #43908.
|
2021-11-08 11:31:46 +08:00 |
|
|
zhengrunyu
|
ea6bcb8b5c
|
*Finish task #43908.
|
2021-11-08 11:08:56 +08:00 |
|
|
zhengrunyu
|
b18373c7e3
|
*Finish task #43908.
|
2021-11-08 10:52:14 +08:00 |
|
|
hufangzhou
|
9732ba073a
|
* Modify the cookie of preBranch type.
|
2021-11-08 10:19:56 +08:00 |
|
|
李玉春
|
c65c9b2384
|
Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170'
* Finish task #43893.
See merge request easycorp/zentaopms!325
|
2021-11-08 01:36:37 +00:00 |
|
|
tianshujie
|
c5779575c1
|
* Modify code logic.
|
2021-11-08 09:29:45 +08:00 |
|
|
xieqiyu
|
acf5b15c06
|
* Code for task#43902.
|
2021-11-08 09:20:57 +08:00 |
|
|
qiyu-xie
|
f22b3ea149
|
* Code for task#43902.
|
2021-11-07 18:12:57 +08:00 |
|
|
qiyu-xie
|
f94e0ecb08
|
* Code for task#44028.
|
2021-11-07 16:05:02 +08:00 |
|
|
qiyu-xie
|
8f902ccf2d
|
* Code fot task#44028.
|
2021-11-07 13:44:24 +08:00 |
|
|
hufangzhou
|
d279c5d7d7
|
* Finish task #43891.
|
2021-11-05 18:47:39 +08:00 |
|
|
xieqiyu
|
988bb5c774
|
* Code for task#44028.
|
2021-11-05 17:25:27 +08:00 |
|
|
tianshujie
|
0328182a47
|
* Modify the logic of the acquisition plan.
|
2021-11-05 17:19:41 +08:00 |
|
|
tianshujie
|
1424fbe869
|
* Modify the error.
|
2021-11-05 16:04:39 +08:00 |
|
|
王怡栋
|
bda2e7576b
|
Merge branch 'sprint/170_xieqiyu_43919' into 'sprint/170'
Finish task#43919.
See merge request easycorp/zentaopms!324
|
2021-11-05 07:48:03 +00:00 |
|
|
tianshujie
|
77da777064
|
* Finish task #43893.
|
2021-11-05 15:46:52 +08:00 |
|
|
xieqiyu
|
f7d99dd38c
|
* Add lang item.
|
2021-11-05 15:37:08 +08:00 |
|
|
hufangzhou
|
925094f331
|
Merge branch 'sprint/170_xieqiyu_43919' into sprint/170
|
2021-11-05 14:59:16 +08:00 |
|
|
胡方舟
|
21cd984c78
|
Merge branch 'sprint/170' into 'sprint/170_xieqiyu_43919'
# Conflicts:
# db/zentao.sql
|
2021-11-05 06:56:47 +00:00 |
|
|
xieqiyu
|
7992f18ea3
|
* Code for task#43919. Modify review questions.
|
2021-11-05 14:50:15 +08:00 |
|
|
xieqiyu
|
8b7616a626
|
* Code for task#43919. Add lang and main default.
|
2021-11-05 13:48:09 +08:00 |
|
|
王怡栋
|
8b6ba26c9f
|
* fix bug #15189.
|
2021-11-05 11:33:59 +08:00 |
|
|
孙广明
|
5812a1e510
|
Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task #43903
See merge request easycorp/zentaopms!319
|
2021-11-05 03:22:17 +00:00 |
|
|
孙广明
|
dbf4a5cff6
|
Merge branch 'sprint/170_mayue_15688' into 'sprint/170'
* Fix bug #15688.
See merge request easycorp/zentaopms!320
|
2021-11-05 03:20:38 +00:00 |
|
|
tianshujie
|
0fa14065b2
|
* Modify the constant name of the branch trunk.
|
2021-11-05 11:20:22 +08:00 |
|
|
mayue
|
1fbae29f29
|
* Fix bug #15688.
|
2021-11-05 10:53:36 +08:00 |
|
|
tianshujie
|
fcfa4a9064
|
* Add all options in the branch drop-down.
|
2021-11-05 09:25:47 +08:00 |
|