 xieqiyu
|
b185ef3ba9
|
* Batch edit one branch error.
|
2021-11-10 10:51:09 +08:00 |
|
|
xieqiyu
|
820fbef7b4
|
* Hidden merge button.
|
2021-11-10 10:09:46 +08:00 |
|
|
xieqiyu
|
36b8752cdd
|
* Fix a bug.
|
2021-11-10 10:03:10 +08:00 |
|
|
xieqiyu
|
adaa7cd1d2
|
* Add dynamic when batch edit main branch.
|
2021-11-10 09:50:43 +08:00 |
|
|
hufangzhou
|
a80cdfd6ec
|
Merge branch 'sprint/170_xieqiyu_43920' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_xieqiyu_43920
|
2021-11-10 09:49:31 +08:00 |
|
|
hufangzhou
|
9fa76f6912
|
* Modify the action of main branch.
|
2021-11-10 09:49:29 +08:00 |
|
|
xieqiyu
|
4f90b186ea
|
* Fix a bug: batch edit main branch error.
|
2021-11-10 09:37:59 +08:00 |
|
|
xieqiyu
|
76651524d9
|
* Add order.
|
2021-11-09 20:10:07 +08:00 |
|
|
xieqiyu
|
0a3dc10f4a
|
* Finish task#43905.
|
2021-11-09 19:46:08 +08:00 |
|
|
hufangzhou
|
c14d00e710
|
* Code for task #43898.
|
2021-11-09 19:23:51 +08:00 |
|
|
hufangzhou
|
e3ae68fc04
|
* Add the priviledge.
|
2021-11-09 17:26:32 +08:00 |
|
|
hufangzhou
|
9f77cc6fb6
|
* Finish task #43898.
|
2021-11-09 17:16:30 +08:00 |
|
|
xieqiyu
|
d889184204
|
* Finish task#43920.
|
2021-11-09 16:17:15 +08:00 |
|
|
李玉春
|
ddbc2d2342
|
Merge branch 'sprint/170_xieqiyu_16058' into 'sprint/170'
* Fix bug#16058.
See merge request easycorp/zentaopms!352
|
2021-11-09 00:33:26 +00:00 |
|
|
xieqiyu
|
e53d644169
|
* Fix bug#16058.
|
2021-11-08 19:13:09 +08:00 |
|
|
李玉春
|
5f372cea88
|
Merge branch 'spring/170_hufangzhou_43904' into 'sprint/170'
* Code for task #43904.
See merge request easycorp/zentaopms!351
|
2021-11-08 10:47:38 +00:00 |
|
|
hufangzhou
|
d10834ab9f
|
* Code for task #43904.
|
2021-11-08 18:02:15 +08:00 |
|
|
李玉春
|
b778d246c2
|
Merge branch 'sprint/170_xieqiyu_16051' into 'sprint/170'
* Fix bug#16051.
See merge request easycorp/zentaopms!344
|
2021-11-08 09:34:43 +00:00 |
|
|
xieqiyu
|
8f2deab146
|
* Adjust code style.
|
2021-11-08 17:22:29 +08:00 |
|
|
李玉春
|
21ffe0c678
|
Merge branch 'spring/170_hufangzhou_16065' into 'sprint/170'
* Fix bug #16065.
See merge request easycorp/zentaopms!348
|
2021-11-08 09:16:16 +00:00 |
|
|
hufangzhou
|
1d7c3b30c5
|
* Fix bug #16065.
|
2021-11-08 17:14:35 +08:00 |
|
|
李玉春
|
79b2c8c67a
|
Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170'
* Finish task #43899.
See merge request easycorp/zentaopms!345
|
2021-11-08 08:47:05 +00:00 |
|
|
hufangzhou
|
c027028759
|
* Finish task #43899.
|
2021-11-08 16:44:42 +08:00 |
|
|
xieqiyu
|
74c1b31476
|
* Fix bug#16051.
|
2021-11-08 16:37:19 +08:00 |
|
|
李玉春
|
e384b3be5f
|
Merge branch 'sprint/170_hufangzhou_16062' into 'sprint/170'
* Fix bug #16062.
See merge request easycorp/zentaopms!342
|
2021-11-08 08:33:05 +00:00 |
|
|
hufangzhou
|
9f27d5918b
|
* Fix bug #16062.
|
2021-11-08 16:29:22 +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 |
|