 liumengyi
|
f643f3bd93
|
* Fix bug #32945.
|
2023-03-15 08:44:01 +00:00 |
|
|
liumengyi
|
637b0912a7
|
* Finish task #87013.
|
2023-03-13 07:07:13 +00: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
|
bec24aafa9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 11:52:44 +08:00 |
|
|
liumengyi
|
57c46206e9
|
* Fix bug #32525.
|
2023-03-01 03:01:40 +00:00 |
|
|
wangyidong
|
01bb8130dd
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 08:50:31 +08:00 |
|
|
wangyidong
|
1a352410a6
|
* code for task #85503.
|
2023-03-01 08:49:44 +08:00 |
|
|
caoyanyi
|
0eb7b70d48
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 17:07:32 +08:00 |
|
|
tianshujie
|
f0ff736880
|
* Code for fix bug #32473.
|
2023-02-28 13:55:12 +08:00 |
|
|
caoyanyi
|
ac2891ac41
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 13:53:09 +08:00 |
|
|
tianshujie
|
c82f1a02a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui
|
2023-02-28 13:13:13 +08:00 |
|
|
caoyanyi
|
ef0c77d611
|
* Modify tutorial tip.
|
2023-02-28 12:28:15 +08:00 |
|
|
tianshujie
|
f6a573a51f
|
* Code for fix bug #32458.
|
2023-02-28 10:32:13 +08:00 |
|
|
tianshujie
|
5fe4075ef1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-28 08:26:03 +08:00 |
|
|
wangyidong
|
11507ffff2
|
* fix bug #32277.
|
2023-02-27 16:16:04 +08:00 |
|
|
caoyanyi
|
f2441f7197
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-27 15:28:14 +08:00 |
|
|
liumengyi
|
4912b2004e
|
* Finish task #85630.
|
2023-02-27 06:54:39 +00:00 |
|
|
liumengyi
|
a23d205435
|
* Modify menu name.
|
2023-02-27 06:24:08 +00:00 |
|
|
caoyanyi
|
2f3aae9281
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 16:05:42 +08:00 |
|
|
tianshujie
|
a11b0a52a2
|
* Modify menu order for admin module.
|
2023-02-23 13:38:52 +08:00 |
|
|
caoyanyi
|
6caaf4c316
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 08:32:25 +08:00 |
|
|
tianshujie
|
12cdb2f6d7
|
* Modify menu param.
|
2023-02-22 16:11:21 +08:00 |
|
|
caoyanyi
|
7c257b5e1e
|
* Code for issue #762.
|
2023-02-22 15:16:48 +08:00 |
|
|
caoyanyi
|
7df9719cf3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-22 08:24:22 +08:00 |
|
|
tianshujie
|
8d2abc483d
|
* Fixed print navigation issues.
|
2023-02-21 16:14:27 +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 |
|
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
|
tianshujie
|
71c60b8332
|
* Code for finish task #85047.
|
2023-02-21 09:30:09 +08:00 |
|
|
liumengyi
|
95e3978fb0
|
* Finish task #85038, #85039.
|
2023-02-21 01:05:24 +00:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
caoyanyi
|
b0aef0569a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-20 08:13:40 +08:00 |
|
|
tianshujie
|
cb3a0faa9c
|
* Added mandatory execution items config.
|
2023-02-17 14:02:01 +08:00 |
|
|
caoyanyi
|
fc6d8cd821
|
* Remove lite mode nav menu.
|
2023-02-17 10:21:10 +08:00 |
|
|
tianshujie
|
d657ae898a
|
* Restore.
|
2023-02-16 15:50:31 +08:00 |
|
|
tianshujie
|
9b4772b07d
|
* Fix bug #32215.
|
2023-02-16 15:44:35 +08:00 |
|
|
wangyidong
|
f90041ca48
|
* code for task #83736.
|
2023-02-14 15:55:20 +08:00 |
|
|
tianshujie
|
483608b3f7
|
* Fixed incorrect order of tertiary navigation links.
|
2023-02-14 14:31:29 +08:00 |
|
|
wangyidong
|
6b0a919b6f
|
* code for task #83737.
|
2023-02-13 15:23:46 +08:00 |
|
|
tianshujie
|
da0ebacef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-13 08:27:05 +08:00 |
|
|
wangyidong
|
ff66b39a2a
|
* code for task #83736.
|
2023-02-10 17:37:50 +08:00 |
|
|
tianshujie
|
0e76cbe2d0
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation
|
2023-02-10 10:55:21 +08:00 |
|
|
wangyidong
|
cb153273d0
|
* adjust for admin set menu.
|
2023-02-10 10:00:37 +08:00 |
|
|
tianshujie
|
f49368e220
|
* Add links to navigation.
|
2023-02-10 09:29:00 +08:00 |
|
|
wangyidong
|
1ff0629556
|
* adjust for admin index page.
|
2023-02-09 16:29:00 +08:00 |
|
|
tianshujie
|
9506850831
|
* Modify the parameters of the database navigation link.
|
2023-02-09 14:50:18 +08:00 |
|
|
tianshujie
|
173b9ad1d2
|
* Modify the style of the secondary development page.
|
2023-02-09 14:43:06 +08:00 |
|
|
tianshujie
|
bd95b1eb84
|
* Code for finish task #83733.
|
2023-02-09 11:54:01 +08:00 |
|
|
tianshujie
|
9769b60fe7
|
* The open,biz version removes the document template block.
|
2023-02-09 09:25:39 +08:00 |
|
|
tianshujie
|
aeea82dae9
|
* Code for finish task #83724.
|
2023-02-08 14:46:13 +08:00 |
|