 liumengyi
|
d71abe0f43
|
* Fix bug #32043.
|
2023-02-10 16:25:49 +08:00 |
|
|
wangyidong
|
de07d90b19
|
* fix bug #32016.
|
2023-02-10 11:22:34 +08:00 |
|
|
孙广明
|
eb7dce8e88
|
* Fix code style.
|
2022-12-29 15:21:59 +08:00 |
|
|
孙广明
|
c893ac76d8
|
Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907
See merge request easycorp/zentaopms!6567
|
2022-12-15 08:20:12 +00:00 |
|
|
liuhong
|
cc631b6e4f
|
* Adjust code #30907.
|
2022-12-15 08:15:03 +00:00 |
|
|
liuhong
|
a08eff199f
|
* Fix bug #30907.
|
2022-12-15 08:12:15 +00:00 |
|
|
lanzongjun
|
a8551febe5
|
* Fix Bug #30909
|
2022-12-15 15:54:33 +08:00 |
|
|
lanzongjun
|
b4dd6cb307
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-15 13:54:20 +08:00 |
|
|
孙广明
|
7e7ec61d7e
|
Merge branch 'master_liuhong_30845' into 'master'
* Fix bug #30845.
See merge request easycorp/zentaopms!6552
|
2022-12-15 05:28:23 +00:00 |
|
|
lanzongjun
|
057bfe77e2
|
* Finish Task #79453
|
2022-12-15 10:55:08 +08:00 |
|
|
liuhong
|
0dc5fbdb33
|
* Fix bug #30845.
|
2022-12-15 02:17:42 +00:00 |
|
|
wangyidong
|
6391ddfe1e
|
* adjust style.
|
2022-12-15 10:11:25 +08:00 |
|
|
孙广明
|
8d8696b1e4
|
Merge branch 'master_xieqiyu_79662' into 'master'
* Code for task#79662.
See merge request easycorp/zentaopms!6548
|
2022-12-14 06:14:08 +00:00 |
|
|
xieqiyu
|
fc17dfc949
|
* Code for task#79662.
|
2022-12-14 14:10:49 +08:00 |
|
|
hufangzhou
|
6cef691b39
|
* Add the new version.
|
2022-12-14 05:28:51 +00:00 |
|
|
wangyidong
|
856eb4d410
|
* adjust for style.
|
2022-12-14 11:33:00 +08:00 |
|
|
wangyidong
|
8dc609e4a0
|
* code task #79859,79858,79857,79856,79855,79854.
|
2022-12-13 14:15:39 +08:00 |
|
|
wangyidong
|
d64a93ea2b
|
* code task #79282.
|
2022-12-09 17:13:06 +08:00 |
|
|
孙广明
|
2fdb547f3e
|
Merge branch 'master' into 'master_271_78665'
# Conflicts:
# module/build/control.php
|
2022-12-09 08:58:55 +00:00 |
|
|
孙广明
|
a7d7ec312a
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30616
See merge request easycorp/zentaopms!6522
|
2022-12-09 08:55:12 +00:00 |
|
|
wangyidong
|
81d3403a20
|
* code for task #79279.
|
2022-12-09 16:54:17 +08:00 |
|
|
lanzongjun
|
e6301a8ec3
|
* Fix Bug #30616
|
2022-12-09 16:03:32 +08:00 |
|
|
lanzongjun
|
9158f6f79f
|
* Fix Bug #30616
|
2022-12-09 15:38:54 +08:00 |
|
|
liuhong
|
94b3f9bfd5
|
* resolve conflict task #78665
|
2022-12-09 07:21:08 +00:00 |
|
|
lanzongjun
|
dd2160fde3
|
* Finish Bug #30662
|
2022-12-09 11:53:58 +08:00 |
|
|
liuhong
|
dd13c3d947
|
* Adjust code task #78665.
|
2022-12-08 15:57:27 +00:00 |
|
|
liuhong
|
14d9f3a5eb
|
* Ajdust code Task #78665.
|
2022-12-08 15:54:45 +00:00 |
|
|
liuhong
|
11ca786545
|
* Fix stories and bug when no associate.
|
2022-12-08 15:35:48 +00:00 |
|
|
liuhong
|
207c5c7117
|
* Adjust code task #78665.
|
2022-12-08 14:40:21 +00:00 |
|
|
lanzongjun
|
c73d589b54
|
* Finish Bug #30664
|
2022-12-08 16:28:38 +08:00 |
|
|
lanzongjun
|
e9bc72f2b2
|
* Finish Bug #30689
|
2022-12-08 15:56:30 +08:00 |
|
|
liuhong
|
0d9f59c49b
|
* Finish tash for Lang and multiple #78665.
|
2022-12-08 07:48:25 +00:00 |
|
|
lanzongjun
|
1b4791f74b
|
* Fix build create
|
2022-12-08 15:45:36 +08:00 |
|
|
lanzongjun
|
d8a5944a84
|
* Finish Bug
|
2022-12-08 15:15:49 +08:00 |
|
|
liuhong
|
0094f902f5
|
* Finish Task #78665.
|
2022-12-08 06:55:05 +00:00 |
|
|
lanzongjun
|
47284dc742
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-08 14:45:33 +08:00 |
|
|
lanzongjun
|
e6989dc17c
|
* Finish Bug #30687
|
2022-12-08 14:32:27 +08:00 |
|
|
liuhong
|
8ad99f03a5
|
* Adjuct code #78665.
|
2022-12-08 04:24:10 +00:00 |
|
|
liuhong
|
35095aa0b4
|
* Adjust code #78665.
|
2022-12-08 02:06:21 +00:00 |
|
|
wangyidong
|
e4b9ef4536
|
* fix bug #30585.
|
2022-12-08 09:56:31 +08:00 |
|
|
wangyidong
|
3e18aa302a
|
* fix bug #30584.
|
2022-12-08 09:16:17 +08:00 |
|
|
liuhong
|
ec810545d5
|
* draft code for #78665.
|
2022-12-08 00:19:26 +00:00 |
|
|
lanzongjun
|
04cb6a9cac
|
* Finish Bug #30616
|
2022-12-07 15:53:10 +08:00 |
|
|
孙广明
|
50bb73fe57
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78673#78688
See merge request easycorp/zentaopms!6489
|
2022-12-07 07:01:14 +00:00 |
|
|
xieqiyu
|
afe9d49024
|
* Finish task#78668.
|
2022-12-07 11:16:55 +08:00 |
|
|
lanzongjun
|
15d16d3eb6
|
add default branchName
|
2022-12-07 09:50:09 +08:00 |
|
|
lanzongjun
|
e6df8be8a6
|
add default branch
|
2022-12-07 09:21:19 +08:00 |
|
|
lanzongjun
|
a228bfdeeb
|
resolve conflict
|
2022-12-06 17:21:18 +08:00 |
|
|
lanzongjun
|
4cbf1397b8
|
* Finish Task #78671
|
2022-12-06 17:18:57 +08:00 |
|
|
lanzongjun
|
55aac8c426
|
* Finish Task #78664
|
2022-12-06 16:51:58 +08:00 |
|