 hufangzhou
|
70cc4cda66
|
* Handle feedback #1666.
|
2022-12-06 08:30:30 +00:00 |
|
|
孙广明
|
a1ab91b66b
|
Merge branch 'master_xieqiyu_78667' into 'master'
* Code for task#78667.
See merge request easycorp/zentaopms!6479
|
2022-12-06 08:09:59 +00:00 |
|
|
孙广明
|
262e4972b3
|
Merge branch 'master_xieqiyu_78669' into 'master'
Master xieqiyu 78669
See merge request easycorp/zentaopms!6478
|
2022-12-06 08:08:45 +00:00 |
|
|
xieqiyu
|
d20421ad39
|
* Code for task#78667.
|
2022-12-06 16:06:28 +08:00 |
|
|
孙广明
|
f06d508e16
|
* Finish task #78662.
|
2022-12-06 15:48:09 +08:00 |
|
|
孙广明
|
a68d09a11b
|
Merge branch 'sprint/hufangzhou_ticket_144' into 'master'
* Handle ticket #144.
See merge request easycorp/zentaopms!6477
|
2022-12-06 06:56:49 +00:00 |
|
|
hufangzhou
|
15d3437046
|
* Handle ticket #144.
|
2022-12-06 06:53:34 +00:00 |
|
|
孙广明
|
1afa8277b6
|
Merge branch 'zhouxin_ticket_fixsql' into 'master'
* Add drop table sql.
See merge request easycorp/zentaopms!6475
|
2022-12-06 06:28:19 +00:00 |
|
|
孙广明
|
20de306b8a
|
Merge branch 'lyk_feedback_1398' into 'master'
* Resolve feedback #1398.
See merge request easycorp/zentaopms!6476
|
2022-12-06 06:28:06 +00:00 |
|
|
xieqiyu
|
6f8dd9e186
|
* Code for task#78669. Add branch name in tips.
|
2022-12-06 14:27:17 +08:00 |
|
|
wangyidong
|
58596cacf1
|
* code task #78913.
|
2022-12-06 14:17:18 +08:00 |
|
|
zhouxin
|
d8e155a5ec
|
* Add drop table sql.
|
2022-12-06 06:16:05 +00:00 |
|
|
朱金勇
|
5eb1c0c228
|
Merge branch 'master_lufei_formatcode' into 'master'
* Format code and fix return value.
See merge request easycorp/zentaopms!6466
|
2022-12-06 06:05:18 +00:00 |
|
|
鲁飞
|
2f4ad5c556
|
* Format code and fix return value.
|
2022-12-06 06:05:18 +00:00 |
|
|
liuyongkai
|
069a8d4a06
|
* Resolve feedback #1398.
|
2022-12-06 13:54:54 +08:00 |
|
|
wangyidong
|
45e8ff4f1a
|
* code for task #78912.
|
2022-12-06 13:54:14 +08:00 |
|
|
孙广明
|
44511a56c8
|
Merge branch 'zhouxin_bug_30548' into 'master'
* Fix bug #30548.
See merge request easycorp/zentaopms!6474
|
2022-12-06 05:53:49 +00:00 |
|
|
zhouxin
|
10646f608b
|
* Fix bug #30548.
|
2022-12-06 05:47:19 +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 |
|
|
孙广明
|
b20b7fa781
|
Merge branch 'zhouxin_feedback_83' into 'master'
* Resolve feedback #83.
See merge request easycorp/zentaopms!6469
|
2022-12-06 02:54:04 +00:00 |
|
|
zhouxin
|
afbd5f1b0a
|
* Resolve feedback #83.
|
2022-12-06 02:42:35 +00:00 |
|
|
王怡栋
|
5f4c964d59
|
Merge branch 'zentaopms269_wyd' into 'master'
* code for task #78909.
See merge request easycorp/zentaopms!6468
|
2022-12-06 02:38:34 +00:00 |
|
|
wangyidong
|
7c8f4674cf
|
* code for task #78909.
|
2022-12-06 10:37:24 +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 |
|
|
王怡栋
|
4477af1450
|
Merge branch 'mayue_feedback#1478' into 'master'
* Resolve feedback #1478.
See merge request easycorp/zentaopms!6465
|
2022-12-06 01:45:53 +00:00 |
|
|
孙广明
|
6a29023b24
|
* Finish task #78675.
|
2022-12-06 09:39:47 +08:00 |
|
|
mayue
|
796b695b21
|
* Resolve feedback #1478.
|
2022-12-06 09:35:42 +08:00 |
|
|
xieqiyu
|
0c42a46b93
|
* Code for task#78669.
|
2022-12-06 09:16:54 +08:00 |
|
|
孙广明
|
2cf99918a5
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #78670
See merge request easycorp/zentaopms!6460
|
2022-12-05 08:14:25 +00:00 |
|
|
孙广明
|
57ebea6fe6
|
Merge branch 'zhouxin_feedback_909' into 'master'
* Resolve feedback #909.
See merge request easycorp/zentaopms!6462
|
2022-12-05 08:13:29 +00:00 |
|
|
zhouxin
|
03d9357d48
|
* Resolve feedback #909.
|
2022-12-05 08:08:28 +00:00 |
|
|
Yagami
|
ac2a798661
|
* Finish task #78689.
|
2022-12-05 14:16:02 +08:00 |
|
|
Yagami
|
3c60e62afa
|
* Finish task #78692.
|
2022-12-05 14:03:26 +08:00 |
|
|
lanzongjun
|
7bef1eaf28
|
* Finish Task #78670
|
2022-12-05 11:22:24 +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 |
|