3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-30 04:14:17 +00:00
Commit Graph

20279 Commits

Author SHA1 Message Date
ab4fbf6c19 Merge pull request #18105 from grokability/ldap-fast-find-and-bind
Possible fix for 504 gateway timeout on unreachable LDAP server
2025-10-28 02:09:41 +00:00
728afa8361 Possible fix for 504 gateway timeout on unreachable LDAP server 2025-10-27 23:45:12 +00:00
6703448b80 Merge pull request #18102 from marcusmoore/fixes/rb-20434-undefined-permissions-variable
Fixed issue when viewing user that does not have permissions set
2025-10-27 19:31:54 +00:00
776ba19a1f Define default permissions array 2025-10-27 12:28:55 -07:00
32a2eed5ec Fixed #18075 - make require_serial boolean in API transformer 2025-10-27 13:19:37 +00:00
5697054e98 Merge pull request #18099 from grokability/fix-cjk-for-acceptance-translated-strings
Fixed #18097 - check for CJK in field labels as well as content
2025-10-27 12:41:59 +00:00
def5969e1c Fixed #18097 - check for CJK in field labels as well as content 2025-10-27 12:34:30 +00:00
6d76e7b2d4 Added dumb pverride for reports :( 2025-10-27 12:21:16 +00:00
f052c8b44c Merge pull request #18076 from uberbrady/move_traits_into_directories
Moved Traits into its directory and modify the FCO's to point to them
2025-10-27 11:43:31 +00:00
06eab5f8a4 Merge pull request #18093 from Godmartinz/fix-warranty-part-of-expiring-asset-query
Fixed expiring warranties not being included in the expiring alerts notification
2025-10-27 11:41:51 +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
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
99549ce805 rewrite query for expired warranties on assets, concat queries" 2025-10-23 11:01:51 -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
e2019a13ab rewrite expired assets collection query 2025-10-23 10:49:58 -07: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
c5252ea583 skip in one more spot 2025-10-22 12:23:14 -07:00
82d553c180 skip test if sqllite 2025-10-22 12:19:13 -07:00
71e34355b9 remove unwanted changes 2025-10-22 11:51:00 -07:00
2bad8c72e4 fixes warranty part of expiring alerts query 2025-10-22 11:43:54 -07:00
6134ca01ac Merge remote-tracking branch 'origin/develop' into develop 2025-10-22 10:48:05 -07: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
b4696ef11e added alert_email to send conditional in listener 2025-10-21 13:11:21 -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