 caoyanyi
|
36fbbfc21b
|
Merge branch 'master' into zenops_46
|
2022-12-05 08:31:12 +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 |
|
|
caoyanyi
|
f58e24e6fc
|
Merge branch 'master' into zenops_46
|
2022-12-02 10:04:48 +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 |
|
|
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 |
|
|
wangyuting
|
2bd28233ea
|
* Fix bug #30429.
|
2022-12-01 06:28:13 +00: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 |
|
|
caoyanyi
|
fc95313a40
|
Merge branch 'master' into zenops_46
|
2022-11-28 08:41:37 +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 |
|
|
Yagami
|
89d1dd2a3a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-24 13:15:40 +08:00 |
|
|
Yagami
|
9b0881dd5e
|
* Fix bug for project unlink product.
|
2022-11-24 13:15:26 +08:00 |
|
|
caoyanyi
|
4361cb4182
|
Merge branch 'master' into zenops_46
|
2022-11-24 13:01:30 +08:00 |
|
|
daitingting
|
07f1d12ef8
|
* Fix bug #30185.
|
2022-11-24 03:03:42 +00:00 |
|
|
王怡栋
|
f97c94bbde
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix project edit width
See merge request easycorp/zentaopms!6351
|
2022-11-24 02:18:44 +00:00 |
|
|
lanzongjun
|
9f692f5b23
|
* Fix project edit width
|
2022-11-24 10:17:44 +08:00 |
|
|
王怡栋
|
f531d46441
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30156
See merge request easycorp/zentaopms!6340
|
2022-11-24 02:14:55 +00:00 |
|
|
lanzongjun
|
eac16b903f
|
* Fix Bug #30156
|
2022-11-23 16:54:49 +08:00 |
|
|
孙广明
|
e2571ee150
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30157
See merge request easycorp/zentaopms!6335
|
2022-11-23 08:01:46 +00:00 |
|
|
lanzongjun
|
40ee11ba30
|
* Fix Bug #30157
|
2022-11-23 15:59:21 +08:00 |
|
|
Yagami
|
307e9c5f62
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-23 13:44:25 +08:00 |
|
|
王怡栋
|
3dd409514c
|
Merge branch 'zentaopms_263_wangyuting2' into 'master'
* Optimize project build css.
See merge request easycorp/zentaopms!6315
|
2022-11-23 05:43:50 +00:00 |
|
|
Yagami
|
49581d7ece
|
* Finish task #77252.
|
2022-11-23 13:43:06 +08:00 |
|
|
wangyuting
|
9b3e52ac3b
|
* Optimize project build css.
|
2022-11-23 02:02:13 +00:00 |
|
|
wangyuting
|
63a249eeca
|
* Fix bug #30045.
|
2022-11-23 01:29:34 +00:00 |
|
|
caoyanyi
|
0d81c7f4fe
|
Merge branch 'master' into zenops_46
|
2022-11-22 15:39:59 +08:00 |
|
|
王怡栋
|
c8abe9f23a
|
Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.
See merge request easycorp/zentaopms!6297
|
2022-11-22 06:39:17 +00:00 |
|
|
Yagami
|
e4a80e800d
|
* Finish task #76953.
|
2022-11-22 14:27:38 +08:00 |
|