 xieqiyu
|
6f8dd9e186
|
* Code for task#78669. Add branch name in tips.
|
2022-12-06 14:27:17 +08:00 |
|
|
xieqiyu
|
62157bf79e
|
* Code for task#78669.
|
2022-12-06 10:24:11 +08:00 |
|
|
xieqiyu
|
c23d02ca73
|
* Code for task#78669.
|
2022-12-06 10:03:42 +08:00 |
|
|
xieqiyu
|
c1257aac6b
|
* Code for task#78669.
|
2022-12-06 09:57:03 +08:00 |
|
|
xieqiyu
|
0c42a46b93
|
* Code for task#78669.
|
2022-12-06 09:16:54 +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 |
|
|
王怡栋
|
ada3f3e3aa
|
Merge branch 'saas' into 'master'
* Adjust extension loading priority for saas.
See merge request easycorp/zentaopms!6459
|
2022-12-05 02:05:10 +00:00 |
|
|
dingguodong
|
5fc4eeb5dd
|
* Adjust extension loading priority for saas.
|
2022-12-05 10:00:37 +08:00 |
|
|
王怡栋
|
38f487f8da
|
Merge branch 'bug_30470' into 'master'
* Fix bug#30470
See merge request easycorp/zentaopms!6452
|
2022-12-05 01:57:18 +00:00 |
|
|
王怡栋
|
6ef6a4bb2f
|
Merge branch 'zentaopms_266_task_#78361' into 'master'
* Finish task #78361,#78362.
See merge request easycorp/zentaopms!6457
|
2022-12-05 01:56:22 +00:00 |
|
|
王怡栋
|
937601ee05
|
Merge branch 'zentaopms_266_task#78357' into 'master'
* Finish task #78357.
See merge request easycorp/zentaopms!6456
|
2022-12-05 01:55:39 +00:00 |
|
|
王怡栋
|
4a104f54b9
|
Merge branch 'bug_25845' into 'master'
* Fix bug#25845
See merge request easycorp/zentaopms!6454
|
2022-12-05 01:54:31 +00:00 |
|
|
lanzongjun
|
ea0d3d44ba
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-05 09:23:07 +08:00 |
|
|
lanzongjun
|
9fc3e25635
|
* fix execution plans
|
2022-12-05 09:23:01 +08:00 |
|
|
wangyidong
|
2fd85774c1
|
* code for task #78383.
|
2022-12-05 08:49:00 +08:00 |
|
|
朱金勇
|
5ce6a71fd1
|
Merge branch 'change_reportbug_lang' into 'master'
* Change report bug lang.
See merge request easycorp/zentaopms!6453
|
2022-12-02 10:59:59 +00:00 |
|
|
daitingting
|
14ea643f61
|
* Finish task #78361,#78362.
|
2022-12-02 08:03:37 +00:00 |
|
|
Yagami
|
3c088eb548
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 15:59:02 +08:00 |
|
|
Yagami
|
d7d897a8f7
|
* Fix code error.
|
2022-12-02 15:58:52 +08:00 |
|
|
lanzongjun
|
a0c214eace
|
* fix bug #30475
|
2022-12-02 15:54:05 +08:00 |
|
|
wangyuting
|
099eaa8a5e
|
* Finish task #78357.
|
2022-12-02 07:43:05 +00:00 |
|
|
lanzongjun
|
3b09109e21
|
* fix bug #30496
|
2022-12-02 15:34:11 +08:00 |
|
|
lanzongjun
|
a4563c065a
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 15:32:42 +08:00 |
|
|
lanzongjun
|
a1bd34b3ce
|
* fix bug #30496
|
2022-12-02 15:32:36 +08:00 |
|
|
zenggang
|
82948abf2b
|
* Fix bug#25845
|
2022-12-02 07:20:59 +00:00 |
|
|
Lufei
|
90c061cb40
|
* Change report bug lang.
|
2022-12-02 15:07:22 +08:00 |
|
|
Yagami
|
b181c11e37
|
* Fix bug #30476.
|
2022-12-02 15:00:12 +08:00 |
|
|
wangyidong
|
15aecd0bf9
|
* fix bug #30506.
|
2022-12-02 14:54:59 +08:00 |
|
|
lanzongjun
|
546a417339
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 14:41:56 +08:00 |
|
|
lanzongjun
|
8a81c215b5
|
* fix bug #30472
|
2022-12-02 14:41:49 +08:00 |
|
|
孙广明
|
0019435f65
|
Merge branch 'sprint/zentaopms268_mayue_bug#30457' into 'zentaopms_256'
* Fix bug #30457.
See merge request easycorp/zentaopms!6450
|
2022-12-02 06:35:44 +00:00 |
|
|
Yagami
|
dda0446e57
|
* Fix bug #30436.
|
2022-12-02 14:34:34 +08:00 |
|
|
lanzongjun
|
5498b85ad6
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 13:57:43 +08:00 |
|
|
lanzongjun
|
19db2248d9
|
* fix bug #30480
|
2022-12-02 13:57:34 +08:00 |
|
|
Yagami
|
45169a4822
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 13:42:33 +08:00 |
|
|
Yagami
|
dbc00993c6
|
* Fix execution manage products bug.
|
2022-12-02 13:42:09 +08:00 |
|
|
zenggang
|
2b66d5d5ca
|
* Fix bug#30470
|
2022-12-02 05:32:33 +00:00 |
|
|
lanzongjun
|
aa96dfc3a9
|
* fix bug #30447
|
2022-12-02 13:28:08 +08:00 |
|
|
lanzongjun
|
0247499985
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 10:59:47 +08:00 |
|
|
lanzongjun
|
0a5e89dd34
|
* fix bug #30482
|
2022-12-02 10:59:34 +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 |
|