Marcus Moore
|
29af210f4f
|
Merge branch 'develop' into bulk-print-users
|
2024-09-23 10:26:20 -07:00 |
|
snipe
|
34eb10ff73
|
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-09-20 19:45:20 +01:00 |
|
|
snipe
|
ab0c009c0d
|
Fixed seeder
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-09-20 19:45:10 +01:00 |
|
|
snipe
|
7d7d58769c
|
Merge remote-tracking branch 'origin/develop'
|
2024-09-20 19:13:00 +01:00 |
|
|
snipe
|
b68805cf83
|
Small fix for notifications checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 19:11:52 +01:00 |
|
|
snipe
|
245d5dc469
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-09-20 17:28:15 +01:00 |
|
|
snipe
|
7d858129d9
|
Bumped hash
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-09-20 14:44:19 +01:00 |
|
|
snipe
|
65ce63bc9b
|
Merge pull request #15537 from snipe/snyk/updated_jspdf_autotable
Updated jspdf autotable
|
2024-09-20 14:42:07 +01:00 |
|
|
snipe
|
54fba2f547
|
Update jspdf autotable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 14:40:41 +01:00 |
|
|
snipe
|
5eea9d1950
|
Corrected text warning translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 14:33:56 +01:00 |
|
|
snipe
|
b84a634ec7
|
Corrected comment
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 14:33:35 +01:00 |
|
|
snipe
|
2fc88a0e08
|
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 14:33:26 +01:00 |
|
|
snipe
|
bc540b6564
|
Requestable status not saving with manual [sc-26848]
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 14:02:28 +01:00 |
|
|
snipe
|
f53b852dff
|
Make created_by equal one in the seeder
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-20 13:53:52 +01:00 |
|
|
snipe
|
b83d1a043f
|
Merge pull request #15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
|
2024-09-20 13:47:31 +01:00 |
|
|
snipe
|
4ab478bb97
|
Merge remote-tracking branch 'origin/develop'
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
|
2024-09-20 13:44:45 +01:00 |
|
|
snipe
|
b21c303e56
|
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
|
2024-09-20 13:43:50 +01:00 |
|
|
Marcus Moore
|
5128fd49e6
|
Allow printing all users
|
2024-09-19 17:27:25 -07:00 |
|
|
Marcus Moore
|
2d2d5bdc7e
|
Pass user in array
|
2024-09-19 17:23:47 -07:00 |
|
|
Marcus Moore
|
8364d26c9b
|
Extract parent layout
|
2024-09-19 17:18:26 -07:00 |
|
|
Marcus Moore
|
efd6d7625f
|
Remove bad closing tag
|
2024-09-19 17:16:05 -07:00 |
|
|
Marcus Moore
|
bdf5708bfc
|
Remove accidental line
|
2024-09-19 17:10:43 -07:00 |
|
|
Marcus Moore
|
e95703cb18
|
Use eager load
|
2024-09-19 17:10:07 -07:00 |
|
|
Marcus Moore
|
7ad4a29970
|
Add eager loading
|
2024-09-19 16:54:39 -07:00 |
|
|
snipe
|
cdb7ccb8f3
|
Merge pull request #15532 from spencerrlongg/bug/15253
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
Catch Exceptions on Checkout Notification
|
2024-09-19 21:54:03 +01:00 |
|
|
snipe
|
8270947ed2
|
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
|
2024-09-19 21:49:27 +01:00 |
|
|
snipe
|
4f7c8e0c3d
|
Merge pull request #14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
|
2024-09-19 21:36:09 +01:00 |
|
|
snipe
|
b88f2054dd
|
Refactor isDeletable on companies
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 20:38:34 +01:00 |
|
|
snipe
|
d7914e238d
|
Added created by to company on save
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 20:34:54 +01:00 |
|
|
snipe
|
d7bde37842
|
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
Added #15506: Explicitly request used LDAP attributes
|
2024-09-19 20:33:10 +01:00 |
|
|
snipe
|
454796e52a
|
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields
Fixed #11634 - Sort by numeric columns for numeric custom fields
|
2024-09-19 20:32:03 +01:00 |
|
|
snipe
|
eef487d61b
|
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
|
2024-09-19 20:31:02 +01:00 |
|
Godfrey M
|
71dbc7abb0
|
refreshed the assetstatus relationship
|
2024-09-19 12:23:07 -07:00 |
|
|
snipe
|
74088ea581
|
Optimize isDeletable counts
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 20:13:38 +01:00 |
|
spencerrlongg
|
d446773fdd
|
catch exceptions on notification
|
2024-09-19 14:05:48 -05:00 |
|
|
snipe
|
f283b5fbe8
|
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:56:39 +01:00 |
|
|
snipe
|
eb6f05faf7
|
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:41:46 +01:00 |
|
|
snipe
|
118183ff58
|
Removed footer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:41:39 +01:00 |
|
|
snipe
|
ebf6ce6980
|
Refactor for fewer queries
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:27:10 +01:00 |
|
|
snipe
|
5ebf0ed2b2
|
Updated variable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 19:19:14 +01:00 |
|
|
snipe
|
836893cba5
|
Added id to report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 18:35:00 +01:00 |
|
|
snipe
|
cd98b3817d
|
Removed duplicate line
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 18:26:08 +01:00 |
|
|
snipe
|
727806372c
|
Added created_by to status label
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 18:22:11 +01:00 |
|
|
snipe
|
5e1c736d49
|
Added created_by for manufacturers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 18:04:50 +01:00 |
|
|
snipe
|
6579fa72da
|
Added scoping for categories and companies
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:56:05 +01:00 |
|
|
snipe
|
82d6e1510f
|
Order by created_by for depreciations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:41:05 +01:00 |
|
|
snipe
|
822ea96dfd
|
Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:31:46 +01:00 |
|
|
snipe
|
b247fc33b9
|
Added legacy comment
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:28:01 +01:00 |
|
|
snipe
|
2dcae780c0
|
Reapply deleted code
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:26:21 +01:00 |
|
|
snipe
|
5c3180ffa0
|
Removed duplicate code
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-19 17:25:09 +01:00 |
|