 liwenrui
|
4dd127c4a0
|
* merge current 18.x into ai.
|
2023-08-16 10:28:06 +08:00 |
|
|
liwenrui
|
77704cd880
|
* redirect to most relevant ai admin page.
|
2023-08-03 10:30:35 +08:00 |
|
|
liwenrui
|
cf3a11e10c
|
* tweak ai lang, task #99298,99299,99300.
|
2023-08-01 10:16:57 +08:00 |
|
|
chaideqing
|
9638143ce6
|
* Fix bug#36705.
|
2023-07-26 02:10:39 +00:00 |
|
|
chaideqing
|
defddd328e
|
* Fix bug#36705.
|
2023-07-26 02:02:45 +00:00 |
|
|
liwenrui
|
3678742833
|
+ prompt edit, task #98732.
|
2023-07-24 19:29:32 +08:00 |
|
|
liwenrui
|
9d792c0297
|
* remove conversations menu for now.
|
2023-07-18 17:30:25 +08:00 |
|
|
liwenrui
|
ca415c9113
|
* fix prompt details menu.
|
2023-07-18 11:02:58 +08:00 |
|
|
tanghucheng
|
3741c9b6fa
|
Merge branch '18.x' into zentaoipd
|
2023-07-03 13:36:29 +08:00 |
|
|
tanghucheng
|
e52023791a
|
* Fix bug #36036.
|
2023-06-21 13:35:55 +08:00 |
|
|
liwenrui
|
f9da95803b
|
+ dummy pages for prompt creation process, and navigate to role assign on create.
|
2023-06-15 16:17:48 +08:00 |
|
|
Lufei
|
76307011c6
|
* Change fail to ignore for ajaxSetZentaoData.
|
2023-06-07 16:46:10 +08:00 |
|
|
liwenrui
|
18e0feb9bd
|
* fix header menu of editModel.
|
2023-06-06 14:51:58 +08:00 |
|
|
hufangzhou
|
d9c6d455a3
|
* Fix bug #35773.
|
2023-06-06 13:54:13 +08:00 |
|
|
liwenrui
|
3d8cf850cb
|
* tweak admin menu printing, use link properly even if there are subMenu items.
|
2023-06-06 10:36:16 +08:00 |
|
|
chaideqing
|
f3ee36f392
|
* Fix content may be empty.
|
2023-06-06 09:53:40 +08:00 |
|
|
liwenrui
|
1e66104b8e
|
+ menu group for ai in admin module, task #94373.
|
2023-06-05 16:33:54 +08:00 |
|
|
liwenrui
|
365d7ba2fd
|
+ add AI to admin index dashboard, task #94372, 94373, 94374.
|
2023-06-05 15:37:31 +08:00 |
|
|
Lufei
|
02969e979b
|
* Optimize isIntranet.
|
2023-05-25 17:45:18 +08:00 |
|
|
Lufei
|
e8995faf85
|
* Fix bug #35387, Optimize ajaxSetZentaoData.
|
2023-05-24 16:10:28 +08:00 |
|
|
Yagami
|
434aed0830
|
Merge branch '18.4' into zentaoipd
|
2023-05-19 14:47:42 +08:00 |
|
|
Lufei
|
bb9059d339
|
* Fix patchURL error.
|
2023-05-18 15:00:50 +08:00 |
|
|
Yagami
|
5935f603f4
|
* Change judgment condition.
|
2023-05-04 18:57:45 +08:00 |
|
|
wangyidong
|
88fa8fc839
|
* fix bug #34750.
|
2023-04-24 18:56:38 +08:00 |
|
|
Lufei
|
99f7f62456
|
* Fix notice switch error in admin safe page.
|
2023-04-23 15:51:35 +08:00 |
|
|
liumengyi
|
d971d4b4b7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 08:38:14 +08:00 |
|
|
朱金勇
|
79fc91885c
|
* Hide backup menu if using dmdb.
|
2023-04-17 09:39:28 +00:00 |
|
|
hufangzhou
|
0e8f7d807c
|
Merge branch 'master' into zentaopms_304
|
2023-04-17 08:30:02 +08:00 |
|
|
朱金勇
|
7969effc29
|
* Fix bug#34139, 34238, 34075.
|
2023-04-16 13:54:16 +00:00 |
|
|
liumengyi
|
43c8fd2a6b
|
* Rename the privilege of admin-safe.
|
2023-04-14 10:53:38 +08:00 |
|
|
liumengyi
|
268c7f3271
|
+ Revert the privilege of admin-sso.
|
2023-04-13 15:53:59 +08:00 |
|
|
liumengyi
|
ae3d710996
|
- Delete the privilege of admin-checkDB.
|
2023-04-13 15:37:18 +08:00 |
|
|
liumengyi
|
485ed73e6a
|
- Delete the privilege of admin-sso.
|
2023-04-13 15:35:06 +08:00 |
|
|
liugang
|
93e71f8861
|
* Call getDatabaseVersion instead of getMysqlVersion.
|
2023-04-06 02:05:02 +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
|
ec2e0276de
|
* Optimize api page style.
|
2023-04-03 17:11:27 +08:00 |
|
|
tianshujie
|
1cb2dc55d4
|
* Code for fix bug #33014.
|
2023-03-16 16:21:33 +08:00 |
|
|
caoyanyi
|
068b071db8
|
* Code for Bug #32994.
|
2023-03-16 11:29:36 +08:00 |
|
|
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 |
|
|
tianshujie
|
6e90ea6cab
|
* Fix bug 32749.
|
2023-03-13 09:51:18 +08:00 |
|
|
tianshujie
|
a0a895be03
|
* Fix bug 32749.
|
2023-03-10 10:23:23 +08:00 |
|
|
tianshujie
|
6c4eb8b8c3
|
* Changed the default jump link of the personnel management block.
|
2023-03-09 14:56:17 +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 |
|
|
王怡栋
|
179d3998f2
|
Merge branch 'dev/gfl_views_refacotrs_admin' into 'master'
* Adjust code in admin.
See merge request easycorp/zentaopms!7133
|
2023-03-02 09:08:27 +00:00 |
|
|
王怡栋
|
2534dd97e4
|
Merge branch 'admin_bug_32593' into 'master'
Admin bug 32593
See merge request easycorp/zentaopms!7134
|
2023-03-02 09:08:12 +00:00 |
|
|
caoyanyi
|
58d9fd2ee9
|
* Fix bug #32593.
|
2023-03-02 17:04:44 +08:00 |
|