 朱金勇
|
4ece1e7e79
|
* Fix setItem to zt_config.
|
2023-04-12 02:51:28 +00:00 |
|
|
caoyanyi
|
021dbcc7eb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 10:10:59 +08:00 |
|
|
caoyanyi
|
c6cf7c6f35
|
* Code for task #90781.
|
2023-04-12 10:10:29 +08:00 |
|
|
王怡栋
|
78a9facdb3
|
Merge branch 'tsj_task' into 'master'
* Code f or dynamic
See merge request easycorp/zentaopms!7374
|
2023-04-12 01:55:43 +00:00 |
|
|
tianshujie
|
324dfe4650
|
* Code for task #90780.
|
2023-04-12 09:08:51 +08:00 |
|
|
caoyanyi
|
4e888b8f3d
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 09:00:04 +08:00 |
|
|
tianshujie
|
1d2a069f12
|
* Rename block.
|
2023-04-12 08:44:40 +08:00 |
|
|
caoyanyi
|
f194177369
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-11 17:13:05 +08:00 |
|
|
caoyanyi
|
675f25a191
|
* Modify style for right block.
|
2023-04-11 16:47:45 +08:00 |
|
|
tianshujie
|
81e7153c8e
|
* Code for task #90780.
|
2023-04-11 16:34:29 +08:00 |
|
|
caoyanyi
|
185550fcf4
|
* Code for task #90779.
|
2023-04-11 16:11:55 +08:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
tianshujie
|
95998c1f2a
|
* Remove useless code.
|
2023-04-11 09:19:11 +08:00 |
|
|
tianshujie
|
85b9981ed4
|
* Compatible with lite page.
|
2023-04-11 08:59:30 +08:00 |
|
|
tianshujie
|
66d0694599
|
* Code for task #90778.
|
2023-04-10 17:15:26 +08:00 |
|
|
朱金勇
|
2b9e5f4d95
|
Fix bug#33806.
|
2023-04-07 01:21:31 +00: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 |
|
|
caoyanyi
|
8e3935c8d7
|
* Modify font color.
|
2023-03-16 14:11:11 +08:00 |
|
|
caoyanyi
|
61b782d0d3
|
* Adjust code.
|
2023-03-13 15:27:14 +08:00 |
|
|
guofeilong
|
7375d26d90
|
* Code for bug #32714 .
|
2023-03-13 14:18:55 +08:00 |
|
|
caoyanyi
|
7d40afc496
|
* Fix bug 29433.
|
2023-03-10 10:16:07 +08:00 |
|
|
caoyanyi
|
afee92dcf3
|
* Update block name.
|
2023-03-08 11:14:02 +08:00 |
|
|
caoyanyi
|
9f3a92179c
|
* Adjust code.
|
2023-03-08 11:10:31 +08:00 |
|
|
caoyanyi
|
eeae074475
|
* Update project common lang.
|
2023-03-08 09:46:27 +08:00 |
|
|
caoyanyi
|
6ac75ed33c
|
* Modify project common lang.
|
2023-03-08 09:31:31 +08:00 |
|
|
tianshujie
|
87cff2d9a5
|
* Modify language items for product common.
|
2023-03-06 15:53:24 +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 |
|
|
caoyanyi
|
86c6968243
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-03 08:48:41 +08:00 |
|
|
caoyanyi
|
58d9fd2ee9
|
* Fix bug #32593.
|
2023-03-02 17:04:44 +08:00 |
|
|
tianshujie
|
3886a5f25b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-02 08:27:28 +08:00 |
|
|
guofeilong
|
4ad274cf1b
|
* Code for bug #32448.
|
2023-03-01 17:12:53 +08:00 |
|
|
tianshujie
|
872137cea6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 08:35:21 +08:00 |
|
|
王怡栋
|
079e301cbc
|
Merge branch 'cyy_optimize' into 'master'
* Optimize page style for guide block.
See merge request easycorp/zentaopms!7093
|
2023-03-01 00:31:40 +00:00 |
|
|
caoyanyi
|
569efba6e0
|
* Optimize page style for guide block.
|
2023-02-28 16:14:58 +08:00 |
|
|
liumengyi
|
2fd93bcb08
|
* Fix bug #32495.
|
2023-02-28 08:14:08 +00:00 |
|
|
liumengyi
|
2c557b7900
|
* Finish task #85651.
|
2023-02-27 08:51:12 +00:00 |
|
|
tianshujie
|
cf4c9931e2
|
* Code for finish task #84527.
|
2023-02-27 15:29:02 +08:00 |
|
|
caoyanyi
|
2f3aae9281
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 16:05:42 +08:00 |
|
|
Yagami
|
290487a68a
|
* Fix bug #32263.
|
2023-02-23 10:19:19 +08:00 |
|
|
caoyanyi
|
10da3ef802
|
* Modify language defined.
|
2023-02-23 09:32:56 +08:00 |
|
|
tianshujie
|
5b2cafa380
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 14:13:51 +08:00 |
|
|
孙广明
|
777b20ebdc
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7009
|
2023-02-21 05:47:26 +00:00 |
|
|
Lufei
|
63a8a97c59
|
* Compatible PHP5.3.
|
2023-02-21 09:15:53 +08:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
guofeilong
|
684fa3557c
|
* Code refactors in preference.html.php .
|
2023-02-20 11:16:41 +08:00 |
|
|
guofeilong
|
6da9c01104
|
* Code for add js to module/langItem .
|
2023-02-20 10:00:43 +08:00 |
|
|
王怡栋
|
361568a575
|
Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6980
|
2023-02-17 02:00:33 +00:00 |
|
|
tianshujie
|
d9322e91e2
|
* Code for finish task#84576.
|
2023-02-17 09:33:34 +08:00 |
|