snipe
|
2be88cb955
|
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
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
Removed duplicate JS and removed line break before user section
|
2024-10-07 11:14:24 +01:00 |
|
|
snipe
|
3f36d5f9b3
|
Removed duplicate CSS and removed line break before user section
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-07 11:08:02 +01:00 |
|
Lewis Foster
|
f76da48448
|
Docker Env: Change trusted proxies to RFC1918
|
2024-10-05 18:27:42 +01:00 |
|
Marcus Moore
|
8035326675
|
Add test
|
2024-10-03 16:53:19 -07:00 |
|
|
Marcus Moore
|
dfdd85abb1
|
Remove unused imports
|
2024-10-03 15:14:07 -07:00 |
|
|
Marcus Moore
|
063ea1892b
|
Add trait to clean up files after test runs
|
2024-10-03 15:02:03 -07:00 |
|
|
Marcus Moore
|
e213053775
|
Swap factory syntax
|
2024-10-03 13:59:58 -07:00 |
|
|
Marcus Moore
|
88d549e7c5
|
Remove unused data provider method
|
2024-10-03 13:40:37 -07:00 |
|
|
Marcus Moore
|
983a25aa5f
|
Simplify permission tests
|
2024-10-03 13:39:54 -07:00 |
|
|
Marcus Moore
|
bde05d6ed9
|
Use new() instead of times()
|
2024-10-03 13:15:49 -07:00 |
|
|
Marcus Moore
|
b5ffe54bd0
|
Swap assertEquals parameter order
|
2024-10-03 13:15:02 -07:00 |
|
|
Marcus Moore
|
863c0a8b60
|
Fix import_type for accessory state
|
2024-10-03 11:43:02 -07:00 |
|
Marcus Moore
|
32551d55d7
|
Merge pull request #15579 from bryanlopezinc/ImportTests
Add Import data tests
|
2024-10-03 11:39:21 -07:00 |
|
|
snipe
|
c56a5edddc
|
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
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-10-03 17:41:07 +01:00 |
|
|
snipe
|
7fc498a597
|
Merge pull request #15613 from snipe/css_fixes_for_long_values
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
Smarter word-wrapping on long text
|
2024-10-03 17:39:18 +01:00 |
|
|
snipe
|
cb281c6408
|
Tweaked line height
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-03 17:33:46 +01:00 |
|
|
snipe
|
f483cd448f
|
Smarter work-wrapping on long text
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-03 17:27:37 +01:00 |
|
|
snipe
|
2de3bc92eb
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-03 16:29:14 +01:00 |
|
|
snipe
|
78ca1026fd
|
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile
Fixes print assigned in profile
|
2024-10-03 16:24:32 +01:00 |
|
|
snipe
|
722d5a58e7
|
Added isset on users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-03 16:19:38 +01:00 |
|
|
snipe
|
7461c3e0ca
|
Change controller to assume a collection. (This is dumb, but whatever)
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-03 16:19:27 +01:00 |
|
|
snipe
|
3c0f4181ae
|
Use the newer button style
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-03 16:19:06 +01:00 |
|
|
snipe
|
f5d7b96503
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-03 14:38:34 +01:00 |
|
|
snipe
|
3699d79363
|
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug
Fix numeric sort 'ambiguous order clause' error
|
2024-10-03 14:34:00 +01:00 |
|
Brady Wetherington
|
350b627ce1
|
Fix numeric sort 'ambiguous order clause' error
|
2024-10-03 14:23:40 +01:00 |
|
akemidx
|
0c84904bf9
|
un'required'ing the rule. not sure what's breaking here but looking
|
2024-10-02 18:56:41 -04:00 |
|
|
akemidx
|
e00a1aec02
|
note box is now missing when unchecking setting
|
2024-10-02 18:52:33 -04:00 |
|
|
akemidx
|
06e3bb7fd1
|
requested changes
|
2024-10-02 18:37:11 -04:00 |
|
|
akemidx
|
492e686b7a
|
Merge remote-tracking branch 'origin/feature/sc-26415' into feature/sc-26415
# Conflicts:
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Assets/AssetCheckoutController.php
# app/Http/Requests/AssetCheckinRequest.php
|
2024-10-02 18:17:38 -04:00 |
|
|
akemidx
|
17706f150e
|
requested changes
|
2024-10-02 18:15:53 -04:00 |
|
|
akemidx
|
6fef127cd1
|
missing closing )
|
2024-10-02 18:15:53 -04:00 |
|
|
akemidx
|
f45b836010
|
backend form validation. +cleanup
|
2024-10-02 18:15:53 -04:00 |
|
|
akemidx
|
925aea8531
|
back to having tests pass. needed to comment out the notes rules() i added
|
2024-10-02 18:15:53 -04:00 |
|
|
akemidx
|
bd6698de2a
|
fixing some formatting
|
2024-10-02 18:15:53 -04:00 |
|
|
akemidx
|
515f59fed9
|
more test work
|
2024-10-02 18:15:52 -04:00 |
|
|
akemidx
|
5e74b109d9
|
front end changes/updates from gh
|
2024-10-02 18:15:52 -04:00 |
|
|
akemidx
|
8b643cb3b9
|
note field optional
|
2024-10-02 18:15:52 -04:00 |
|
|
akemidx
|
700647c53f
|
setting created
|
2024-10-02 18:15:52 -04:00 |
|
|
akemidx
|
081c5706c4
|
required, but not optional
|
2024-10-02 18:15:52 -04:00 |
|
|
Marcus Moore
|
ee046a8688
|
Add matching Model::reguard()
|
2024-10-02 10:50:40 -07:00 |
|
|
snipe
|
b34a7c8aad
|
Removed die()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:48:35 +01:00 |
|
|
snipe
|
f92bf5dc20
|
Updated language for failure
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:39:27 +01:00 |
|
|
snipe
|
4d9e85026a
|
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:36:01 +01:00 |
|
|
snipe
|
1695b8250f
|
Bumped version for master
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
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 12:41:31 +01:00 |
|
|
snipe
|
f42eeee666
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-02 12:40:59 +01:00 |
|
|
snipe
|
54fbd0540d
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
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
|
2024-10-02 12:40:49 +01:00 |
|
|
snipe
|
b483bb1633
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 12:40:45 +01:00 |
|
|
snipe
|
4db7358086
|
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
|
2024-10-02 12:38:46 +01:00 |
|
|
snipe
|
dc0949da78
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-02 11:05:06 +01:00 |
|
|
snipe
|
0dd6f41f66
|
Simplified 2fa if/else
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 11:04:55 +01:00 |
|