snipe
d49bfb562a
Merge branch 'develop' into testing/license-checkin
2024-12-19 22:29:31 +00:00
snipe
f90dd9d74d
Merge pull request #15976 from marcusmoore/testing/ui-render
...
Added simple front end render tests
2024-12-19 22:27:35 +00:00
snipe
8d24c0af0d
Merge pull request #15982 from spencerrlongg/bug/sc-27228
...
Update Checkout Button Permission for Predefined Kits
2024-12-19 22:25:51 +00:00
snipe
174a01cb6b
Merge pull request #15991 from snipe/added_some_sorting_on_audit_report
...
Added a few order options on audit report
2024-12-19 22:24:57 +00:00
snipe
360e0ff534
Added a few order options on audit report
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-19 22:19:33 +00:00
snipe
4f2721e93f
Merge pull request #15986 from Godmartinz/fix-settings-seeder
...
Renames variables to match columns for label settings
2024-12-19 19:06:28 +00:00
snipe
0dce3b8b8c
Merge pull request #15987 from spencerrlongg/bug/sc-27192
...
Add `string` to Password Reset Username Rules
2024-12-18 20:09:14 +00:00
spencerrlongg
5042c2b30a
oops, rm dump
2024-12-18 13:58:18 -06:00
spencerrlongg
b45cf6124f
add note
2024-12-18 13:57:18 -06:00
Godfrey M
c8f280ac90
change barcode column names in seeder
2024-12-18 09:50:55 -08:00
spencerrlongg
7eb936883a
rm note
2024-12-17 16:38:29 -06:00
spencerrlongg
eb054897d6
Remove leftover testing logic and fix checkout permissions
...
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
2024-12-17 16:06:10 -06:00
Marcus Moore
a53976967a
Use correct id
2024-12-17 10:31:35 -08:00
Marcus Moore
1be7508340
Add simple tests to ensure views render
2024-12-16 17:45:10 -08:00
Marcus Moore
af135fa42c
Add permissions property to group factory
2024-12-16 17:37:58 -08:00
Marcus Moore
7aa5195e87
Add tests for license checkin
2024-12-16 14:39:24 -08:00
snipe
04c3481734
Merge pull request #15973 from uberbrady/next_try_accessories_to_locations_rebased
...
Next try accessories to locations rebased
2024-12-16 20:25:25 +00:00
Brady Wetherington
582b462326
Removed inadvertently added files.
2024-12-16 16:55:54 +00:00
snipe
b233715796
Fixed property
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
b93fc80011
Fixed admin -> adminuser property
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
41a6b34768
Added new test
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
17a6a871ae
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
5fceef1dc3
Updated routes with new endpoints
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
9b04d2e51c
Updated route in view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
51b426f0b4
Added accessory transformer to assets transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
021c4f2598
Added assets endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
ac96b8d4ae
Added assignedAccessories method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
bc8719e336
Specify created_by in the API call as well
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
bd38d64e66
Removed create() method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
74b5d6d12b
Updated transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
ddd11939a5
No need to include assigned_to
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
3caa5f2042
Fixed user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
5226d507d4
Updated route
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
274b659905
Added new route
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
a0b9714d72
Updated user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
36aea52ae0
Fixed variable in test
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:34 +00:00
snipe
e0643cd744
Added currency and history icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:35:30 +00:00
snipe
27fab0f573
Use history icon
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:34:51 +00:00
snipe
183a4d49d8
Refactor of #15235 - added accessory checkout to locations, assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 16:34:49 +00:00
snipe
edacc4eb54
Merge pull request #15446 from Godmartinz/barcode_settings_hide
...
Refactored Barcode Settings into Label Settings
2024-12-16 16:09:34 +00:00
snipe
1e7d7a147b
Merge pull request #15972 from snipe/upgrade_fontawesome
...
Updated font awesome
2024-12-16 15:55:14 +00:00
snipe
8ee549efbf
Bumped font-awesome to 6.7.0
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-16 15:51:23 +00:00
Marcus Moore
699476da90
Scaffold and implement some license checkin tests
2024-12-12 17:33:34 -08:00
Godfrey M
833af55806
Merge branch 'develop' into barcode_settings_hide
2024-12-12 12:05:29 -08:00
snipe
d1246c65bd
Merge pull request #15963 from snipe/localization/updated_strings_2024-12-12
2024-12-12 19:24:09 +00:00
snipe
38db890660
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-12 19:22:56 +00:00
snipe
01c18f6303
Merge pull request #15962 from snipe/fixes_rb-18772
2024-12-12 17:40:40 +00:00
snipe
c5e2aed164
Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-12 17:37:08 +00:00
snipe
4d1d2fedb7
Merge pull request #15960 from uberbrady/improve_restore_cleaner_utf8
2024-12-12 17:05:10 +00:00
snipe
ab6363a124
Merge pull request #15959 from snipe/remove_settings_api_endpoints
2024-12-12 16:53:15 +00:00
