Marcus Moore
|
53de97db4e
|
Merge branch 'develop' into saving_custom_report_template
|
2024-11-12 10:36:07 -08:00 |
|
|
Marcus Moore
|
5574c5fa49
|
Improve comments
|
2024-11-12 10:35:22 -08:00 |
|
|
Marcus Moore
|
7373e2019c
|
Improve comment
|
2024-11-12 10:01:32 -08:00 |
|
snipe
|
6bec573956
|
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
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
Check that the file exists before trying to download stored EULA
|
2024-11-11 13:54:09 +00:00 |
|
|
snipe
|
1fc5bb54e1
|
Check that the file exists before trying to download
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-11 13:50:53 +00:00 |
|
|
snipe
|
b6ad69fac2
|
Merge pull request #15793 from snipe/allow_eol_explicit
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
Allow user to specify null for calculation or explicit on bulk edit
|
2024-11-10 18:05:20 +00:00 |
|
|
snipe
|
47b2cdb846
|
Allow user to specify null for calculation or explicit on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-10 18:04:13 +00:00 |
|
|
snipe
|
357ef7e375
|
Merge pull request #15792 from snipe/edit_eol_from_bulk
Added EOL date to bulk asset edit
|
2024-11-10 17:48:25 +00:00 |
|
|
snipe
|
6928b1b273
|
Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-10 17:47:10 +00:00 |
|
|
snipe
|
000f3171e3
|
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
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-11-08 10:28:01 +00:00 |
|
|
Marcus Moore
|
4bb19152c4
|
Move test
|
2024-11-07 17:01:47 -08:00 |
|
|
Marcus Moore
|
dc0b8c7572
|
Inline route helpers in tests
|
2024-11-07 16:54:55 -08:00 |
|
|
Marcus Moore
|
b8265d54bb
|
Improve comment
|
2024-11-07 16:42:55 -08:00 |
|
|
Marcus Moore
|
0e3efdfe87
|
Add string to name validation
|
2024-11-07 16:40:54 -08:00 |
|
|
Marcus Moore
|
363ec841d1
|
Re-introduce soft deletes
|
2024-11-07 16:40:37 -08:00 |
|
|
Marcus Moore
|
f8d0ddb3f7
|
Improve template name input
|
2024-11-07 14:17:20 -08:00 |
|
|
Marcus Moore
|
4aa5961860
|
Update page titles
|
2024-11-07 12:13:20 -08:00 |
|
|
Marcus Moore
|
7862b74e99
|
Inline fields when updating
|
2024-11-07 11:03:03 -08:00 |
|
|
Marcus Moore
|
c5710b858e
|
Add test validation test for update method and remove name uniqueness constraint
|
2024-11-07 11:02:10 -08:00 |
|
|
snipe
|
5ef3183a52
|
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
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
Improved indexes on manager_id for locations and users, including del…
|
2024-11-07 11:44:06 +00:00 |
|
Brady Wetherington
|
050831868e
|
Improved indexes on manager_id for locations and users, including deleted_at
|
2024-11-07 11:39:27 +00:00 |
|
|
snipe
|
a41529dbc4
|
Merge pull request #15780 from uberbrady/add_manager_indexes
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
Add new indexes to locations and users for faster manager lookups
|
2024-11-06 21:22:45 +00:00 |
|
|
Brady Wetherington
|
4fcf5ac7da
|
Add new indexes to locations and users for faster manager lookups
|
2024-11-06 21:19:41 +00:00 |
|
|
Marcus Moore
|
8873137ed0
|
Scaffold updating template name
|
2024-11-06 12:29:31 -08:00 |
|
|
Marcus Moore
|
37d792352d
|
Update page title dynamically
|
2024-11-06 12:11:35 -08:00 |
|
|
snipe
|
aa168fcb5b
|
Updated BS table to 1.23.5
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-06 18:41:52 +00:00 |
|
|
snipe
|
9c1c93ad52
|
Merge pull request #15774 from marcusmoore/feature/sc-27350
Added Checkout ID column to user accessory table
|
2024-11-06 18:40:35 +00:00 |
|
|
Marcus Moore
|
ad99b8b456
|
Use generic ID translation
|
2024-11-06 10:37:31 -08:00 |
|
|
snipe
|
b96a312539
|
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
|
2024-11-06 18:29:22 +00:00 |
|
Joël Pittet
|
bab1e58ea4
|
symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736
|
2024-11-06 09:46:11 -08:00 |
|
|
snipe
|
654f67b6ac
|
Updated webpack
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-06 14:05:42 +00:00 |
|
|
snipe
|
3965bcd7c1
|
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests
Fixed notifications for licenses and asset to asset checkoutables
|
2024-11-06 14:02:44 +00:00 |
|
Godfrey M
|
2362cb5e52
|
refactor to getNotifiables
|
2024-11-04 16:32:46 -08:00 |
|
|
Marcus Moore
|
e7cb4a75eb
|
Show accessory checkout id in user accessory table
|
2024-11-04 15:56:53 -08:00 |
|
|
Godfrey M
|
93494ac554
|
put dataprovider back in for tests
|
2024-11-04 15:17:58 -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 |
|
|
snipe
|
287f4addf0
|
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
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
Revert "Added the display of logs when tests fail in GitHub Actions"
|
2024-11-04 20:06:24 +00:00 |
|
|
Marcus Moore
|
2e96d478f1
|
Revert "Added the display of logs when tests fail in GitHub Actions"
|
2024-11-04 11:04:17 -08:00 |
|
|
snipe
|
f32ebdc7ac
|
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
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
Added missing Livewire file
|
2024-10-31 22:39:58 +00:00 |
|
|
Marcus Moore
|
d6c7dc8e1c
|
Add missing livewire file
|
2024-10-31 15:37:01 -07:00 |
|
|
snipe
|
5897d37fcf
|
Merge pull request #15763 from Godmartinz/no_to_email_check
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
|
2024-10-31 20:54:01 +00:00 |
|
|
Godfrey M
|
21a27dcac1
|
fixed conflicts
|
2024-10-31 12:55:46 -07:00 |
|
|
Godfrey M
|
3791380764
|
remove unused uses
|
2024-10-31 12:52:47 -07:00 |
|
|
Godfrey M
|
7a0f79ecd2
|
remove test route
|
2024-10-31 12:51:22 -07:00 |
|
|
Godfrey M
|
97a449e80e
|
removes instanceof User check
|
2024-10-31 12:50:13 -07:00 |
|
|
Godfrey M
|
e65942064e
|
send emails even if target has no email
|
2024-10-31 12:45:29 -07:00 |
|
|
Marcus Moore
|
5f83cb6a14
|
Use route model binding
|
2024-10-31 12:34:06 -07:00 |
|
|
Marcus Moore
|
ae24b73b32
|
Fix action_type from "created" to" create"
|
2024-10-31 12:19:41 -07:00 |
|