 孙广明
|
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
|
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 |
|
|
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 |
|
|
wangyuting
|
099eaa8a5e
|
* Finish task #78357.
|
2022-12-02 07:43:05 +00: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 |
|
|
wangyidong
|
15aecd0bf9
|
* fix bug #30506.
|
2022-12-02 14:54:59 +08:00 |
|
|
zenggang
|
2b66d5d5ca
|
* Fix bug#30470
|
2022-12-02 05:32:33 +00: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 |
|
|
tianshujie
|
facbb47832
|
* Modify long-term language items.
|
2022-12-02 10:01:53 +08:00 |
|
|
孙广明
|
8b7afb1bef
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change copyproject to copyProject
See merge request easycorp/zentaopms!6449
|
2022-12-02 01:59:22 +00:00 |
|
|
lanzongjun
|
59c7949f9a
|
change copyproject to copyProject
|
2022-12-02 09:53:03 +08:00 |
|
|
孙广明
|
57ea3dc290
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
fix cp project js error
See merge request easycorp/zentaopms!6447
|
2022-12-02 00:59:43 +00: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 |
|
|
王怡栋
|
9c5c781b52
|
Merge branch 'zentaopms_266_task_#77616' into 'master'
* Fix bug for task #77615,#77616.
See merge request easycorp/zentaopms!6444
|
2022-12-01 08:39:27 +00:00 |
|
|
daitingting
|
995f927ae6
|
* Fix bug for task #77615,#77616.
|
2022-12-01 08:36:46 +00:00 |
|
|
王怡栋
|
5aa2fda450
|
Merge branch 'zentaopms_266_bug#30429' into 'master'
* Fix bug #30429.
See merge request easycorp/zentaopms!6436
|
2022-12-01 07:58:03 +00:00 |
|
|
王怡栋
|
dc827982fe
|
Merge branch 'master_bug_23961' into 'master'
* Fix bug #23961.
See merge request easycorp/zentaopms!6432
|
2022-12-01 07:57:10 +00:00 |
|
|
王怡栋
|
00312f6d4f
|
Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358
See merge request easycorp/zentaopms!6431
|
2022-12-01 07:56:07 +00:00 |
|
|
王怡栋
|
7013e19604
|
Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403
See merge request easycorp/zentaopms!6428
|
2022-12-01 07:54:50 +00:00 |
|
|
朱金勇
|
fe071c9de7
|
Merge branch 'check_ext-gd' into 'master'
* Add check ext-gd extension.
See merge request easycorp/zentaopms!6430
|
2022-12-01 07:05:16 +00:00 |
|
|
孙广明
|
a315f7205f
|
Merge branch 'sprint/fixbug_liumengyi_30278' into 'master'
* Fix bug #30278.
See merge request easycorp/zentaopms!6439
|
2022-12-01 06:44:33 +00:00 |
|
|
孙广明
|
b191213fce
|
Merge branch 'lyk_feedback_1461' into 'master'
* Resolve feedback #1461.
See merge request easycorp/zentaopms!6440
|
2022-12-01 06:36:01 +00:00 |
|
|
wangyuting
|
2bd28233ea
|
* Fix bug #30429.
|
2022-12-01 06:28:13 +00:00 |
|
|
liuyongkai
|
80bd2c745c
|
* Resolve feedback #1461.
|
2022-12-01 14:25:21 +08:00 |
|
|
王怡栋
|
07ed3b2d9d
|
Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30425.
See merge request easycorp/zentaopms!6434
|
2022-12-01 06:16:24 +00:00 |
|
|
wangyidong
|
22081a43de
|
* fix bug #30425.
|
2022-12-01 14:15:35 +08:00 |
|
|
chaideqing
|
3c3ce67354
|
* Refactor code.
|
2022-12-01 13:35:05 +08:00 |
|
|
Lufei
|
80d2e0f6c0
|
* Add check ext-gd extension.
|
2022-12-01 12:16:57 +08:00 |
|
|
chaideqing
|
ca3adef629
|
* Refactor code.
|
2022-12-01 11:15:52 +08:00 |
|
|
liumengyi
|
a6c8171286
|
* Fix bug #30278.
|
2022-12-01 10:33:59 +08:00 |
|
|
王怡栋
|
23f877b4f5
|
Merge branch 'zentaopms266_wyd' into 'master'
* adjust for task #77615,77616.
See merge request easycorp/zentaopms!6427
|
2022-12-01 02:29:06 +00:00 |
|
|
wangyidong
|
283b37b65e
|
* adjust for task #77615,77616.
|
2022-12-01 10:26:12 +08:00 |
|
|
chaideqing
|
756a9dc5a5
|
* Add vi lang.
|
2022-12-01 10:25:28 +08:00 |
|
|
chaideqing
|
6c3e107f78
|
* Refactor code.
|
2022-12-01 10:16:26 +08:00 |
|
|
chaideqing
|
bf3e8e33b3
|
* Fix feedback #1403 .
|
2022-11-30 21:07:12 +08:00 |
|
|
朱金勇
|
0cefe2dabd
|
Merge branch 'fix-extension' into 'master'
* Fix get extension files error for use softlink.
See merge request easycorp/zentaopms!6421
|
2022-11-30 10:36:09 +00:00 |
|
|
wangyidong
|
df0997aa70
|
* change deletereleased param to noreleased.
|
2022-11-30 17:11:17 +08:00 |
|