 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 |
|
|
Yagami
|
6263ee7a5c
|
* Code for task #77801.
|
2022-12-01 10:34:23 +08:00 |
|
|
王怡栋
|
c71b65d8b0
|
Merge branch 'zentaopms_266_task#77610' into 'master'
* Finish task #77610.
See merge request easycorp/zentaopms!6410
|
2022-11-30 02:06:19 +00:00 |
|
|
wangyuting
|
5c176595e4
|
* Finish task #77610.
|
2022-11-30 01:46:45 +00:00 |
|
|
孔令茂
|
e5cfde941d
|
* Optimize project linkage on create bug page.
|
2022-11-29 13:20:50 +00:00 |
|
|
lanzongjun
|
9077e9b4a3
|
* Fix Task #77798
|
2022-11-29 14:35:07 +08:00 |
|
|
孙广明
|
6356683483
|
Merge branch 'master' into 256
|
2022-11-28 13:36:48 +08:00 |
|
|
daitingting
|
a2aa5c325a
|
* Fix bug #30020.
|
2022-11-25 07:36:53 +00:00 |
|
|
Yagami
|
76b3882e55
|
* Fix project manage products bug.
|
2022-11-25 14:10:07 +08:00 |
|
|
Yagami
|
eda6dc67ef
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-25 13:10:25 +08:00 |
|
|
Yagami
|
4f16057c77
|
* Code for manage products.
|
2022-11-25 13:10:10 +08:00 |
|
|
王怡栋
|
e90baa91f9
|
Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.
See merge request easycorp/zentaopms!6381
|
2022-11-25 05:02:58 +00:00 |
|
|
wangyuting
|
a4cc3fd11a
|
* Fix bug #30265.
|
2022-11-25 03:25:52 +00:00 |
|
|
孙广明
|
1d9b2ce11c
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028#30240#30245
See merge request easycorp/zentaopms!6376
|
2022-11-25 03:09:48 +00:00 |
|
|
孙广明
|
7f1533ed40
|
Merge branch 'master_xieqiyu_30233' into 'master'
* Fix bug#30233.
See merge request easycorp/zentaopms!6377
|
2022-11-25 03:09:25 +00:00 |
|
|
Yagami
|
84dce924b8
|
* Code for task #30261.
|
2022-11-25 11:07:45 +08:00 |
|
|
Yagami
|
7fbcb9b13e
|
* Finish task #30261.
|
2022-11-25 10:50:22 +08:00 |
|
|
Yagami
|
efbbaa9918
|
* Fix bug.
|
2022-11-25 09:53:17 +08:00 |
|
|
lanzongjun
|
3e2648ab5e
|
* Fix Bug #30240
|
2022-11-25 09:34:57 +08:00 |
|
|
xieqiyu
|
d00e4f5978
|
* Fix bug#30233.
|
2022-11-25 09:06:19 +08:00 |
|
|
Yagami
|
25e5b27220
|
* Finish task #77365.
|
2022-11-25 08:39:24 +08:00 |
|
|
王怡栋
|
6114d5cfbe
|
Merge branch 'zentaopms_263_bug#30216' into 'master'
* Fix bug #30216.
See merge request easycorp/zentaopms!6372
|
2022-11-24 07:57:14 +00:00 |
|
|
wangyuting
|
22f2299bfa
|
* Fix bug #30216.
|
2022-11-24 07:42:49 +00:00 |
|
|
王怡栋
|
8b19070f9b
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Adjust code for bug #30011,24060.
See merge request easycorp/zentaopms!6369
|
2022-11-24 07:40:07 +00:00 |
|
|
tanghucheng
|
3ca705de9f
|
* Adjust code for bug #30011,24060.
|
2022-11-24 14:58:59 +08:00 |
|
|
xieqiyu
|
4813aea7b3
|
* Fix bug#30214.
|
2022-11-24 14:31:10 +08:00 |
|