Marcus Moore
|
8a06f4ad82
|
Improve label
|
2024-10-23 15:21:02 -07:00 |
|
Marcus Moore
|
a20e03fce9
|
Merge branch 'develop' into saving_custom_report_template
|
2024-10-21 17:13:15 -07:00 |
|
akemidx
|
5cb940c2ee
|
Merge branch 'refs/heads/upstream/dev' into feature/sc-26415
|
2024-10-16 18:32:36 -04:00 |
|
Brady Wetherington
|
6b7af802af
|
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
|
2024-10-16 22:02:45 +01:00 |
|
Marcus Moore
|
5306e1cd15
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/reports/custom.blade.php
|
2024-10-15 12:32:01 -07:00 |
|
snipe
|
4361a10818
|
Added string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-09 22:15:30 +01:00 |
|
akemidx
|
f45b836010
|
backend form validation. +cleanup
|
2024-10-02 18:15:53 -04:00 |
|
akemidx
|
700647c53f
|
setting created
|
2024-10-02 18:15:52 -04:00 |
|
Godfrey M
|
44447b85c9
|
Merge branch 'develop' into barcode_settings_hide
|
2024-09-26 11:27:05 -07:00 |
|
Brady Wetherington
|
b6340532d7
|
Improve the error and success messages and linking
|
2024-09-24 17:15:39 +01:00 |
|
Brady Wetherington
|
c71411465a
|
First pass at better-handling those annoying Rollbars we keep getting
|
2024-09-24 15:17:35 +01:00 |
|
snipe
|
836893cba5
|
Added id to report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 18:35:00 +01:00 |
|
Godfrey M
|
bbb9babf27
|
one more finger
|
2024-09-17 16:40:18 -07:00 |
|
Godfrey M
|
e5daf35f65
|
fat finger fix
|
2024-09-17 16:39:55 -07:00 |
|
Godfrey M
|
87c72953b2
|
udpated translation
|
2024-09-17 16:37:17 -07:00 |
|
Marcus Moore
|
8bba11e1bb
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# app/Http/Controllers/ReportsController.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/status-select.blade.php
# resources/views/reports/custom.blade.php
|
2024-09-17 15:26:35 -07:00 |
|
snipe
|
9e957baeb5
|
Fixed check for outside assets on user update validation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-17 15:46:45 +01:00 |
|
snipe
|
98323185de
|
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-11 16:43:33 +01:00 |
|
snipe
|
b64ed254e0
|
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 13:49:09 +01:00 |
|
snipe
|
c197644ba7
|
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
|
2024-08-29 11:38:15 +01:00 |
|
snipe
|
5581950fee
|
Corrected language string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:17:17 +01:00 |
|
snipe
|
ec0b9b198f
|
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
|
2024-08-22 12:43:07 +01:00 |
|
snipe
|
64bed01a91
|
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
|
2024-08-20 10:13:43 +01:00 |
|
Marcus Moore
|
fa765667f2
|
Merge branch 'develop' into livewire-importer-improvements
|
2024-08-19 14:41:58 -07:00 |
|
snipe
|
34cd4b6244
|
Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 14:15:36 +01:00 |
|
snipe
|
229d8b9bf5
|
Added location restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:19:59 +01:00 |
|
snipe
|
856c57cb12
|
Corrected some translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 12:39:59 +01:00 |
|
snipe
|
de29c1d8a0
|
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days
Added #15312: Add checkin due in days setting
|
2024-08-16 10:21:36 +01:00 |
|
Marcus Moore
|
94d8a547b8
|
Merge branch 'develop' into livewire-importer-improvements
|
2024-08-15 13:47:49 -07:00 |
|
snipe
|
dd458dfa7f
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 12:21:06 +01:00 |
|
snipe
|
b917489f00
|
Corrected string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 12:10:41 +01:00 |
|
Glukose1
|
d8df52cc8f
|
Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field.
|
2024-08-15 12:20:51 +02:00 |
|
Brady Wetherington
|
cc5ad456e6
|
Expose the 'sanitize' system for backup restores to the web GUI
|
2024-08-14 15:59:21 +01:00 |
|
spencerrlongg
|
120cfd13c5
|
translation
|
2024-08-13 14:07:40 -05:00 |
|
Marcus Moore
|
6521c02526
|
Merge branch 'develop' into livewire-importer-improvements
# Conflicts:
# resources/views/livewire/importer.blade.php
|
2024-08-07 15:20:39 -07:00 |
|
Godfrey M
|
46a6a84ecb
|
adds migration and translations
|
2024-08-06 11:07:39 -07:00 |
|
snipe
|
aab29fbb6b
|
Use translated string for restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 16:47:40 +01:00 |
|
snipe
|
c08bd8f88b
|
Nicer consumables layout
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:11:45 +01:00 |
|
snipe
|
c4e7448d31
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 07:25:56 +01:00 |
|
snipe
|
be17ef4047
|
Added option to restore from default demo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 05:55:06 +01:00 |
|
snipe
|
e328dec9f9
|
Merge branch 'develop' into localizations/more_strings
|
2024-07-18 18:51:17 +01:00 |
|
snipe
|
0ef58a9aef
|
Added translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 03:48:42 +01:00 |
|
Marcus Moore
|
81bffccf01
|
Use better error message
|
2024-07-17 16:28:26 -07:00 |
|
snipe
|
a3b2912e89
|
Updated string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:16:23 +01:00 |
|
snipe
|
7f412ec3f5
|
Missing string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:14:41 +01:00 |
|
snipe
|
94e881e5f0
|
Cleared up language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:11:03 +01:00 |
|
snipe
|
70d95877d8
|
Translations for license checkout errors
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:02:58 +01:00 |
|
snipe
|
4895023f3b
|
Translate import button
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:56:02 +01:00 |
|
snipe
|
45bf428092
|
Translated “seat” for license seat view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:04:51 +01:00 |
|
snipe
|
04f723327e
|
Fixed translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:01:23 +01:00 |
|