3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 15:55:31 +00:00
Commit Graph

20934 Commits

Author SHA1 Message Date
b935752ec0 reference endpoint appropriately" 2026-01-05 12:35:20 -08:00
2a60b7b7b2 move endpoint 2026-01-05 12:31:00 -08:00
cef78687b3 Merge remote-tracking branch 'origin/develop' 2026-01-05 20:27:37 +00:00
2f29edc01f Changed “reset to default” button to theme button style 2026-01-05 20:27:25 +00:00
134491b59e Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
2026-01-05 20:20:51 +00:00
812ff0bfd2 Bumped jspdf to >=4.0.0 2026-01-05 20:20:09 +00:00
201c4fa0d9 remove use path 2026-01-05 12:15:37 -08:00
ced83b9bfc add a try catch to ms teams audit notification 2026-01-05 12:14:42 -08:00
e67c5273d7 Merge remote-tracking branch 'origin/develop' 2026-01-05 17:22:50 +00:00
b4b9339065 Merge pull request #18396 from uberbrady/fix_select2_break_on_modal
Fixed #17652 - don't break company drop-down with modals
2026-01-05 17:22:29 +00:00
f3cd68eb3f Merge remote-tracking branch 'origin/develop' 2026-01-05 17:21:44 +00:00
ad57dea0e5 Suppress refresh button on client-side tables
Refresh only works on server-side tables
2026-01-05 17:21:32 +00:00
1e0a348b8e Merge remote-tracking branch 'origin/develop' 2026-01-05 17:19:56 +00:00
9c06a2126d Update sha.js to 2.4.12 2026-01-05 17:19:43 +00:00
dab030e95d Merge remote-tracking branch 'origin/develop' 2026-01-05 16:56:02 +00:00
4995bc0d0d Small tweaks to select2 values 2026-01-05 16:55:53 +00:00
d2369893c8 Remove ID from company select in partial 2026-01-05 16:30:47 +00:00
e48adf6443 Merge remote-tracking branch 'origin/develop' 2026-01-05 16:06:08 +00:00
505bca8386 Fixed :focus on theme buttons 2026-01-05 16:05:59 +00:00
31ca93a259 Merge remote-tracking branch 'origin/develop' 2026-01-05 15:40:59 +00:00
71523b7038 Merge pull request #18393 from grokability/#18291-bump-alpine
Attempted fix of #18291 - update PHP versions and alpine versions
2026-01-05 15:36:40 +00:00
9885dc9c8a Merge remote-tracking branch 'origin/develop' 2026-01-05 15:34:19 +00:00
00d9d9f132 Merge pull request #18395 from grokability/#18394-ldap-text-dark-mode
Fixed #18394 - LDAP sync test table background in dark mode
2026-01-05 15:34:00 +00:00
320dc3fac6 Fixed LDAP sync test table background in dark mode 2026-01-05 15:29:50 +00:00
6e68e43a25 In this version of Alpine, php84 is default, so it's easier. 2026-01-05 15:11:08 +00:00
a19c391aa1 Check can edit on demo in bulk user edit 2026-01-05 14:58:14 +00:00
32f0101c1b Attempted fix of #18291 - update PHP versions and alpine versions 2026-01-05 14:05:47 +00:00
12b9fdced5 Merge remote-tracking branch 'origin/develop' 2026-01-05 13:39:48 +00:00
0af45a53a9 Merge pull request #18359 from marcusmoore/17816-qty-in-activity-report
Fixed #17816 - added quantity to activity reports
2026-01-05 13:03:56 +00:00
37773d35f2 Merge pull request #18391 from ubc-cpsc/fix/PKSA-8x19-j2j3-bn67-sodium_compat
fix: paragonie/sodium_compat - Missing check that a point is on the prime subgroup for Edwards25519
2026-01-05 12:58:24 +00:00
fca3eb4b7b Merge pull request #18392 from grokability/#18377-min-value-for-name
Fixes #18377 - make min value for names consistent
2026-01-05 12:56:29 +00:00
5e9e0b70db Fixes #18377 - make min value for names consistent 2026-01-05 12:51:49 +00:00
5242ffc04b fix: Missing check that a point is on the prime subgroup for Edwards25519 2026-01-02 13:55:18 -08:00
f0c9a5b2dc Merge remote-tracking branch 'origin/develop' 2025-12-31 05:31:06 +00:00
b3902e82fc Merge pull request #18388 from dylang3/fix/unintended-shell-exec-call
Fixed #18384: Remove backticks in bulk-actions.blade.php to avoid unintentional shell_exec() call
2025-12-31 05:30:06 +00:00
d70eff6fc4 Fix: Remove backticks in bulk-actions.blade.php to avoid unintentional shell_exec() call 2025-12-30 22:37:49 -06:00
deb44cad30 Merge remote-tracking branch 'origin/develop' 2025-12-23 13:34:36 +00:00
35fdca3607 Added logo hover color 2025-12-23 13:33:53 +00:00
93080523d0 Merge remote-tracking branch 'origin/develop' 2025-12-21 08:34:42 +00:00
b7b8f5a7e7 Merge pull request #18348 from grokability/dependabot/github_actions/develop/actions/cache-5
Bump actions/cache from 4 to 5
2025-12-21 08:16:48 +00:00
59ee55a6b2 Merge pull request #18349 from grokability/dependabot/github_actions/develop/actions/upload-artifact-6
Bump actions/upload-artifact from 5 to 6
2025-12-21 08:16:29 +00:00
d85b25d683 Merge pull request #18363 from ubc-cpsc/task/request-get
fix: replace deprecated Symfony Request::get() usage
2025-12-21 08:09:50 +00:00
0108006fab Merge remote-tracking branch 'origin/develop' 2025-12-19 06:32:09 +00:00
755bb8f189 Merge pull request #18326 from dylang3/fix/users-groups-sync
Fixes #18325: Ensure existing permission group users are maintained when editing a group
2025-12-19 06:26:44 +00:00
0f215bbcf8 fix: replace deprecated Symfony Request::get() usage 2025-12-17 18:44:04 -08:00
9770775770 Merge remote-tracking branch 'origin/develop' 2025-12-17 16:27:42 +00:00
0b63bcc056 Derp. Copypasta 2025-12-17 16:25:03 +00:00
03116f5ece Fixed tests 2025-12-17 16:16:58 +00:00
5c091d8690 DIsable delete button if user cannot delete the user 2025-12-17 15:31:57 +00:00
da1ca24190 Remove avatar delete - should be done in purge 2025-12-17 15:29:07 +00:00