snipe
|
371afde52d
|
Bulk edit asset name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-14 09:52:25 +01: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 |
|
|
snipe
|
72fd9977e5
|
Merge pull request #15277 from uberbrady/silence_saml_errors
Fixed: [sc-26355] Attempt to de-escalate SAML login and logout errors
|
2024-08-13 15:51:03 +01:00 |
|
Brady Wetherington
|
10f35c682b
|
Re-add space
|
2024-08-13 15:49:51 +01:00 |
|
|
Brady Wetherington
|
4b96721393
|
Attempt to de-escalate SAML login and logout errors
|
2024-08-13 14:55:13 +01:00 |
|
|
snipe
|
c163d6774f
|
Merge pull request #15198 from spencerrlongg/feature/add_trait_to_request
Add MayContainCustomFields Trait to Asset Update Request
|
2024-08-13 14:12:52 +01:00 |
|
|
snipe
|
b45a8f4b5f
|
Added reporting-only access for selectlists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-12 20:44:17 +01:00 |
|
|
snipe
|
ac1543d568
|
Fixed #15247 - make pie chart on dashboard respect the “show archived” setting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-12 17:54:42 +01:00 |
|
|
snipe
|
9d354ca657
|
Merge pull request #15266 from uberbrady/checkout_to_fixer
Checkout-to fixer
|
2024-08-12 16:34:19 +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
|
1777bb4b93
|
Pulled searchable relation on model - needs revisit
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-11 10:26:02 +01:00 |
|
|
snipe
|
ce33deed86
|
Remove unused use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:14:34 +01:00 |
|
|
snipe
|
1e6c172f18
|
Removed unusued use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:14:20 +01:00 |
|
|
snipe
|
a1ce9b9285
|
Added query scope for ordering by admin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:50 +01:00 |
|
|
snipe
|
6ec3693030
|
Load admin on actionlog
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:34 +01:00 |
|
|
snipe
|
71729f0b16
|
Load admin and model on assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:20 +01:00 |
|
|
snipe
|
f76fbe75e0
|
Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging
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
Fixed accessories and consumables not being logged correctly during bulk check-in
|
2024-08-08 10:43:59 +01:00 |
|
|
snipe
|
8094f3c0e1
|
Merge pull request #15245 from spencerrlongg/bug/acceptance_issue
Fixed Issue with Acceptances Being Created
|
2024-08-08 01:22:34 +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 |
|
spencerrlongg
|
2412333152
|
added conditional to listener
|
2024-08-07 16:53:06 -05:00 |
|
|
Marcus Moore
|
d03baa4613
|
Make diff cleaner
|
2024-08-07 13:29:45 -07:00 |
|
|
Marcus Moore
|
41437e4d8f
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-07 13:06:59 -07:00 |
|
|
snipe
|
7d220dd8c2
|
set default
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:58:04 +01:00 |
|
|
snipe
|
a99ec062e6
|
Added checkbox for preferences
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:49:07 +01:00 |
|
|
snipe
|
9350a20189
|
Include accessories count
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
This isn’t exactly right right now
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:19:47 +01:00 |
|
|
snipe
|
889d5da71e
|
Check for accessories on bulk items
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:04:32 +01:00 |
|
|
snipe
|
5546ab08c2
|
Only delete user records in accessories_checkouts for bulk delete
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 19:53:18 +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
|
6b1784f2ee
|
makes shortcuts optional
|
2024-08-07 10:47:16 -07:00 |
|
|
snipe
|
a5f075548a
|
Default to user
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 18:04:39 +01:00 |
|
|
Brady Wetherington
|
1706ddd511
|
working fixup script, but failing tests. But I have tests!
|
2024-08-07 16:06:00 +01:00 |
|
|
Marcus Moore
|
c7ddabcc8b
|
Check for FMCS when checking out component
|
2024-08-06 12:27:15 -07:00 |
|
|
Marcus Moore
|
bee80fcf8a
|
Remove global scope when counting check outs
|
2024-08-06 12:16:06 -07:00 |
|
|
Marcus Moore
|
f2b78d18a4
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-05 17:25:54 -07:00 |
|
|
Marcus Moore
|
17eccfcd8b
|
Formatting
|
2024-08-05 16:58:27 -07:00 |
|
|
Marcus Moore
|
01e4382d20
|
Formatting
|
2024-08-05 16:58:17 -07:00 |
|
|
Marcus Moore
|
1c664af326
|
Remove todo outside of scope
|
2024-08-05 16:58:08 -07:00 |
|
|
Marcus Moore
|
392d34422a
|
Remove code handled by ConsumableAssignment:: call above
|
2024-08-05 16:57:40 -07:00 |
|
|
Marcus Moore
|
67b3ab820f
|
Add todo comments
|
2024-08-05 16:10:08 -07:00 |
|
|
Marcus Moore
|
bfebcdc7ed
|
Improve variable name
|
2024-08-05 15:22:35 -07:00 |
|
Florent Bervas
|
ad794248fe
|
add a warning message if asset tag not found
|
2024-08-05 13:54:33 +00:00 |
|
|
Florent Bervas
|
b804791ff6
|
feature: extend search capabilities to other assets attributes
|
2024-08-05 12:26:29 +00:00 |
|
|
Godfrey M
|
ae4f278df1
|
edited terenaries on notifs
|
2024-08-01 11:13:20 -07:00 |
|
|
Godfrey M
|
854903805b
|
one more spot
|
2024-07-31 12:16:41 -07:00 |
|
|
Godfrey M
|
868f117b67
|
Merge branch 'status_labels_check_emails' of github.com:Godmartinz/snipe-it into status_labels_check_emails
|
2024-07-31 12:03:56 -07:00 |
|
|
Godfrey M
|
b6cac4baae
|
corrects ? usage
|
2024-07-31 12:03:36 -07:00 |
|
|
snipe
|
31a2765b30
|
Merge pull request #15145 from Godmartinz/purge-storage
Added user storage files to purge command
|
2024-07-31 10:16:08 +01:00 |
|
|
spencerrlongg
|
0941c0944a
|
ok, found issue, but need to test some things now...
|
2024-07-30 22:55:15 -05:00 |
|
|
spencerrlongg
|
9b80843c77
|
tests a little broken, added some nullchecks
|
2024-07-30 21:44:22 -05:00 |
|
|
spencerrlongg
|
8684a3efc3
|
delete note, add trait to other request
|
2024-07-30 21:22:46 -05:00 |
|
|
spencerrlongg
|
437ddc01b4
|
removed extraneous $request->validate() arguments
|
2024-07-30 16:26:24 -05:00 |
|
|
Godfrey M
|
eb6f330e67
|
adds status to check in and out
|
2024-07-30 09:38:39 -07:00 |
|
|
Godfrey M
|
f19899543d
|
changed error to info
|
2024-07-30 09:18:17 -07:00 |
|
|
snipe
|
3a2611f8e1
|
Merge pull request #14565 from spencerrlongg/bug/sc-23936
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
Checks that custom fields exist before saving
|
2024-07-30 11:36:55 +01:00 |
|
|
Godfrey M
|
53ad312700
|
added missing closing bracket
|
2024-07-29 15:17:32 -07:00 |
|
|
Godfrey M
|
89d375daad
|
add indents
|
2024-07-29 15:15:41 -07:00 |
|
|
Godfrey M
|
d46f9776fe
|
remove text
|
2024-07-29 15:14:58 -07:00 |
|
|
Godfrey M
|
f9a47c8a9f
|
adds a try catch
|
2024-07-29 15:12:48 -07:00 |
|
|
Godfrey M
|
e395ee1878
|
adds a try catch
|
2024-07-29 15:12:32 -07:00 |
|
|
snipe
|
4c5b82ae37
|
Merge pull request #15188 from Godmartinz/1d_barcode_select_bug
Fixed 1d barcode targeting.
|
2024-07-29 20:00:21 +01:00 |
|
|
Spencer Long
|
fd7082c30f
|
Merge branch 'develop' into bug/sc-23936
|
2024-07-29 14:00:00 -05:00 |
|
|
Godfrey M
|
86049624c7
|
retargeted new label engine to correct 1d column
|
2024-07-29 10:42:26 -07:00 |
|
arne-kroeger
|
e8d0147075
|
Adjusted missing down on migration and code smells
|
2024-07-29 19:04:10 +02: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
|
aab29fbb6b
|
Use translated string for restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 16:47:40 +01:00 |
|
|
snipe
|
e4a82edd3f
|
Merge pull request #15172 from snipe/features/blade_component_for_submit
Use blade component for submit redirect on asset edit/create
|
2024-07-26 15:13:30 +01:00 |
|
|
snipe
|
ff100c0b9f
|
Added more tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 14:58:10 +01:00 |
|
|
snipe
|
037cc4d098
|
More tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 14:27:07 +01:00 |
|
|
snipe
|
cd7f276c40
|
Fixed logging for component
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 13:09:21 +01:00 |
|
|
snipe
|
5d7f1f77a3
|
Added redirect to checkin/checkout controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:48:07 +01:00 |
|
|
snipe
|
c6e709cd36
|
Added parameters
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:45:06 +01:00 |
|
|
snipe
|
759ab78f80
|
Added more redirects
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 11:27:36 +01:00 |
|
|
snipe
|
b6d9f736e3
|
Pulled use session
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:41:28 +01:00 |
|
|
snipe
|
57f6ecb1da
|
Added created_by to license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:24:13 +01:00 |
|
|
snipe
|
068535a80c
|
Removed logging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:08:46 +01:00 |
|
|
snipe
|
08f4fe5f35
|
Add status messages to redirect
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:02:34 +01:00 |
|
|
snipe
|
018b5684fc
|
Refactor helper method for redirection
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:02:03 +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
|
f77d300549
|
Merge pull request #15169 from uberbrady/create_directories_when_needed_on_restore
Create intermediate directories on restore if needed - Fixes [SC-25950]
|
2024-07-25 18:45:54 +01:00 |
|
|
Brady Wetherington
|
eb938bdba3
|
Create intermediate directories on restore if needed
|
2024-07-25 18:40:26 +01:00 |
|
|
Brady Wetherington
|
84df23e1f6
|
Better handle older SQL dumps that got created in Windows format
|
2024-07-25 18:07:25 +01:00 |
|
|
snipe
|
a439d8abe8
|
Use fully qualified use statements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 16:08:46 +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 |
|
|
Marcus Moore
|
44dbbeb608
|
Add accessory and consumable specific checkin methods
|
2024-07-24 14:17:49 -07:00 |
|
|
snipe
|
c3a2cdeee9
|
Added assets endpoint for locations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 20:53:58 +01:00 |
|
|
snipe
|
adf58a06da
|
Added check for purchase date
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 20:13:11 +01:00 |
|
|
snipe
|
63f0b5279d
|
Added check for purchase_date
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 20:13:01 +01:00 |
|
Godfrey Martinez
|
c96ccbb6cb
|
Merge branch 'develop' into depreciation_percentage
|
2024-07-24 12:12:28 -07:00 |
|
|
Godfrey M
|
d5c9fa823e
|
adds translations
|
2024-07-24 11:39:33 -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
|
ab1e097b7c
|
Early return for requiredness
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 10:41:14 +01:00 |
|
|
Marcus Moore
|
869c06f454
|
Register anonymous blade component namespace
|
2024-07-23 15:41:58 -07:00 |
|
|
spencerrlongg
|
b61ab423ca
|
ok NOW it should be fine
|
2024-07-23 17:35:48 -05:00 |
|
|
spencerrlongg
|
090a595c99
|
conflict
|
2024-07-23 17:34:17 -05:00 |
|
|
Spencer Long
|
bc417308c7
|
Merge branch 'develop' into bug/check_requiredness
|
2024-07-23 17:32:43 -05:00 |
|
|
spencerrlongg
|
e77e16b9aa
|
this works
|
2024-07-23 17:22:20 -05:00 |
|
|
spencerrlongg
|
0ae297634e
|
ugh
|
2024-07-23 16:59:58 -05:00 |
|
|
spencerrlongg
|
0f2f559d7a
|
test works, helper still needs work. pushing to check something
|
2024-07-23 16:46:29 -05:00 |
|
|
snipe
|
57b5b12952
|
Merge pull request #15148 from marcusmoore/fixes/dates-in-user-import
Fixed start_date and end_date in user importer
|
2024-07-23 22:37:19 +01:00 |
|