Godfrey M
ca4bafc04a
adds a dark background to fieldsets, fixes right border
2024-11-07 11:34:12 -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
d489527e6d
Merge remote-tracking branch 'origin/develop'
2024-11-07 13:19:52 +00:00
snipe
5ef3183a52
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
...
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
Tobias Regnery
2db70379a6
Fix Indentation in UsersController
...
The indentation in the update-function of the UsersController is partially wrong.
Fix this to avoid confusion.
2024-11-07 09:22:42 +01:00
snipe
aa080945f6
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-11-06 21:26:21 +00:00
snipe
a41529dbc4
Merge pull request #15780 from uberbrady/add_manager_indexes
...
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
9ce1e78c5c
Merge remote-tracking branch 'origin/develop'
2024-11-06 14:16:09 +00: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
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
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
...
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
...
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
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
Godfrey M
ae3cb7b37b
adds migration to update new with old if blank and remove old barcod variables
2024-10-31 14:35:13 -07:00
snipe
95dba6c426
Merge remote-tracking branch 'origin/develop'
2024-10-31 21:06:59 +00: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
Marcus Moore
4aedbb52fa
Implement activity logging transformer tests
2024-10-31 12:15:05 -07:00
snipe
49de07045a
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
...
Fixed MS Team Notifications to utilize workflows after deprecation
2024-10-31 17:53:17 +00:00
snipe
7e996c40f5
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
...
Fix ${var} deprecation warning in License model
2024-10-31 02:51:42 +00:00
Jeremy Price
69e74bbdd3
Fix ${var} deprecation warning in License model
...
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219
This simple fix switches the offending statements to {$var} syntax.
2024-10-30 19:43:54 -07:00
