 tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
|
guofeilong
|
f578ab069b
|
* Code for task #750
|
2023-02-10 10:53:31 +08:00 |
|
|
guofeilong
|
b5f18edb35
|
* Code for task #748
|
2023-02-10 10:46:00 +08:00 |
|
|
guofeilong
|
a95bb643ed
|
* Code for css task #746.
|
2023-02-10 10:37:49 +08:00 |
|
|
wangyidong
|
cb153273d0
|
* adjust for admin set menu.
|
2023-02-10 10:00:37 +08:00 |
|
|
wangyidong
|
0f5ce93307
|
* code for task #83740.
|
2023-02-10 09:57:32 +08:00 |
|
|
孙广明
|
c824a0a053
|
Merge branch 'fix_devops_bug' into 'master'
Fix devops bug
See merge request easycorp/zentaopms!6910
|
2023-02-10 01:46:38 +00:00 |
|
|
liuyongkai
|
08e12a8374
|
* Add annotation.
|
2023-02-10 09:09:11 +08:00 |
|
|
guofeilong
|
a641684b0a
|
* Code for css in setting-dec refactors.
|
2023-02-10 08:33:00 +08:00 |
|
|
caoyanyi
|
a55805c92f
|
* Code for issue #745.
|
2023-02-09 16:57:05 +08:00 |
|
|
wangyidong
|
1ff0629556
|
* adjust for admin index page.
|
2023-02-09 16:29:00 +08:00 |
|
|
tianshujie
|
73dbc3a996
|
* Add case of gethasprivlink method.
|
2023-02-09 16:28:48 +08:00 |
|
|
孙广明
|
d29ddaed77
|
Merge branch 'zenops_61' into 'master'
* Fix error for php5.3.
See merge request easycorp/zentaopms!6907
|
2023-02-09 08:07:23 +00:00 |
|
|
zhaoke
|
db114d1c39
|
* Fix error for php5.3.
|
2023-02-09 08:02:50 +00:00 |
|
|
孙广明
|
8977945f6b
|
Merge branch 'fixbug_liumengyi_31978' into 'master'
* Fix bug #31978.
See merge request easycorp/zentaopms!6895
|
2023-02-09 07:05:10 +00:00 |
|
|
孙广明
|
f1b0412a19
|
Merge branch 'fixbug_liumengyi_31992' into 'master'
* Fix bug #31992.
See merge request easycorp/zentaopms!6902
|
2023-02-09 07:05:01 +00:00 |
|
|
liumengyi
|
504b9d8a4d
|
* Fix bug #31998.
|
2023-02-09 15:00:37 +08:00 |
|
|
王怡栋
|
c316ca23ea
|
Merge branch 'sprint/285_tsj' into 'sprint/285'
Sprint/285 tsj
See merge request easycorp/zentaopms!6906
|
2023-02-09 06:59:05 +00:00 |
|
|
王怡栋
|
372b93aaec
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #30351.
See merge request easycorp/zentaopms!6905
|
2023-02-09 06:58:15 +00:00 |
|
|
王怡栋
|
cb7af8fa4b
|
Merge branch 'sprint/285_dev' into 'sprint/285'
* Modify the style of the secondary development page.
See merge request easycorp/zentaopms!6904
|
2023-02-09 06:57:58 +00:00 |
|
|
tianshujie
|
9506850831
|
* Modify the parameters of the database navigation link.
|
2023-02-09 14:50:18 +08:00 |
|
|
wangyuting2
|
e4c3846cca
|
* Fix bug #30351.
|
2023-02-09 14:47:26 +08:00 |
|
|
王怡栋
|
ebd4168d04
|
Merge branch 'daitingting_bug_#24499' into 'master'
* Fix bug #24499.
See merge request easycorp/zentaopms!6903
|
2023-02-09 06:47:00 +00:00 |
|
|
王怡栋
|
3dfe1195df
|
Merge branch 'hfz_compatible_php53' into 'master'
* Compatible with php5.3.
See merge request easycorp/zentaopms!6901
|
2023-02-09 06:46:34 +00:00 |
|
|
tianshujie
|
173b9ad1d2
|
* Modify the style of the secondary development page.
|
2023-02-09 14:43:06 +08:00 |
|
|
guofeilong
|
cea151946c
|
Merge branch 'sprint/285_tsj' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 14:21:58 +08:00 |
|
|
caoyanyi
|
3cbc28df28
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 14:21:55 +08:00 |
|
|
guofeilong
|
5263854da6
|
* Code for delete box-shadow .
|
2023-02-09 14:21:55 +08:00 |
|
|
tianshujie
|
d7b5bde449
|
Merge branch 'sprint/285_tsj' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 14:19:43 +08:00 |
|
|
tianshujie
|
be37300935
|
* Code for finish task #83741.
|
2023-02-09 14:19:15 +08:00 |
|
|
guofeilong
|
ae76157958
|
* Browsestoryconcept: code refactors.
|
2023-02-09 14:13:03 +08:00 |
|
|
daitingting
|
e155d462a7
|
* Fix bug #24499.
|
2023-02-09 06:10:28 +00:00 |
|
|
liumengyi
|
54748bc377
|
* Fix bug #31992.
|
2023-02-09 13:59:02 +08:00 |
|
|
guofeilong
|
c6ce383c39
|
* Code for css in custom
|
2023-02-09 13:58:43 +08:00 |
|
|
hufangzhou
|
8d26dceb4b
|
* Compatible with php5.3.
|
2023-02-09 05:54:15 +00:00 |
|
|
liuyongkai
|
a4fdf693cd
|
* Fix some bugs.
|
2023-02-09 13:37:58 +08:00 |
|
|
tianshujie
|
78506e6ad4
|
* Add navigation highlighting.
|
2023-02-09 13:27:31 +08:00 |
|
|
王怡栋
|
8a7d835dc3
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #28865.
See merge request easycorp/zentaopms!6899
|
2023-02-09 05:16:05 +00:00 |
|
|
王怡栋
|
063f3b9441
|
Merge branch 'cyy_bug' into 'master'
* Modify array defined.
See merge request easycorp/zentaopms!6900
|
2023-02-09 05:15:44 +00:00 |
|
|
王怡栋
|
9be9451a12
|
Merge branch 'sprint/285_tsj' into 'sprint/285'
Sprint/285 tsj
See merge request easycorp/zentaopms!6898
|
2023-02-09 05:09:06 +00:00 |
|
|
caoyanyi
|
cb96d6b017
|
* Modify array defined.
|
2023-02-09 12:07:35 +08:00 |
|
|
tianshujie
|
bd95b1eb84
|
* Code for finish task #83733.
|
2023-02-09 11:54:01 +08:00 |
|
|
wangyuting2
|
01b2b381b2
|
* Fix bug #28865.
|
2023-02-09 11:20:25 +08:00 |
|
|
tianshujie
|
789a39a52c
|
* Example Modify the js jump logic.
|
2023-02-09 11:14:13 +08:00 |
|
|
胡方舟
|
234f954717
|
Merge branch 'bugfix/liwenrui/explode' into 'master'
* fix explode usages for php 5.3.
See merge request easycorp/zentaopms!6897
|
2023-02-09 03:11:33 +00:00 |
|
|
Wenrui LI
|
618b682169
|
* fix explode usages for php 5.3.
|
2023-02-09 11:10:04 +08:00 |
|
|
tianshujie
|
0e9b56e492
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:57:42 +08:00 |
|
|
tianshujie
|
cdcfb74022
|
Merge branch 'sprint/285_tsj' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj
|
2023-02-09 10:57:22 +08:00 |
|
|
王怡栋
|
a3ba63db67
|
Merge branch 'daitingting_bug_#30843' into 'master'
* Fix bug #30843.
See merge request easycorp/zentaopms!6894
|
2023-02-09 02:56:43 +00:00 |
|
|
王怡栋
|
6f48c9f367
|
Merge branch 'sprint/cyy_83742' into 'sprint/285'
* Optimize page style.
See merge request easycorp/zentaopms!6893
|
2023-02-09 02:56:30 +00:00 |
|