Godfrey M
73772a0138
change button text
2024-10-30 11:12:31 -07:00
Godfrey M
b26cae372c
merged in develop
2024-10-30 10:40:23 -07:00
Godfrey M
d6ba303f39
Merge branch 'develop' into refacto_ms_teams_notifs
...
# Conflicts:
# app/Listeners/CheckoutableListener.php
2024-10-30 10:27:45 -07:00
snipe
931ab103c1
Merge remote-tracking branch 'origin/develop'
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
2024-10-30 13:21:25 +00:00
snipe
f68df1fa06
Made type searchable in action logs
...
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-10-30 13:21:13 +00:00
snipe
f0813e03bf
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
...
Separated Notifications and Emails: Check ins and Check outs
2024-10-30 12:18:41 +00:00
Marcus Moore
35f8a71c71
Test organization
2024-10-29 16:17:12 -07:00
Marcus Moore
86762c5e90
Remove marker test case
2024-10-29 16:12:34 -07:00
Marcus Moore
3c75fc2ced
Move test
2024-10-29 16:12:13 -07:00
Marcus Moore
702edf7908
Remove x from select dropdown
2024-10-29 15:34:00 -07:00
Marcus Moore
54b4db86d2
Revert "Add soft deletes"
...
This reverts commit 0eadab49f1
2024-10-29 15:33:49 -07:00
Marcus Moore
0eadab49f1
Add soft deletes
2024-10-29 15:26:18 -07:00
Marcus Moore
45e98e0282
Merge branch 'develop' into saving_custom_report_template
2024-10-29 15:20:52 -07:00
Marcus Moore
b97c54a54b
Improve handling of old data for text inputs
2024-10-29 11:25:54 -07:00
NebelKreis
e22296fd79
Feature: Added serial number option to 2D barcode in label generation
2024-10-29 13:49:05 +01:00
NebelKreis
6c17d7d732
Fix: Corrected path in translation function
...
Updated the translation function to use the correct path, ensuring that instead of displaying the translation path as plain text, the appropriate translation is now shown as intended.
2024-10-29 11:45:29 +01:00
snipe
05875ebd1f
Updated translations
...
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-10-28 22:04:35 +00:00
Godfrey M
9a0eee8f03
revert testing variables
2024-10-28 15:03:43 -07:00
Godfrey M
6128765d1f
change wording on notification button
2024-10-28 15:03:03 -07:00
Godfrey M
c24f79c025
update method comment
2024-10-28 14:58:43 -07:00
Godfrey M
e7c4343c90
readd checkin accessory format
2024-10-28 14:56:48 -07:00
Marcus Moore
0d58ac61bc
Make options required in model
2024-10-28 14:48:19 -07:00
Marcus Moore
7c08fbe144
Update test name
2024-10-28 14:43:05 -07:00
Marcus Moore
7777147af5
Add custom-reporting group
2024-10-28 14:42:44 -07:00
Marcus Moore
2042733dc0
Switch to array syntax
2024-10-28 14:37:52 -07:00
Godfrey M
c0620c27ff
adds back laravels channel formats
2024-10-28 14:30:34 -07:00
Marcus Moore
d4cf392387
Organize tests
2024-10-28 14:24:47 -07:00
Marcus Moore
c881727747
Add redirect for missing template
2024-10-28 14:12:19 -07:00
Godfrey M
ed81973fe6
adds notifications for deprecation
2024-10-28 13:57:42 -07:00
Marcus Moore
ee00699cb3
Remove unused strings
2024-10-28 13:07:29 -07:00
Marcus Moore
b45749af16
Update translation strings
2024-10-28 13:06:19 -07:00
Marcus Moore
54dec8d30d
Add translations
2024-10-28 12:56:42 -07:00
snipe
2d318b394c
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging
...
Added the display of logs when tests fail in GitHub Actions
2024-10-28 18:41:49 +00:00
Godfrey M
b987b3dc00
adds back the laravel channels package and applies a deprecated check
2024-10-28 10:57:48 -07:00
Marcus Moore
5c49716129
Dump logs on test failure
2024-10-28 10:24:35 -07:00
NebelKreis
6f3fb47e4a
Feature: Added asset tag option to barcode in label generation
2024-10-28 15:39:04 +01:00
snipe
755604677c
Merge remote-tracking branch 'origin/develop'
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
2024-10-28 13:38:19 +00:00
snipe
86d784bd59
Fixed #15740 - use non-translated strings for icons
...
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-10-28 13:37:59 +00:00
snipe
65f4f3def2
Merge remote-tracking branch 'origin/develop'
2024-10-28 12:04:20 +00:00
snipe
589f9cccdf
Fixed #15732
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 12:04:10 +00:00
snipe
42ec2fa05f
Merge remote-tracking branch 'origin/develop'
2024-10-28 11:55:43 +00:00
snipe
4d848e45e6
Fixed #15736
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 11:55:24 +00:00
Godfrey M
58ff641f82
removed unused variables
2024-10-24 22:53:53 -07:00
Godfrey M
ce68f550d8
remove alert emails from cc
2024-10-24 16:01:17 -07:00
Godfrey M
6f0c1b12b1
this adds check out message for consumables
2024-10-24 15:04:54 -07:00
Godfrey M
278bc5e52a
ads check in and checkout message for license seats
2024-10-24 14:59:10 -07:00
Godfrey M
cce75a8185
adds check in and checkout messag for accessories
2024-10-24 14:48:23 -07:00
Godfrey M
e27ff13377
adds check in and checkout message for assets
2024-10-24 14:39:40 -07:00
Godfrey M
56365495a1
remove unnecessary fields in accessory checkout mail
2024-10-24 14:26:42 -07:00
Godfrey M
18da80e6de
fix checkoutable listener for microsoft teams
2024-10-24 14:24:00 -07:00
