 liumengyi
|
b8e8c3d788
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 13:16:42 +08:00 |
|
|
wangyidong
|
0d31625643
|
* code for task #91388.
|
2023-04-18 13:05:14 +08:00 |
|
|
liumengyi
|
17ee6ad3f4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 11:06:01 +08:00 |
|
|
朱金勇
|
28852fb5fe
|
* Fix bug: order error.
|
2023-04-18 00:53:06 +00:00 |
|
|
liumengyi
|
d971d4b4b7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 08:38:14 +08:00 |
|
|
wangyidong
|
5399ec46be
|
* code for task #91381.
|
2023-04-17 17:14:56 +08:00 |
|
|
liumengyi
|
648dc288ca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-14 15:15:03 +08:00 |
|
|
liumengyi
|
66770f07c2
|
* Rename the privilege of product-project.
|
2023-04-13 17:12:53 +08:00 |
|
|
王怡栋
|
e6be417612
|
Merge branch 'master' into 'tsj_task'
# Conflicts:
# module/doc/view/lefttree.html.php
|
2023-04-13 09:03:14 +00:00 |
|
|
tianshujie
|
0c935c7eea
|
* Modify jump link.
|
2023-04-13 15:45:51 +08:00 |
|
|
liumengyi
|
f197999e42
|
- Delete the privilege of product-build.
|
2023-04-13 14:28:37 +08:00 |
|
|
朱金勇
|
bb531cfd2c
|
* Fix bugs in dmdb.
|
2023-04-13 05:10:17 +00:00 |
|
|
zhouxin
|
980d508cb7
|
* Reslove feedback #2644.
|
2023-04-13 02:42:28 +00:00 |
|
|
tianshujie
|
324dfe4650
|
* Code for task #90780.
|
2023-04-12 09:08:51 +08:00 |
|
|
王怡栋
|
f1bc3b73cc
|
Merge branch 'tsj_doc' into 'master'
* Code for task #90792.
See merge request easycorp/zentaopms!7343
|
2023-04-11 00:35:16 +00:00 |
|
|
朱金勇
|
0dde8ad3ed
|
Fix default value of db.
|
2023-04-10 09:19:01 +00:00 |
|
|
tianshujie
|
c99fed9fe9
|
* Code for task #90792.
|
2023-04-10 14:31:21 +08:00 |
|
|
Yagami
|
9bc7941349
|
* Code for feedback drop menu link error.
|
2023-04-10 09:12:23 +08:00 |
|
|
caoyanyi
|
5be38b3c6d
|
* Modify api struct page product locate.
|
2023-04-07 16:03:55 +08:00 |
|
|
tianshujie
|
f3897e5dc8
|
* Fixed an error message when clicking level 1.5 and then clicking Level
2.5.
|
2023-04-06 09:23:32 +08:00 |
|
|
朱金勇
|
22f9f1d087
|
Merge branch 'db'
|
2023-04-05 14:30:11 +00:00 |
|
|
朱金勇
|
7f9d638d28
|
* Fix sql for dmdb.
|
2023-04-05 14:18:24 +00:00 |
|
|
hufangzhou
|
d29643cf57
|
* Revert the code.
|
2023-03-21 13:25:02 +08:00 |
|
|
hufangzhou
|
5bc154a69b
|
* Fix bug #33088.
|
2023-03-20 15:39:28 +08:00 |
|
|
wangyuting2
|
4bf396b34c
|
* Fix bug #33023.
|
2023-03-20 13:59:10 +08:00 |
|
|
wangyidong
|
db49612b75
|
* fix bug #33059.
|
2023-03-17 13:06:38 +08:00 |
|
|
caoyanyi
|
1bc1e3fc0f
|
* Adjust code.
|
2023-03-16 15:53:11 +08:00 |
|
|
caoyanyi
|
a99ed812d3
|
* Code for bug #33010.
|
2023-03-16 15:37:12 +08:00 |
|
|
王怡栋
|
f526a16291
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/custom/lang/zh-cn.php
|
2023-03-15 06:19:32 +00:00 |
|
|
hufangzhou
|
047dfd6e54
|
* Fix bug #32940.
|
2023-03-15 14:09:10 +08:00 |
|
|
管西迎
|
d0817bc8a0
|
Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.
See merge request easycorp/zentaopms!7193
|
2023-03-15 03:10:17 +00:00 |
|
|
tianshujie
|
5f6f52e86e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-15 10:57:18 +08:00 |
|
|
管西迎
|
93ca7dda5f
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.
See merge request easycorp/zentaopms!7192
|
2023-03-15 02:55:12 +00:00 |
|
|
tianshujie
|
bdc83c7088
|
* Modify product line language.
|
2023-03-15 10:54:45 +08:00 |
|
|
hufangzhou
|
125a4384af
|
* Add the new version.
|
2023-03-15 02:53:46 +00:00 |
|
|
tianshujie
|
cd925cee0e
|
* Modify product line language.
|
2023-03-15 10:53:15 +08:00 |
|
|
tianshujie
|
3756e90cfd
|
* Fix bug 32929.
|
2023-03-15 10:41:40 +08:00 |
|
|
wangyidong
|
a946e5edeb
|
Merge branch 'easycorp/zentaopms-sprint/hufangzhou_task_87019'
|
2023-03-15 09:44:59 +08:00 |
|
|
caoyanyi
|
3a06344d55
|
* Modify program language.
|
2023-03-14 15:03:50 +08:00 |
|
|
hufangzhou
|
14f289ff97
|
* Finish task #87019.
|
2023-03-13 09:44:13 +00:00 |
|
|
tianshujie
|
665422c7ce
|
* Fix bug #32761.
|
2023-03-09 16:50:22 +08:00 |
|
|
caoyanyi
|
b6f0e594c6
|
* Fix bug #31434.
|
2023-03-09 13:12:25 +08:00 |
|
|
tianshujie
|
13ce2eac8d
|
* Fix bug #31975.
|
2023-03-09 10:32:05 +08:00 |
|
|
caoyanyi
|
1364c7923b
|
* Fix bug #28114.
|
2023-03-08 16:41:51 +08:00 |
|
|
tianshujie
|
44b97bdab1
|
* Modify language items for project,product common.
|
2023-03-08 09:44:16 +08:00 |
|
|
tianshujie
|
ae929617b0
|
* Modify language items for product common.
|
2023-03-07 13:13:50 +08:00 |
|
|
caoyanyi
|
9ed0c9a4f3
|
* Modify language for project common.
|
2023-03-06 15:53:45 +08:00 |
|
|
王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
|
tianshujie
|
4d400723ce
|
* Modify more select display method.
|
2023-03-03 15:54:33 +08:00 |
|