Commit Graph
797 Commits
Author SHA1 Message Date
tanghucheng c76efe3019 Merge remote-tracking branch 'origin/master' into Merge184 2023-11-22 19:50:16 -05:00
liugang 936716a1bf * admin: set item width based on current vision. 2023-11-23 08:48:05 +08:00
xieqiyu 7d0b67519a * Finish task#106487. 2023-11-22 15:58:23 +08:00
xieqiyu 33a1216301 * Finish task#106486. 2023-11-22 14:38:36 +08:00
xieqiyu 49fba16ce5 * Finish task#106485. 2023-11-22 14:27:12 +08:00
wangyidong 8c7bde772e * Revert it. 2023-11-22 13:48:24 +08:00
wangyidong bfd8107a73 * Add param type for admin method. 2023-11-22 13:46:21 +08:00
xieqiyu 84096b93f5 * Finish task#106483,#106484. 2023-11-22 13:38:29 +08:00
tanghucheng ba039087af Merge branch 'master' into Merge184 2023-11-21 22:10:54 -05:00
xieqiyu 9329d1c1dd * Finish task#106481,#106482. 2023-11-22 11:10:42 +08:00
tianshujie 2d2eb8c641 * Declare strict type. 2023-11-22 10:08:16 +08:00
xieqiyu 94e5877402 * Finish task#106480. 2023-11-22 09:57:57 +08:00
chaideqing a4d5438696 * Merge module-admin 18.4-18.8 to Merge184. 2023-11-22 09:41:29 +08:00
xieqiyu 78ad8f2053 * Finish task#106479. 2023-11-22 09:30:54 +08:00
tanghucheng 53fc15cb62 Merge branch 'master' into Merge184 2023-11-20 02:10:27 -05:00
caoyanyi 6fae5dafa6 * Sync devops menu anc priv. 2023-11-20 08:58:46 +08:00
caoyanyi 03e29c398a * Adjust devops menu display rule. 2023-11-16 17:18:06 +08:00
wangxuepeng f2529dae80 * Change to new writing method. 2023-11-16 16:15:29 +08:00
wangxuepeng a30cd3d2ce * Fixed the error when add task and back to execution story page. 2023-11-16 15:23:24 +08:00
chaideqing 6a56d10440 * Merge module-admin to Merge18.4. 2023-11-14 06:14:24 +00:00
liumengyi 342d4978e9 * Remove , at the end of row in the lastest children in admin. 2023-11-13 14:06:26 +08:00
chaideqing 43e9b78ad8 * Merge commit: 9638143ce6, Fix bug#36705. 2023-11-10 05:36:41 +00:00
chaideqing 4b538954d8 * Merge commit: defddd328e, Fix bug#36705. 2023-11-10 05:26:01 +00:00
tanghucheng b0515caf4a * Merge #5935f603f4,Change judgment condition. 2023-11-09 00:31:19 -05:00
chaideqing c382aafd9f * Merge commit: f3ee36f392. 2023-11-08 01:35:32 +00:00
caoyanyi c92a008d4e + Add disabled attribute for admin nav. 2023-11-08 08:42:13 +08:00
hufangzhou dcc3d05025 * Merge: Fix bug #35773, backend access timeout. 2023-11-07 11:01:50 +08:00
liumengyi b9c3a87209 * Fix bug of getting code. 2023-11-06 16:32:27 +08:00
liumengyi 9fc1e8244d * Hide register link when has been bound or ignored or has no network or doesn't have priv. 2023-11-06 16:28:46 +08:00
liumengyi 6d0462def8 * Fix bug #40223, the link has been set in adminModel::checkPrivMenu. 2023-11-06 15:09:39 +08:00
tianshujie c77c11ed15 * Fix bug #40222. 2023-11-06 14:41:34 +08:00
liumengyi b12097ea48 * Fix bug #40201, set link as url if the link doesn't have |. 2023-11-06 10:14:17 +08:00
Lufei 12a6d4e0e7 * Optimize isIntranet. 2023-11-03 09:02:13 +08:00
Lufei dd81913f86 * Fix bug #35387, Optimize ajaxSetZentaoData. 2023-11-03 08:53:34 +08:00
Lufei 4f6bfc8814 * Fix patchURL error. 2023-11-03 08:38:01 +08:00
liumengyi cbbddbc17d * Disable the switch and convert menu if current account is not admin in admin::index. 2023-11-02 15:19:51 +08:00
liumengyi 6dbe990602 * Set link params of setting items in admin::index. 2023-11-02 14:31:28 +08:00
daitingting ce00fb9710 * Adjust width.
* Format codes.
2023-11-02 01:02:54 +00:00
wangxuepeng e56b65b943 * Fixed the bug in admin safe page. 2023-10-31 10:24:55 +08:00
wangxuepeng fffec5ea0a * Close modal after setting admin log. 2023-10-30 15:17:05 +08:00
tianshujie 5b1cf812d3 - Remove unused attribute of the admin drop-menu. 2023-10-16 17:19:38 +08:00
liumengyi 238ecf9dd9 * Change return method in admin::log. 2023-10-16 14:15:16 +08:00
liugang 27f068d382 * admin: update app menu after toggle switch of modules. 2023-08-22 13:18:33 +08:00
zhaoke af6c94e0d3 * Finish task #99548. 2023-08-14 14:58:17 +08:00
zenggang b5f3131e60 * Adjust platform menu. 2023-08-09 01:10:46 +00:00
zenggang 81659235e4 * Fix bug#37095 2023-08-07 08:45:09 +00:00
zenggang 444f1815cf * Finish task#99544,99545,99546. Fix bug#37011,37012,37013,37031 2023-08-04 07:27:43 +00:00
wangyidong 483909e9bf * Add for dev db page. 2023-08-02 14:30:41 +08:00
wangyuting c26c8a2fe5 * Finish admin sso zin page. 2023-08-02 13:22:31 +08:00
zenggang 0d0ccc5790 * Add system,instance en language, fix import repo bug 2023-08-01 08:53:59 +00:00