3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 01:05:28 +00:00
Commit Graph

20276 Commits

Author SHA1 Message Date
4a481e79c4 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	public/css/build/app.css
#	public/css/build/app.css.map
#	public/css/build/overrides.css
#	public/css/build/overrides.css.map
#	public/css/dist/all.css
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
2025-10-27 11:14:05 +00:00
ee4abbcbaa Updated dev assets 2025-10-27 11:12:13 +00:00
dcc82d742f Fixed RB-20430 - 500 on LDAP if baseDN is not set 2025-10-27 11:09:24 +00:00
19cb2089d7 Merge pull request #18098 from grokability/dependabot/github_actions/develop/actions/upload-artifact-5
Bump actions/upload-artifact from 4 to 5
2025-10-27 10:47:59 +00:00
04923b06b0 Merge pull request #18078 from grokability/groups-ui-improvements
Groups UI improvements, ability to add users from the group edit screen
2025-10-27 10:47:11 +00:00
e16755d491 Bump actions/upload-artifact from 4 to 5
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 08:19:26 +00:00
742b0769a4 Use translation string 2025-10-26 12:10:08 +00:00
df68dca9dc Warn if user has individual permission overrides 2025-10-25 18:57:17 +01:00
4a5bf78d58 Merge branch 'develop' into groups-ui-improvements 2025-10-25 18:31:22 +01:00
7947237489 Double check the admin status when toggling the superadmin 2025-10-25 18:29:52 +01:00
1115205164 Normalize the JS 2025-10-25 18:20:22 +01:00
d5d01136c4 Fixed js errors 2025-10-25 17:57:59 +01:00
3d47277614 Added cursor style 2025-10-25 17:57:44 +01:00
b937bea04f Working, but there’s a bit of a jitter I need to fix 2025-10-25 15:59:47 +01:00
fff14632bc Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	public/css/build/app.css
#	public/css/build/app.css.map
#	public/css/build/overrides.css
#	public/css/build/overrides.css.map
#	public/css/dist/all.css
#	public/mix-manifest.json
2025-10-25 14:59:31 +01:00
9bdf1a620f Built assets 2025-10-25 14:58:27 +01:00
60099aa989 FAFOing on disclosure arrows being remembered 2025-10-25 14:56:01 +01:00
f3976e5dd8 Merge pull request #18094 from Godmartinz/custom_field_color_fixx
Fixed fieldset colors on dark themes
2025-10-23 20:32:05 +01:00
d7d6893304 fix Custom Fields section header font color 2025-10-23 12:05:13 -07:00
7eb15fe04d Merge pull request #18091 from uberbrady/fix_backup_durations
Moved import time limit inside class, added new backup time limit
2025-10-23 18:51:35 +01:00
4b7a06761a Moved import time limit inside class, added new backup time limit 2025-10-23 16:05:09 +01:00
8f4a1f5801 Moved JS and styles into js and css files 2025-10-23 13:24:26 +01:00
891bec9cdb Styling fixes 2025-10-23 13:06:45 +01:00
be8193ebff Fixed inherit permissions 2025-10-22 15:00:04 +01:00
430ee46645 Small tweaks to inherit js 2025-10-22 13:41:59 +01:00
76fbbf29e8 Replace generate text with icon button 2025-10-22 13:37:45 +01:00
3108159d95 Jitter CSS tweaks 2025-10-22 12:37:39 +01:00
f282a1ead7 Removed duplicated permissions js code 2025-10-22 12:03:55 +01:00
324bc4957d Merge pull request #18080 from Godmartinz/add-null-safe-operator-to-manager
Fixes admin alerts when a location doesnt have a manager
2025-10-22 11:56:59 +01:00
c3b5c4dfae Moved the logic into the permissions partial, added translations 2025-10-21 22:10:09 +01:00
4ab5d97e86 add nullsafe operator to location manager 2025-10-21 14:06:08 -07:00
294ffb72a4 Translations!!! 2025-10-21 20:36:09 +01:00
8c534d29d3 WTF tower?? 2025-10-21 19:36:28 +01:00
d6cb262f9d Bumped version 2025-10-21 19:22:36 +01:00
5211e2ae20 Some UI refinement 2025-10-21 19:22:36 +01:00
90832fd1ad Checked check 2025-10-21 19:22:36 +01:00
889cbc69e1 Starter improvements - needs testing 2025-10-21 19:22:36 +01:00
15948370d4 Updated assets 2025-10-21 19:22:24 +01:00
63c5177b37 Merge pull request #18077 from Godmartinz/acceptance-notif-fixes-pt2
Adds admin to decline notification, fix asset and model name translations on asset notification
2025-10-21 18:31:28 +01:00
4fbfaf6b9f add admin to decline, fix asset and model name translations 2025-10-21 10:22:34 -07:00
0b9e13bf1e Merge remote-tracking branch 'origin/develop' 2025-10-21 12:58:06 +01:00
485d343e0f Merge pull request #18058 from uberbrady/ldap_fetch_dn_before_login_FIXED
FIXED - perform Ldap fetch for dn (Distinguished Name) before logging-in (fixed)
2025-10-21 12:56:31 +01:00
07f0e8a3be Merge pull request #18070 from Godmartinz/fix-admin-in-user-acceptance-notif
Fixes `admin` parameter acceptance notifications
2025-10-21 12:54:03 +01:00
cc5afb1cd8 Merge pull request #18074 from grokability/smaller-audit-image-fix
Fixed audit images not displaying inline
2025-10-21 12:51:20 +01:00
c69f1c0890 Smaller fix for missing audit images 2025-10-21 12:43:59 +01:00
a8733bdedf remove nullsafe operator 2025-10-20 11:01:38 -07:00
4222e4eb51 add nullsafe operator after admin 2025-10-20 11:00:59 -07:00
5db4441f5c fix admin param in user accepted notification 2025-10-20 10:51:24 -07:00
2bcfe97211 Merge remote-tracking branch 'origin/develop' 2025-10-20 16:03:55 +01:00
4e74c97c84 Merge pull request #18066 from smarsching/issue-18065
Fixed #18065: Ensure that private_key_bits is always an int
2025-10-20 13:51:42 +01:00