NebelKreis
52e4414bc5
Feature: Added asset ID option to 2D barcode in label generation
2024-11-05 13:41:34 +01:00
NebelKreis
f96b7c5056
Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations
2024-11-05 13:40:33 +01:00
akemidx
82c38a8b18
or statement for if/else
2024-11-04 20:43:18 -05:00
akemidx
2f5e468b3c
this fixes the assigned to piece
2024-11-04 19:48:34 -05:00
Marcus Moore
e7cb4a75eb
Show accessory checkout id in user accessory table
2024-11-04 15:56:53 -08:00
Godfrey M
0d707a1851
fixes notifications for licenses and asset to asset checkouables
2024-11-04 15:13:10 -08:00
Marcus Moore
4daa8e7c63
Indenting
2024-11-04 12:49:44 -08:00
Marcus Moore
41f25341fd
Populate select with selected template
2024-11-04 12:32:05 -08:00
Godfrey M
de77eda33d
another line indent
2024-10-31 14:38:32 -07:00
Godfrey M
ee58fcc898
moved lines in for labels
2024-10-31 14:37:08 -07:00
akemidx
f10807661d
fixing bulk delete table
2024-10-30 19:26:52 -04:00
Godfrey M
d6ba303f39
Merge branch 'develop' into refacto_ms_teams_notifs
...
# Conflicts:
# app/Listeners/CheckoutableListener.php
2024-10-30 10:27:45 -07:00
snipe
f68df1fa06
Made type searchable in action logs
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-10-30 13:21:13 +00:00
snipe
f0813e03bf
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
...
Separated Notifications and Emails: Check ins and Check outs
2024-10-30 12:18:41 +00:00
Marcus Moore
702edf7908
Remove x from select dropdown
2024-10-29 15:34:00 -07:00
Marcus Moore
45e98e0282
Merge branch 'develop' into saving_custom_report_template
2024-10-29 15:20:52 -07:00
Marcus Moore
b97c54a54b
Improve handling of old data for text inputs
2024-10-29 11:25:54 -07:00
NebelKreis
e22296fd79
Feature: Added serial number option to 2D barcode in label generation
2024-10-29 13:49:05 +01:00
NebelKreis
6c17d7d732
Fix: Corrected path in translation function
...
Updated the translation function to use the correct path, ensuring that instead of displaying the translation path as plain text, the appropriate translation is now shown as intended.
2024-10-29 11:45:29 +01:00
Godfrey M
c0620c27ff
adds back laravels channel formats
2024-10-28 14:30:34 -07:00
Godfrey M
ed81973fe6
adds notifications for deprecation
2024-10-28 13:57:42 -07:00
Marcus Moore
54dec8d30d
Add translations
2024-10-28 12:56:42 -07:00
NebelKreis
6f3fb47e4a
Feature: Added asset tag option to barcode in label generation
2024-10-28 15:39:04 +01:00
snipe
589f9cccdf
Fixed #15732
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 12:04:10 +00:00
snipe
4d848e45e6
Fixed #15736
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 11:55:24 +00:00
akemidx
b29a2a6ae4
removing header color from login button
2024-10-24 17:23:03 -04:00
Marcus Moore
e390a95bd3
Improve back button behavior
2024-10-23 15:42:09 -07:00
Marcus Moore
2fcc7e1188
Make template name required
2024-10-23 15:24:58 -07:00
Marcus Moore
8a06f4ad82
Improve label
2024-10-23 15:21:02 -07:00
Godfrey M
f29a383179
Merge branch 'develop' into seperating_notification_n_mail
...
# Conflicts:
# app/Notifications/CheckoutConsumableNotification.php
2024-10-23 15:15:14 -07:00
Godfrey M
c681946b1d
added component markdown changes
2024-10-23 15:05:39 -07:00
Marcus Moore
853e14f369
Fix width
2024-10-23 13:24:06 -07:00
Marcus Moore
c1aa33862d
Add error message for eol start and end fields
2024-10-23 13:22:21 -07:00
Marcus Moore
30dc5fa0cf
Allow retrieving eol start and end dates
2024-10-23 13:21:44 -07:00
Marcus Moore
94e168fa15
Fix label
2024-10-23 13:17:20 -07:00
snipe
55ba6279a4
Use trans_choice on alert menu
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 19:14:17 +01:00
snipe
3ee76be7e3
Added manufacturer and model_number to components
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 17:50:22 +01:00
snipe
0b6859c491
Added ability to checkout consumables in variable qty
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 15:05:35 +01:00
Marcus Moore
d953519db6
Merge branch 'develop' into saving_custom_report_template
2024-10-22 15:11:18 -07:00
snipe
37f14fff3b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 22:07:28 +01:00
snipe
eb6c51fabd
Fixes #15701 - load avif files properly in lightbox
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 22:04:57 +01:00
snipe
5e1d792bba
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
...
Fixed #15686 : Corrected capitalization for dashboard section titles by removing strtolower()
2024-10-22 16:52:28 +01:00
snipe
db81701621
Merge branch 'develop' into better_handle_inline_files
2024-10-22 15:44:24 +01:00
snipe
a05c33febf
Squashed commit of the following:
...
commit 147fcfb8eb
Merge: 58a3d09b5
fdcc17ca2
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f
Merge: 30a06a594
867fa2f36
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a5942
Merge: 6c6af78e0
ce3086317
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e08
Merge: 9b06bbb6c
3f79fd7ea
Author: snipe <snipe@snipe.net>
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c3
Merge: 46ad1d072
d7f70146f
Author: snipe <snipe@snipe.net>
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit 46ad1d072f
Merge: bcb4bd9eb
3cf746d7d
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4
Merge: 250037540
f50ccbcc4
Author: snipe <snipe@snipe.net>
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d
the user model uses CompanyableTrait so remove this clearly outdated comment
commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 15:43:19 +01:00
Marcus Moore
a20e03fce9
Merge branch 'develop' into saving_custom_report_template
2024-10-21 17:13:15 -07:00
Marcus Moore
d7f70146f4
Remove extra icon in accessory file upload list
2024-10-21 13:48:25 -07:00
snipe
6105323877
Use plural class name for src
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-21 14:11:20 +01:00
Godfrey M
285d6897cf
added a coulple test adjustments and moved mail send logic to listener
2024-10-17 12:05:36 -07:00
snipe
d1149730be
Apply blade component to files views
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 16:31:17 +01:00
NebelKreis
780ed91a10
Fix: Removed strtolower() from dashboard titles
...
This fix ensures the correct capitalization in different languages.
2024-10-17 16:09:25 +02:00
Godfrey M
a7754c1a7f
fixed asset checkout markdown, and notifiable variable
2024-10-16 16:46:52 -07:00
snipe
0e9b3c9119
Check for existence before trying to get the icon
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 00:27:39 +01:00
snipe
d67addc69e
Removed filetype column - it’s dumb
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 00:21:43 +01:00
snipe
017884f843
Added checks and filetype display
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-17 00:09:09 +01:00
Godfrey M
02bda3cd95
adds Checkout Consumable mailable and slackwebhook channel to notifs
2024-10-16 15:53:05 -07:00
Godfrey M
02ff646da4
adds checkin license mailable
2024-10-16 15:44:45 -07:00
Godfrey M
2584d60344
adds Licenses seat checkout Mailable
2024-10-16 15:38:49 -07:00
akemidx
5cb940c2ee
Merge branch 'refs/heads/upstream/dev' into feature/sc-26415
2024-10-16 18:32:36 -04:00
Godfrey M
f1d83a3f28
forgot to add asset checkout markdown to projet
2024-10-16 15:30:53 -07:00
Godfrey M
dcdf600b78
adds Checkin and Checkout mailables and listner logic
2024-10-16 15:27:34 -07:00
Brady Wetherington
3cf746d7df
Rework the bulk checkout to not change how all checkouts work
2024-10-16 23:13:32 +01: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
Godfrey M
9710436d54
adds Mailables for asset checkin and out
2024-10-16 13:12:07 -07:00
Godfrey M
3ab2521cb0
email comes through, no picture and html markup appear though.
2024-10-16 12:21:33 -07: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
e9225ff3ea
Switch to regular HTML for input form field
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-15 12:43:10 +01:00
snipe
feaa714304
Nicer disabled button
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-11 14:23:57 +01:00
snipe
8aa298f6b0
Merge pull request #15644 from snipe/form_requests_for_settings
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Form requests for settings
2024-10-10 12:30:53 +01:00
snipe
2d49e1eff2
Merge pull request #15637 from akemidx/bug/sc-26614
...
FIXED: Badge counter showing deleted assets on User page
2024-10-10 01:09:11 +01:00
snipe
b5b93fdd3a
Make ldap username required
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-10 00:27:00 +01:00
snipe
d9432baf7a
Mlore ldap style improvements
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 23:51:20 +01:00
snipe
90be2a4498
Use newer naming convention for errors
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 22:26:30 +01:00
snipe
aa8048ac15
Blade changes for ldap
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 22:15:25 +01:00
snipe
242fe33f97
Switch to regular HTML input
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 20:33:42 +01:00
snipe
a7f7e4938f
Added form action
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 19:31:56 +01:00
snipe
41b94e7128
Fixed form input group
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 18:19:26 +01:00
snipe
aa55fa6ff4
Switch to form requests for settings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-09 18:16:34 +01:00
Brady Wetherington
67a605c9a5
Fix bulk checkout to users, assets, and locations
2024-10-09 17:01:26 +01:00
akemidx
c2663ea1e0
withouttrashed
2024-10-08 16:38:33 -04:00
Marcus Moore
8c9132aff9
Hide EULA text and button when nothing will be displayed
2024-10-07 14:22:49 -07:00
snipe
3f36d5f9b3
Removed duplicate CSS and removed line break before user section
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-07 11:08:02 +01:00
snipe
f483cd448f
Smarter work-wrapping on long text
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-03 17:27:37 +01:00
snipe
722d5a58e7
Added isset on users
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-03 16:19:38 +01:00
snipe
3c0f4181ae
Use the newer button style
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-03 16:19:06 +01:00
akemidx
f45b836010
backend form validation. +cleanup
2024-10-02 18:15:53 -04:00
akemidx
515f59fed9
more test work
2024-10-02 18:15:52 -04:00
akemidx
5e74b109d9
front end changes/updates from gh
2024-10-02 18:15:52 -04:00
akemidx
8b643cb3b9
note field optional
2024-10-02 18:15:52 -04:00
akemidx
700647c53f
setting created
2024-10-02 18:15:52 -04:00
akemidx
081c5706c4
required, but not optional
2024-10-02 18:15:52 -04:00
snipe
0dd6f41f66
Simplified 2fa if/else
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-02 11:04:55 +01:00
snipe
684c20ae39
Fixed parenthasis
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-02 11:00:49 +01:00
snipe
c32f4e34b4
Minor formatting fix
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 20:35:49 +01:00
snipe
97d00e5aa8
Fixed erroneous form tag on anchor
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 20:08:54 +01:00
snipe
9a2117466e
Removed placeholder
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 18:23:40 +01:00
snipe
7e3a062984
Use <th> for table header in bulk interstitial
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 18:23:07 +01:00
snipe
5823197e6f
Added checkin action on delete for checked out assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 14:29:02 +01:00
snipe
cae8aa7840
Added maxlengths to additional fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 14:02:54 +01:00
spencerrlongg
4f9f035c69
added a way to manipulate validator attribute names
2024-09-30 20:09:00 -05:00
snipe
12da43303f
Fixed #15584 - regression with required css change
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-10-01 01:44:05 +01:00
spencerrlongg
cd3059f790
rm numbers too. :(
2024-09-30 13:38:52 -05:00
snipe
5689e940b8
Fixed #15581 - missing bracker
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-30 18:23:12 +01:00
snipe
001348c638
Unset required on checkout select :(
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Related to the discussion at #15552
Signed-off-by: snipe <snipe@snipe.net>
2024-09-29 14:33:42 +01:00
snipe
1b041af862
Merge remote-tracking branch 'origin/master' into develop
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-09-29 11:25:01 +01:00
snipe
05d74f7a92
Covered setup pages too
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-28 15:42:03 +01:00
snipe
dc85588d7f
Don’t show password as required if editing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-28 15:31:44 +01:00
snipe
585f998cae
Fixes for requiredness display
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-28 15:28:06 +01:00
snipe
d120585f94
Check for valid eula for license, consumable
...
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
2024-09-27 14:07:30 +01:00
snipe
36b27fcda3
Check for valid category before getting the eula
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-09-27 13:37:14 +01:00
snipe
a44490e448
Nowrap on files column
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-27 13:07:24 +01:00
Marcus Moore
2004e58b53
Merge branch 'develop' into updated_ad_hoc_notes
2024-09-26 12:29:28 -07:00
Godfrey M
44447b85c9
Merge branch 'develop' into barcode_settings_hide
2024-09-26 11:27:05 -07:00
snipe
9aada2ec70
Merge pull request #15498 from Godmartinz/Modal_fix
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Refactoring modals with partials and fixing misalignments
2024-09-26 09:09:35 +01:00
Godfrey M
ef82f954e5
fixed required css, and user input lengths
2024-09-25 15:47:57 -07:00
spencerrlongg
852a56fa9b
should be all good now
2024-09-25 15:30:41 -05:00
Godfrey M
b797c37acb
replace duplicate code with partials
2024-09-25 12:48:05 -07:00
snipe
c02647a0fa
Moved merge into delete gate, since they do technically delete
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 20:32:03 +01:00
snipe
edca3f432c
Removed gate for delete
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 20:30:58 +01:00
snipe
2218c94aa3
Gates the dropdown based on user permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 20:29:23 +01:00
Godfrey M
12522a3791
fix spacing issues
2024-09-25 12:07:15 -07:00
spencerrlongg
9df78a9ed0
working! need formatting for error messages etc
2024-09-25 14:00:50 -05:00
Godfrey M
18ddffe8f9
fix partial variable intialization, fix width of input fields
2024-09-25 11:42:16 -07:00
snipe
9b03f46490
Merge pull request #15534 from marcusmoore/bulk-print-users
...
Added the ability to bulk print users
2024-09-25 19:32:01 +01:00
Godfrey M
926a319552
Merge branch 'develop' into Modal_fix_p2
2024-09-25 11:10:24 -07:00
spencerrlongg
f3ad89931f
hm ok this kind of works
2024-09-25 13:00:35 -05:00
spencerrlongg
21906d8c27
world set up and idea in place
2024-09-25 12:47:56 -05:00
snipe
cb6e5042d9
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status
...
Fixed #13396 - do not allow checkout to undeployable status types
2024-09-25 18:32:59 +01:00
snipe
658c94ad8b
Changed action_date to created_at
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 17:25:15 +01:00
snipe
ba69259f2d
Fixed #13396 - do not allow checkout to undeployable status types
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-24 15:35:00 +01:00
snipe
66249a37ed
Tweaked styles
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-24 11:08:31 +01:00
snipe
96712cb398
Fixed app settings view on mobile
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-24 10:55:26 +01:00
Marcus Moore
a12c9d053f
Hide label when printing
2024-09-23 16:44:25 -07:00
Marcus Moore
8b3b68b308
Show or hide all eulas at once when printing multiple users
2024-09-23 16:43:14 -07:00
Marcus Moore
3870095a28
Fix Cannot read properties of undefined error by removing snipe-table class from eula table
2024-09-23 15:50:24 -07:00
Marcus Moore
a02e250b22
Add page breaks for each user
2024-09-23 15:26:15 -07:00
Marcus Moore
8ac5c0e471
Re-combine layout and view
2024-09-23 14:05:47 -07:00
Marcus Moore
a2d4dcf6e8
Use bulk actions menu
2024-09-23 12:49:36 -07:00
Marcus Moore
29af210f4f
Merge branch 'develop' into bulk-print-users
2024-09-23 10:26:20 -07:00
snipe
5eea9d1950
Corrected text warning translation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-20 14:33:56 +01:00
snipe
bc540b6564
Requestable status not saving with manual [sc-26848]
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-20 14:02:28 +01:00
snipe
b21c303e56
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
2024-09-20 13:43:50 +01:00
Marcus Moore
2d2d5bdc7e
Pass user in array
2024-09-19 17:23:47 -07:00
Marcus Moore
8364d26c9b
Extract parent layout
2024-09-19 17:18:26 -07:00
Marcus Moore
efd6d7625f
Remove bad closing tag
2024-09-19 17:16:05 -07:00
Marcus Moore
bdf5708bfc
Remove accidental line
2024-09-19 17:10:43 -07:00
Marcus Moore
e95703cb18
Use eager load
2024-09-19 17:10:07 -07:00
snipe
8270947ed2
Merge pull request #13291 from akemidx/eol_date_range_for_reports
...
Added date range for EOL in custom reports
2024-09-19 21:49:27 +01:00
snipe
118183ff58
Removed footer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 19:41:39 +01:00
snipe
836893cba5
Added id to report
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 18:35:00 +01:00
snipe
727806372c
Added created_by to status label
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 18:22:11 +01:00
snipe
65eba30038
Fixed markdown in acceptance reminder
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:23:34 +01:00
snipe
bbce7b40ca
Additional consistencies
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 17:20:56 +01:00
snipe
9adb2c24f3
Squashed commit of the following:
...
commit dddbf27d78
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
commit fcefcc8184
Merge: 04bb3eec8
3519a82dd
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9
f963b9a19
Author: snipe <snipe@snipe.net>
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775
9e5f6d656
Author: snipe <snipe@snipe.net>
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io>
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io>
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 16:06:36 +01:00
akemidx
3964296ae6
no payload
2024-09-18 17:06:21 -04:00
snipe
bae9982833
Updated request methods
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-18 14:18:14 +01:00
snipe
abe79df6dc
Added translation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-18 13:47:30 +01:00
Godfrey M
c9854d43a5
fixes selection order
2024-09-17 16:56:02 -07:00
Godfrey M
04708ae2b2
only allows PDF417 for new label engine
2024-09-17 16:54:50 -07:00
Marcus Moore
89e2d03a81
Fix the deleted assets radio
2024-09-17 16:24:18 -07:00
Godfrey M
fa5651f335
remove getbarcodes, postbarcodes, barcodes settings blade
2024-09-17 16:21:26 -07:00
akemidx
443447a068
added icon to button
2024-09-17 19:16:44 -04:00
Godfrey M
b33c0fc4dd
updates getbarcode method and labels view
2024-09-17 16:15:56 -07:00
Marcus Moore
8e0b718a4a
Scope Select All checkbox to fields on left side of page
2024-09-17 16:00:32 -07:00
snipe
154d5d8d91
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
2024-09-17 23:40:25 +01:00
Marcus Moore
b51c505d9e
Fix department, manufacturer, and category multi-selects
2024-09-17 15:29:38 -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
akemidx
4b54e980e2
added button
2024-09-17 17:56:22 -04:00
Godfrey M
033a56fe6d
change variables in hardware labels edit post methods
2024-09-17 12:22:05 -07:00
Godfrey M
ce987b4f6d
added front end barcodes to labels
2024-09-17 11:23:38 -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
akemidx
74efd850af
redoing branch. old branch merge onflicts were waaay too gnarly
2024-09-16 19:30:26 -04:00
snipe
fe5fc6e0ce
Merge pull request #15471 from Godmartinz/Edit_side-panel
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Fixes margin for the sidebar menus while using rtl languages
2024-09-16 15:56:31 +01:00
snipe
62747a0090
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing
...
Fixed misalignment of consumables with smaller media
2024-09-16 15:02:55 +01:00
snipe
4debaaea39
Fixed #15504 - allow nulling/not changing locale in user bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-16 14:31:10 +01:00
Godfrey M
0bc98e971f
refactoring modals with partials and fixing misalignments
2024-09-12 12:26:19 -07:00
Godfrey M
c6c5cb73cf
fixes consumables positioning with smaller media
2024-09-11 10:49:27 -07:00
snipe
a97530367d
Fixed tests again
...
Signed-off-by: snipe <snipe@snipe.net>
2024-09-11 17:29:22 +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
Brady Wetherington
9e5f6d656a
Improve multi-asset create when using numeric prefixes to asset_tags
2024-09-11 15:45:01 +01:00
snipe
ab3b655312
Fixed #15483 - show EOL by default
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-09-11 12:25:09 +01:00
Godfrey M
15183c4822
rephrased the ternary <-correctly spelled
2024-09-10 11:05:03 -07:00
Godfrey M
367f02af86
more partials and includes
2024-09-09 16:34:04 -07:00
Godfrey M
7a1c721eca
making modal partials for reuse
2024-09-09 16:22:56 -07:00
Marcus Moore
6423df2133
Merge branch 'develop' into fixes/custom-field-values
...
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
2024-09-09 16:07:37 -07:00
Godfrey M
57fab0268b
made it a terenary
2024-09-09 13:02:25 -07:00
Godfrey M
ad5768d8b2
fixes margin for the sidebar using rtl languages
2024-09-09 12:45:11 -07:00
Godfrey M
df8b1c0240
hides barcode settings if new label engine enabled
2024-09-03 12:29:52 -07:00
Marcus Moore
51d63d57c6
Hide the "Add default values" checkbox if no fieldset selected
2024-09-03 12:22:43 -07:00
snipe
13dbf9ee74
Added icon for dept
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
2024-08-31 13:48:42 +01:00
snipe
3c7d455ee3
Added employee number to asset view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-31 13:38:38 +01:00
snipe
231bc1e2de
Updated blade selectors
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-29 18:31:34 +01:00
snipe
69e981364a
Made multiple select
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-29 17:51:20 +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
406ff6984b
Added click to select on models table
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-28 12:42:23 +01:00
snipe
b5a4389815
Added badge count, fixed model bulk edit menu
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-28 12:38:31 +01:00
snipe
67a9929745
Opens label new window
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-28 11:56:54 +01:00
snipe
22bc088f6f
Added start_date and end_date to user bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-27 07:21:19 +01:00
snipe
5c43a1f87c
Use proper style for buttons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 17:54:49 +01:00
snipe
d3b265de8e
Moved button on hardware
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 17:48:36 +01:00
snipe
263151658f
Moved general label button
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 17:44:09 +01:00
snipe
d92fa5de65
fa-fw on settings icon
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 15:17:25 +01:00
snipe
52894615ce
More specific gate for checkin
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 08:40:41 +01:00
snipe
8546bbdd65
Fixed gate for checkout button
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 08:38:47 +01:00
snipe
f85ebd7ffd
Added pull-right to angle bracket
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-23 07:27:39 +01:00
Marcus Moore
7f3c86165b
Conditionally disable Add default values checkbox
2024-08-22 13:58:31 -07:00
Marcus Moore
10b45812c4
Improve id for checkboxes and radio buttons
2024-08-22 13:38:01 -07:00
snipe
ca8864c061
Fixed small layout quirks in asset view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-22 13:28:52 +01:00
snipe
423f4f9126
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
...
Adds location select to the create new user via asset checkout
2024-08-22 13:25:41 +01:00
snipe
8b5d3f7fbd
Fixed extra closing p tag
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-22 12:56:32 +01:00
snipe
744f43676d
Fixed checkbox layout on modal from #15296
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-22 12:53:16 +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
bc9ea5a2ec
Merge pull request #15352 from Godmartinz/mobile_breakpoint
...
Fixed Mobile misalignment of info on Assets and Users view pages
2024-08-22 11:18:06 +01:00
snipe
4635a6efc3
Merge pull request #15360 from snipe/more_print_fixes
...
More print fixes for asset view
2024-08-22 11:17:49 +01:00
snipe
305dc049a4
Added asterisk help text
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-22 11:01:28 +01:00
snipe
d29b3bfb9a
Few more hidden-print classes
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-21 13:06:16 +01:00
snipe
912bbf0e32
More print fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-21 13:02:21 +01:00
snipe
26b3c62ab8
Cleaned up category title
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-21 10:29:51 +01:00
Marcus Moore
59832126cb
Improve comment
2024-08-20 16:52:51 -07:00
Marcus Moore
680cce3ee2
Align indents
2024-08-20 16:42:29 -07:00
Marcus Moore
6c5ec6a16c
Get datepicker working
2024-08-20 16:41:24 -07:00
Marcus Moore
5d1f98bf93
Simplify by directly wire:modeling
2024-08-20 15:38:43 -07:00
Godfrey M
9d484077ae
missed a file
2024-08-20 14:24:37 -07:00
Godfrey M
9858b0f37f
fixes info tab for users and assets
2024-08-20 14:23:55 -07:00
Marcus Moore
eca6b03f44
Allow id to be rendered
2024-08-20 11:08:53 -07:00
Marcus Moore
bbdbec7197
Rely on $attributes behavior rendering passed attributes
2024-08-20 11:00:39 -07: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
snipe
f6319e11e7
Added fa-fw to sidebar elements
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-20 10:11:27 +01:00
snipe
5d9f988df3
Added fw class to topnav icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-20 10:01:49 +01:00
snipe
f8c72fb0ac
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
...
Improved handling attempted access of deleted files in importer
2024-08-20 09:57:03 +01:00
akemidx
8e1111c681
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
2024-08-19 19:33:44 -04:00
Marcus Moore
fa765667f2
Merge branch 'develop' into livewire-importer-improvements
2024-08-19 14:41:58 -07:00
Marcus Moore
434bdcd6d4
Add missing parentheses to conditional
2024-08-19 14:31:47 -07:00
snipe
be5f3f38f8
Settings pages
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 14:48:12 +01:00
snipe
08c3a25b39
Little more padding
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 14:16:57 +01: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
d89c8682be
Reversed location button ordering
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:46:31 +01:00
snipe
6f024849e9
Few more
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:39:24 +01:00
snipe
e048f0955f
More icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:27:21 +01:00
snipe
479b2b4fd3
More icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:23:08 +01:00
snipe
8d52fa51b1
Fixed suppliers buttons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:20:06 +01:00
snipe
229d8b9bf5
Added location restore
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 13:19:59 +01:00
snipe
eb8d43a804
Updated buttons on models
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 12:32:44 +01:00
snipe
0bc995b87f
Updated more icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-19 11:58:05 +01:00
snipe
00bc9ac806
Fixed spacing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 22:39:14 +01:00
snipe
f200960a57
Aaaand more
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 22:26:57 +01:00
snipe
c700127f1a
Updated user view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 22:09:00 +01:00
snipe
ae2f9571b4
And still more
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 21:57:37 +01:00
snipe
a77dcad336
More links
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 20:30:53 +01:00
snipe
d2e889e927
Still more
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 19:21:59 +01:00
snipe
803bdb457c
Added calendar
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 18:48:19 +01:00
snipe
7c9b1f6e38
Added the plus icon
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 18:39:22 +01:00
snipe
d545537a43
More icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 18:34:13 +01:00
snipe
4d8904938d
Added calendar icon for datepickers
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 18:24:26 +01:00
snipe
0c09f2b2c0
Moar icon replacement
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 18:13:49 +01:00
snipe
bffba02511
Updated icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 17:26:44 +01:00
snipe
da71f031f5
Use icon in hardware view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 15:48:24 +01:00
snipe
d2e585baa7
Added icon blade
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 15:47:45 +01:00
snipe
4253acad4c
Prevent passing an array as login
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 04:51:36 +01:00
snipe
5066eb58f4
Added asset model import to importer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-17 02:31:03 +01:00
snipe
7658f7c41d
First shot
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 20:29:53 +01:00
snipe
ad6d09b6ad
Removed default label
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 16:43:51 +01:00
snipe
43b338d612
Fixed translation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 16:15:58 +01:00
snipe
856c57cb12
Corrected some translations
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 12:39:59 +01:00
snipe
90584ab803
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-08-16 11:11:00 +01:00
snipe
184f54a6cd
Removed extra spaces
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-16 11:10:57 +01:00
snipe
f24031b974
Merge pull request #15206 from Godmartinz/dashboard_box_alignment
...
Fixed dashboard box overflow
2024-08-16 11:10:40 +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
Marcus Moore
43b109fac0
Use cached values for textarea and radio input
2024-08-15 13:20:22 -07:00
Marcus Moore
75c1e7658f
Improve method name
2024-08-15 10:43:41 -07:00
Marcus Moore
e7c9c799bb
Add wire:keys
2024-08-15 10:40:23 -07:00
Marcus Moore
6ab976f353
Use cached values for text input
2024-08-15 10:32:33 -07:00
snipe
6216b4fc0d
Use native browser control for required in addition to the css effect
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 11:35:56 +01:00
snipe
4356cb7b9b
Added confetti option
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 11:32:42 +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
snipe
10dc1f1368
Re-pull the accessory checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 10:51:49 +01:00
snipe
8f7bce7aad
Re-added UI for checkout to non-users for accessories
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 10:44:27 +01:00
snipe
381003eeab
Cleaned up asset tag field on quickscan checkin
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 10:27:31 +01:00
snipe
d268f25f16
Make asset tag required
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 10:16:57 +01:00
snipe
01c69c8f8f
Allow optional status label on quickscan checkin
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-15 10:08:48 +01:00
spencerrlongg
afaf53cdfc
failing ui test
2024-08-14 18:14:21 -05:00
Brady Wetherington
008bf036b5
Got rid of weird namespace declaration and commented-out data-toggle line
2024-08-14 16:09:34 +01:00
Brady Wetherington
cc5ad456e6
Expose the 'sanitize' system for backup restores to the web GUI
2024-08-14 15:59:21 +01:00
snipe
0f1e5181a6
Nicer input layout for bulk edit name
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-14 10:09:14 +01:00
snipe
371afde52d
Bulk edit asset name
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-14 09:52:25 +01:00
Marcus Moore
038e86954b
Improve property name
2024-08-13 17:30:53 -07:00
Marcus Moore
f6c1642bf2
Use computed fields in CustomFieldSetDefaultValuesForModel component
2024-08-13 17:01:35 -07:00
snipe
e9fc455a30
Merge pull request #15192 from Godmartinz/status_labels_check_emails
...
Added status labels to confirmation emails
2024-08-13 18:24:15 +01:00
Godfrey M
8af4126de1
removed indent from blades
2024-08-13 10:21:33 -07:00
Godfrey M
5d1c48c071
fixes alignment, and box issue with pie chart
2024-08-13 10:11:49 -07:00
snipe
def0af652d
Merge pull request #15279 from TelecomsSansFrontieres/fix_missing-translate-item-assets
...
Fix: add missing admin/hardware/table.name key
2024-08-13 16:35:25 +01:00
Florent Bervas
20e4ba0590
lang: relocated translation key to existing item in general
2024-08-13 15:07:54 +00:00
snipe
389a06aac5
Hide UI elements from print view on assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-13 15:40:51 +01:00
snipe
1b2094f4e2
Added tooltips to top nav shortcuts
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-13 13:49:13 +01:00
snipe
3f2139349e
Allow better fallthrough on image
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-12 16:30:21 +01:00
snipe
225ab47b8e
Simplified logic
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-12 16:23:09 +01:00
snipe
4c350bd5a3
Remove the regular logo fallback, make image capped by height
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-12 16:21:58 +01:00
snipe
e7fb29fced
Fixed copy area for serial
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-12 15:58:30 +01:00
snipe
ce5be8ac24
Merge pull request #15100 from Godmartinz/depreciation_percentage
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Added Depreciation Percentage as an option
2024-08-12 10:10:25 +01:00
snipe
5c6c655cdc
Added sounds to quickscan checkin
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-08-10 19:37:18 +01:00
snipe
1c229a8e08
Made notes field sortable
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-10 17:00:11 +01:00
snipe
f3331b5045
Removed pound symbol from order number on asset view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-10 16:17:07 +01: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
snipe
a99ec062e6
Added checkbox for preferences
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-07 20:49:07 +01:00
snipe
b4d51599ee
Added sound effects
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-07 20:38:50 +01:00
snipe
ef183f256c
Merge pull request #15242 from Godmartinz/shortcut_option
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Fixed shortcuts to be optional now
2024-08-07 18:56:27 +01:00
Godfrey M
3a96e501cc
use old school input
2024-08-07 10:54:06 -07:00
Godfrey M
6b1784f2ee
makes shortcuts optional
2024-08-07 10:47:16 -07:00
snipe
0dc7e8b8dc
Temp removed other selector
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-07 18:04:52 +01:00
Godfrey M
46a6a84ecb
adds migration and translations
2024-08-06 11:07:39 -07:00
snipe
b83d148b37
Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Feature: Extend search capabilities to other assets attributes
2024-08-05 15:38:51 +01:00
Florent Bervas
b804791ff6
feature: extend search capabilities to other assets attributes
2024-08-05 12:26:29 +00:00
snipe
a0bd8b6049
Fixed #15205 - adds copy to asset tag
...
Signed-off-by: snipe <snipe@snipe.net>
2024-08-02 20:56:31 +01:00
snipe
f44abd0b28
Fixed button label
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-07-31 21:43:09 +01:00
Godfrey M
b60e22bcb4
adds closing brackets to signature pad
2024-07-31 11:10:33 -07:00
akemidx
8d1fa362f7
restoring code
2024-07-31 07:13:42 -04:00
akemidx
fccfce2ae8
first thought
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
2024-07-30 19:27:37 -04:00
Godfrey M
eb6f330e67
adds status to check in and out
2024-07-30 09:38:39 -07:00
snipe
4eccb5ffc6
Merge pull request #15185 from arne-kroeger/feat/accesspories-checkout-to-location-or-asset
...
Added #14979 : add checkout to location and assets functionality to accessories
2024-07-29 18:50:48 +01:00
snipe
1c1101aeac
Use the pwd_secure_min value (plus 5) for generated password
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-29 14:26:18 +01:00
snipe
bc18fac97e
Fixed missing div
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-29 10:11:11 +01:00
arne-kroeger
b18baf74d2
added options to checkout accessoires to locations and assets
...
Added #14979 : add checkout functionality to accessoires
2024-07-29 10:54:53 +02:00
snipe
28c7355697
Fixed missing div
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-29 09:52:38 +01:00
snipe
c3a296c19f
Added qr code back
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-27 10:12:13 +01:00
snipe
fc8bb82a02
Made dropdown wider
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 12:48:18 +01:00
snipe
5dea3f4495
Added blade component to checkin/checkout pages
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 12:47:33 +01:00
snipe
759ab78f80
Added more redirects
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 11:27:36 +01:00
snipe
243ab51def
Fixed back button
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-26 10:40:48 +01:00
snipe
73a80a5fbc
Use blade component for redirect option
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-25 21:35:13 +01:00
snipe
62655be2d0
Fixed BYOD label
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-25 18:41:37 +01:00
snipe
24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113
...
Registered custom anonymous blade component directory
2024-07-25 16:08:01 +01:00
snipe
9b422e5c97
Baremetrics BMPay breaks with CSP turned [sc-25011]
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 21:42:20 +01:00
Godfrey Martinez
c96ccbb6cb
Merge branch 'develop' into depreciation_percentage
2024-07-24 12:12:28 -07:00
Godfrey M
f05d8281f3
fixes alignment for error msg
2024-07-24 12:06:56 -07:00
Godfrey M
99741db645
adds status labels to confirmation emails
2024-07-24 11:24:30 -07:00
snipe
293abbd1d0
Allow cloning of deleted assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 17:49:38 +01:00
snipe
466ab1e3c0
Removed the banner since we already warn
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 17:40:24 +01:00
snipe
95a0f3dbe5
Cleaned up UI on asset view
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 17:26:55 +01:00
snipe
6f8ccd4e10
Fixes #15103 - Added EOL and audit into to user profile assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-24 12:54:33 +01:00
Marcus Moore
869c06f454
Register anonymous blade component namespace
2024-07-23 15:41:58 -07:00
snipe
20868b9ede
Load the english file again in case BS table doesn’t have a translation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-22 10:30:42 +01:00
snipe
e08acb851c
Removed env part, just check for the remote user login
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-22 10:18:33 +01:00
snipe
bbad84c6cc
Hides the “Disable Other Login Mechanisms” option via env
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-22 10:13:59 +01:00
snipe
38affea3f3
More updates
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-20 16:57:10 +01:00
snipe
2bfee0c29a
Few more tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-20 16:21:11 +01:00
snipe
c08bd8f88b
Nicer consumables layout
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-20 16:11:45 +01:00
snipe
ffd2687734
Updated language
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-20 07:25:46 +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
fc86eefeac
Show existing images on user edit page
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-20 00:27:28 +01:00
snipe
8b05ef6db4
Updated url checks
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-19 19:48:03 +01:00