snipe
|
9eed6cde43
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-11 14:04:56 +00:00 |
|
snipe
|
6bec573956
|
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
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
|
5d581752af
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-10 18:05:52 +00:00 |
|
snipe
|
b6ad69fac2
|
Merge pull request #15793 from snipe/allow_eol_explicit
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
|
7596717a15
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-10 17:49:30 +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
|
c6b9556f60
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-08 10:28:26 +00:00 |
|
snipe
|
000f3171e3
|
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
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 |
|
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 |
|