 lanzongjun
|
0a492b61fa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-13 09:08:08 +08:00 |
|
|
lanzongjun
|
d2cb9938b5
|
* Finish Task #79670
|
2022-12-12 17:34:43 +08:00 |
|
|
Yagami
|
27b73d7dcd
|
* Code for function review.
|
2022-12-12 16:16:51 +08:00 |
|
|
Yagami
|
b70f00842f
|
* Finish task #79462.
|
2022-12-12 10:01:40 +08:00 |
|
|
wangyidong
|
81d3403a20
|
* code for task #79279.
|
2022-12-09 16:54:17 +08:00 |
|
|
孙广明
|
8981507e80
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688
See merge request easycorp/zentaopms!6515
|
2022-12-09 06:48:13 +00:00 |
|
|
wangyidong
|
f1b27ca35a
|
* fix bug #30745.
|
2022-12-09 12:23:09 +08:00 |
|
|
lanzongjun
|
dd2160fde3
|
* Finish Bug #30662
|
2022-12-09 11:53:58 +08:00 |
|
|
Yagami
|
fb95d28f5a
|
* Fix bug #30569.
|
2022-12-08 14:17:43 +08:00 |
|
|
孙广明
|
31ef3e0260
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480
See merge request easycorp/zentaopms!6498
|
2022-12-08 06:05:50 +00:00 |
|
|
lanzongjun
|
0f4ef051bf
|
* Finish Bug #30480
|
2022-12-08 13:44:28 +08:00 |
|
|
xieqiyu
|
6038b69ea4
|
* Fix bug#30651.
|
2022-12-08 13:31:00 +08:00 |
|
|
lanzongjun
|
d6f9976aae
|
* Finish Bug #30480
|
2022-12-08 11:06:04 +08:00 |
|
|
wangyidong
|
3e18aa302a
|
* fix bug #30584.
|
2022-12-08 09:16:17 +08:00 |
|
|
孙广明
|
688866a30e
|
Merge branch 'master_xieqiyu_78668' into 'master'
* Finish task#78668.
See merge request easycorp/zentaopms!6488
|
2022-12-07 05:01:49 +00:00 |
|
|
xieqiyu
|
a2d2c55e94
|
* Code for task#78668. Add trim.
|
2022-12-07 11:25:41 +08:00 |
|
|
xieqiyu
|
afe9d49024
|
* Finish task#78668.
|
2022-12-07 11:16:55 +08:00 |
|
|
wangyidong
|
595ec286b6
|
* adjust for show build path.
|
2022-12-07 10:34:10 +08:00 |
|
|
王怡栋
|
e747ec9232
|
Merge branch 'feedback_1661' into 'master'
* Resolve feedback#1661
See merge request easycorp/zentaopms!6485
|
2022-12-06 09:34:14 +00:00 |
|
|
zenggang
|
4239813b6b
|
* Resolve feedback#1661
|
2022-12-06 09:30:48 +00:00 |
|
|
hufangzhou
|
871eb1c0a3
|
* Fix bug #30500.
|
2022-12-06 09:20:32 +00:00 |
|
|
孙广明
|
f06d508e16
|
* Finish task #78662.
|
2022-12-06 15:48:09 +08:00 |
|
|
hufangzhou
|
15d3437046
|
* Handle ticket #144.
|
2022-12-06 06:53:34 +00:00 |
|
|
wangyidong
|
0f1de8b84f
|
* code for task #78911
|
2022-12-06 13:43:17 +08:00 |
|
|
孙广明
|
1bca37102e
|
* Fix bug #30554.
|
2022-12-06 13:40:07 +08:00 |
|
|
Yagami
|
55ea43c5aa
|
Merge branch 'zentaopms_256'
|
2022-12-05 10:36:22 +08:00 |
|
|
Yagami
|
ef95e48fb2
|
Merge branch 'tianshujie_lang'
|
2022-12-05 10:30:22 +08:00 |
|
|
孙广明
|
ff8f35fc49
|
Merge branch 'master' into 'tianshujie_lang'
# Conflicts:
# module/project/lang/de.php
# module/project/lang/en.php
# module/project/lang/fr.php
|
2022-12-05 02:30:02 +00:00 |
|
|
wangyidong
|
fdc4c4159f
|
* adjust for icon.
|
2022-12-05 10:29:48 +08:00 |
|
|
wangyidong
|
33d2c170fe
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-12-05 10:11:28 +08:00 |
|
|
wangyidong
|
42e85ebbb8
|
* code for task #78384.
|
2022-12-05 10:10:59 +08:00 |
|
|
Yagami
|
d7d897a8f7
|
* Fix code error.
|
2022-12-02 15:58:52 +08:00 |
|
|
wangyuting
|
099eaa8a5e
|
* Finish task #78357.
|
2022-12-02 07:43:05 +00:00 |
|
|
Yagami
|
b181c11e37
|
* Fix bug #30476.
|
2022-12-02 15:00:12 +08:00 |
|
|
Yagami
|
8cb3e136d3
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 10:48:11 +08:00 |
|
|
王怡栋
|
d1952c69b0
|
Merge branch 'zentaopms_266_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6446
|
2022-12-02 02:47:20 +00:00 |
|
|
Yagami
|
32424d7072
|
* Finish task #77800.
|
2022-12-02 10:39:49 +08:00 |
|
|
lanzongjun
|
a835220fe1
|
resolve conflict master
|
2022-12-02 10:28:31 +08:00 |
|
|
tianshujie
|
facbb47832
|
* Modify long-term language items.
|
2022-12-02 10:01:53 +08:00 |
|
|
lanzongjun
|
59c7949f9a
|
change copyproject to copyProject
|
2022-12-02 09:53:03 +08:00 |
|
|
lanzongjun
|
8e1172e955
|
fix cp project js error
|
2022-12-02 08:50:07 +08:00 |
|
|
Yagami
|
02171e9a5d
|
* Finish task #77800.
|
2022-12-02 08:34:49 +08:00 |
|
|
wangyuting
|
e100ad058c
|
* Fix bug.
|
2022-12-01 09:03:16 +00:00 |
|
|
王怡栋
|
8047908575
|
Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30274.
See merge request easycorp/zentaopms!6445
|
2022-12-01 09:00:59 +00:00 |
|
|
wangyidong
|
8007950ef9
|
* fix bug #30274.
|
2022-12-01 16:59:45 +08:00 |
|
|
孙广明
|
71f18cd3b3
|
Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix cp project js error
See merge request easycorp/zentaopms!6442
|
2022-12-01 07:42:25 +00:00 |
|
|
lanzongjun
|
a13ae45bd1
|
fix cp project js error
|
2022-12-01 15:36:17 +08:00 |
|
|
Yagami
|
cfc70e8176
|
* Code for task #77800.
|
2022-12-01 15:15:07 +08:00 |
|
|
wangyuting
|
2bd28233ea
|
* Fix bug #30429.
|
2022-12-01 06:28:13 +00:00 |
|
|
Yagami
|
7a843ece37
|
* Code for task #77800.
|
2022-12-01 13:52:46 +08:00 |
|