Commit graph

14882 commits

Author SHA1 Message Date
Godfrey M 46a6a84ecb adds migration and translations 2024-08-06 11:07:39 -07:00
Marcus Moore 374812f8fe
Add failing test 2024-08-06 10:48:38 -07:00
Marcus Moore 94e00b8a3e
Use new accessory checkout relationship 2024-08-05 17:26:11 -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 35e7a3163c
Implement test case 2024-08-05 16:54:31 -07:00
Marcus Moore 96fafa6952
Improve readability 2024-08-05 16:36:29 -07:00
Marcus Moore a55693211f
Move test class 2024-08-05 16:27:04 -07:00
Marcus Moore 1acd24fdbe
Re-order helpers 2024-08-05 16:26:25 -07:00
Marcus Moore 59b7d5db4b
Remove comment 2024-08-05 16:25:14 -07:00
Marcus Moore 16aa47509b
Implement test for assets 2024-08-05 16:24:52 -07:00
Marcus Moore d1bb3ef6bf
Scaffold two tests 2024-08-05 16:19:09 -07:00
Marcus Moore 5cd9dd4a67
Add assertion to ensure user cannot perform bulk actions on self 2024-08-05 16:17:24 -07:00
Marcus Moore fc405d9d73
Assert redirected to correct place 2024-08-05 16:14:01 -07:00
Marcus Moore 5786ff5035
Add assertion for success message 2024-08-05 16:11:07 -07:00
Marcus Moore 8a206a6d92
Add assertion 2024-08-05 16:10:12 -07:00
Marcus Moore 67b3ab820f
Add todo comments 2024-08-05 16:10:08 -07:00
Marcus Moore b06501dd02
Add assertions 2024-08-05 16:02:59 -07:00
Marcus Moore e3049fffd4
Remove comment 2024-08-05 15:50:53 -07:00
Marcus Moore 5ecdb7e07c
Add validation test 2024-08-05 15:50:09 -07:00
Marcus Moore 4ed3347f52
Add permission check 2024-08-05 15:43:38 -07:00
Marcus Moore 364775dcfe
Improve readability 2024-08-05 15:42:03 -07:00
Marcus Moore bfebcdc7ed
Improve variable name 2024-08-05 15:22:35 -07:00
Marcus Moore 480e4f3a69
Improve readability 2024-08-05 15:16:40 -07:00
Marcus Moore 78a0417ee9
Add another user into the mix 2024-08-05 15:11:18 -07:00
snipe b83d148b37
Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag
Some checks failed
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 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
snipe c45bf870b7
Merge pull request #15211 from snipe/feaures/15205_copy_asset_tag
Some checks failed
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 #15205 - adds copy to asset tag
2024-08-02 20:59:53 +01: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
Godfrey M ae4f278df1 edited terenaries on notifs 2024-08-01 11:13:20 -07:00
snipe 28abb8d8cc Hotfix for 405 update asset
Some checks failed
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-08-01 12:30:35 +01:00
snipe 24d948a3f6
Merge pull request #15204 from snipe/fixes/405_on_api_asset_update
Some checks failed
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 (temp) put route
2024-08-01 12:28:23 +01:00
snipe c1c9c3554e Fixed (temp) put route
Signed-off-by: snipe <snipe@snipe.net>
2024-08-01 12:27:02 +01:00
snipe fcea564afa Fixed button label
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (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:44:27 +01:00
snipe f44abd0b28 Fixed button label
Some checks are pending
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 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 4fcb3df1d9
Merge pull request #15199 from Godmartinz/fix-signature-pad
adds closing brackets to signature pad
2024-07-31 19:23:33 +01:00
Godfrey M b60e22bcb4 adds closing brackets to signature pad 2024-07-31 11:10:33 -07:00
spencerrlongg 61312c2eec oops, mysql 2024-07-31 12:07:50 -05:00
spencerrlongg b0063b1d4a test written 2024-07-31 11:57:35 -05:00
akemidx fffcbdc44d Merge remote-tracking branch 'upstream/develop' into upstream/dev
Some checks are pending
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-31 07:14:06 -04:00
akemidx 8d1fa362f7 restoring code 2024-07-31 07:13:42 -04: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
snipe e79a5b7efe
Merge pull request #15193 from Godmartinz/admin-settings
Fixed admin boxes alignment
2024-07-31 08:54:44 +01:00