ff3e69a56c
Merge remote-tracking branch 'origin/develop'
2025-06-23 20:51:24 +01:00
c1e7a78d23
Merge pull request #17284 from Godmartinz/fix-depreciation-choice-in-transformer
...
FIXED : #14869 changes the depreciation method selected for Assets index table
2025-06-23 20:49:25 +01:00
8894bb91cc
fix method choice in asset transformer for depreciations
2025-06-23 12:37:29 -07:00
c955126f01
Merge pull request #17283 from Godmartinz/multiclick_checkout_bug
...
Fixed #14077 : Disables checkout button after submitting
2025-06-23 20:30:38 +01:00
ce53b48d04
disable checkout button after submitting
2025-06-23 12:18:24 -07:00
6b975a5fb4
Merge remote-tracking branch 'origin/develop'
2025-06-23 16:41:42 +01:00
6015aeddee
Merge pull request #17209 from Godmartinz/saml_xml_update_bug
...
Fixed #17089 : SAML metadata now updating with new XML uploads
2025-06-23 16:40:35 +01:00
7b04e30964
Merge pull request #17280 from grokability/fixes/#7246-manager-id-in-import
...
Fixed #7246 - added manager employee/username number to importer
2025-06-23 16:07:14 +01:00
6794f5e783
Added logging for manager import
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-23 15:46:04 +01:00
6e41ceff39
Fixed parameter order
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-23 15:41:56 +01:00
7ab47ff0de
Fixed #7246 - added manager employee number to importer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-23 15:11:57 +01:00
3a02b15124
Merge remote-tracking branch 'origin/develop'
2025-06-23 12:38:40 +01:00
92d24d8702
Merge pull request #17277 from grokability/#17264-add-notes-to-bulk
...
Fixed #17264 : add notes to bulk asset edit
2025-06-23 12:36:50 +01:00
bcbfd46682
Update controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-23 12:32:33 +01:00
bfd96a695f
Add notes field and nulling checkbox
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-23 12:32:28 +01:00
f27e8534dc
Make sure $item exists
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-23 12:32:15 +01:00
040cd7ddbf
Updated string to use shorter version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 20:56:37 +01:00
5f73d81935
Merge remote-tracking branch 'origin/develop'
2025-06-22 20:14:59 +01:00
8d6b21a076
Merge pull request #17241 from spencerrlongg/bug/17239-possible-500-when-checking-in-license-assigned-to-a-soft-deleted-user
...
Fixed #17239 - Add `withTrashed` User Search On License Checkin
2025-06-22 20:14:03 +01:00
2d36b25017
Merge pull request #17258 from Robert-Azelis/patch-13
...
Company info - user print assets
2025-06-22 20:13:24 +01:00
002b5c0f6f
Merge remote-tracking branch 'origin/develop'
2025-06-22 20:07:52 +01:00
1f9e4306ae
Fixed #17261 - check for either old or new label engine QR
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 20:07:30 +01:00
8086842570
Merge remote-tracking branch 'origin/develop'
2025-06-22 19:42:03 +01:00
5242e0b36e
Merge pull request #17270 from grokability/fixes/#17249-order-by-location-in-maintenances
...
Fixed #17249 - sort by location in asset maintenances
2025-06-22 19:41:14 +01:00
e50505532e
Fixes #17249 - sort by location in asset maintenances
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:38:39 +01:00
51f2d5a664
Merge remote-tracking branch 'origin/develop'
2025-06-22 19:30:42 +01:00
f05ef18d55
Merge pull request #17269 from grokability/fixes/#17256-user-eula-view
...
Fixed #17256 : fixed permissions for non-super-admins to view their own EULAs
2025-06-22 19:29:41 +01:00
f6eccd7277
Added profile routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:25:30 +01:00
4d1258c64b
Fixed downloadformatter
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:25:17 +01:00
103cbfd038
Use profile eula API view
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:25:05 +01:00
47069ad3f4
Added stored eula method on profile
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:24:45 +01:00
317f620992
Added profile controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:24:19 +01:00
8f43694582
Added eula download with user check in profile controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:24:06 +01:00
df30076ffd
Update gate for user
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:23:50 +01:00
f81750617e
Fixed mismatched html header tag
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 17:30:13 +01:00
e4534c4319
Company info - user print assets
2025-06-20 10:33:09 +02:00
d6c09aae6b
Updated paveit command to delete by user_id instead of ID
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-18 21:15:04 +01:00
d3d5230d0c
add with trashed to user search
2025-06-17 19:15:13 -05:00
8199cd2118
comment merge methods for now
2025-06-17 10:59:57 -07:00
b74b76de75
Merge remote-tracking branch 'origin/develop'
2025-06-17 18:17:10 +01:00
9f02b80cf1
Merge pull request #17233 from grokability/fixes-#17232-duplicate-expected-checkin-field
...
Fixed #17232 - removed duplicate expected_checkin field on asset edit/create
2025-06-17 18:14:36 +01:00
d3e4e81168
Fixed #17232 - removed duplicate expected_checkin field
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-17 18:08:21 +01:00
a1b1498106
Merge remote-tracking branch 'origin/develop'
2025-06-17 17:51:37 +01:00
38195c0a8f
Merge pull request #17225 from grokability/fixes-ui-issues-in-manager-view
...
Fixes #17227 and #17228 - UI issues in manager view
2025-06-17 17:28:52 +01:00
5fa11e4278
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-17 16:57:26 +01:00
c39b52fcb5
Move select list closer to the table, removed awkward icon
...
This makes the view more consistent with the normal layout and removes the CSRF that was being passed in the GET on the form.submit
Signed-off-by: snipe <snipe@snipe.net >
2025-06-17 16:57:17 +01:00
ec65fc1e65
Move manager view option to misc section
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-17 16:56:56 +01:00
32d8646d96
Add @lukaskraic as a contributor
2025-06-17 16:26:17 +01:00
e8835fc2b1
Merge pull request #17096 from lukaskraic/feature/manager-view-v2
...
Manager View Feature
2025-06-17 16:24:40 +01:00
1158851ea7
Merge remote-tracking branch 'origin/develop'
2025-06-17 15:57:12 +01:00
snipe