Merge 88fda48201cdcf7517b699c341e7cbbae16631df into 498109addb6f2541082b88cb6ae115939321873c

Merge pull request #4310 from NginxProxyManager/dependabot/npm_and_yarn/docs/vite-5.4.14
Bump vite from 5.4.8 to 5.4.14 in /docs
2025-05-12 08:43:08 +00:00 · 2025-01-28 15:21:51 +01:00 · 2025-01-28 18:08:46 +10:00 · 2025-01-28 14:03:07 +10:00 · 2025-01-22 07:09:04 +00:00 · 2025-01-03 00:39:29 +01:00
3 changed files with 6 additions and 4 deletions
--- a/backend/internal/access-list.js
+++ b/backend/internal/access-list.js
@ -258,6 +258,7 @@ const internalAccessList = {
 					})
 					.where('access_list.is_deleted', 0)
 					.andWhere('access_list.id', data.id)
+					.groupBy('access_list.id')
 					.allowGraph('[owner,items,clients,proxy_hosts.[certificate,access_list.[clients,items]]]')
 					.first();

--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@ -1065,9 +1065,9 @@ vfile@^6.0.0:
    vfile-message "^4.0.0"

 vite@^5.4.8:
-  version "5.4.8"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
-  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
+  version "5.4.14"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
+  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
  dependencies:
    esbuild "^0.21.3"
    postcss "^8.4.43"
--- a/frontend/js/app/nginx/proxy/list/item.ejs
+++ b/frontend/js/app/nginx/proxy/list/item.ejs
@ -20,6 +20,7 @@
    </div>
    <div class="small text-muted">
        <%- i18n('str', 'created-on', {date: formatDbDate(created_on, 'Do MMMM YYYY')}) %>
+        (#<%- id %>)
    </div>
 </td>
 <td>
@ -57,4 +58,4 @@
        </div>
    </div>
 </td>
-<% } %>
+<% } %>
Author	SHA1	Message	Date
Mathieu Delestre	61d14f7871	Merge 88fda48201cdcf7517b699c341e7cbbae16631df into 498109addb6f2541082b88cb6ae115939321873c	2025-01-28 15:21:51 +01:00
jc21	498109addb	Merge pull request #4310 from NginxProxyManager/dependabot/npm_and_yarn/docs/vite-5.4.14 All checks were successful Close stale issues and PRs / stale (push) Successful in 3s Details Bump vite from 5.4.8 to 5.4.14 in /docs	2025-01-28 18:08:46 +10:00
jc21	3f3aacd7ec	Merge pull request #4274 from Dim145/develop [Postgres] fix error in access_list get	2025-01-28 14:03:07 +10:00
dependabot[bot]	bb4ecf812d	Bump vite from 5.4.8 to 5.4.14 in /docs Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.8 to 5.4.14. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.14/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.14/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-22 07:09:04 +00:00
dim145	f1c97c7c36	fix: add missing group_by clause for access_list get	2025-01-03 00:39:29 +01:00
Mathieu D	88fda48201	Merge pull request #1 from ldbglobe/ldbglobe-proxy-list-with-id-displayed Display proxy ID following the Creation date in proxy list	2024-03-29 15:16:42 +01:00
Mathieu D	5744a3a7ed	Display proxy ID following the Creation date in proxy list Whenever you need to consult logs or manually modify a configuration on the server, the ID is a key element. Of course, it's possible to find information in the files, but having this information prominently displayed in the list would be a real plus.	2024-03-29 15:14:01 +01:00