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 |
|
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 |
|
snipe
|
0470a7c946
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-02 11:01:05 +01:00 |
|
snipe
|
684c20ae39
|
Fixed parenthasis
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 11:00:49 +01:00 |
|
snipe
|
c32f4e34b4
|
Minor formatting fix
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-01 20:35:49 +01:00 |
|
snipe
|
c8981f5031
|
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-10-01 20:32:41 +01:00 |
|
snipe
|
ca1886cebc
|
Merge pull request #15594 from snipe/localizations/update-2024-10-01
Updated strings
|
2024-10-01 20:31:38 +01:00 |
|
snipe
|
a79dfea40a
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 20:30:58 +01:00 |
|
snipe
|
45ab49eeab
|
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
|
2024-10-01 20:26:42 +01:00 |
|
spencerrlongg
|
8232618a9f
|
change the other one too
|
2024-10-01 14:26:32 -05:00 |
|
spencerrlongg
|
9a651b567d
|
change error to warning
|
2024-10-01 14:24:03 -05:00 |
|
snipe
|
97d00e5aa8
|
Fixed erroneous form tag on anchor
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 20:08:54 +01:00 |
|
Godfrey M
|
b9cfdf2e54
|
reworked monthly depreciation variable value
|
2024-10-01 11:41:59 -07:00 |
|
spencerrlongg
|
1139acd9f3
|
catch errors around request notifications
|
2024-10-01 13:36:47 -05:00 |
|
Godfrey M
|
b7ad80bd31
|
fix monthly depreciation value
|
2024-10-01 11:24:24 -07:00 |
|
Godfrey M
|
5ffd1b8daa
|
fixes if statement in transformer
|
2024-10-01 11:02:39 -07:00 |
|
snipe
|
9a2117466e
|
Removed placeholder
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 18:23:40 +01:00 |
|
snipe
|
7e3a062984
|
Use <th> for table header in bulk interstitial
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 18:23:07 +01:00 |
|
snipe
|
9cf4b03f59
|
Merge remote-tracking branch 'origin/develop'
|
2024-10-01 14:33:29 +01:00 |
|
snipe
|
d274fb6963
|
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
|
2024-10-01 14:32:48 +01:00 |
|
snipe
|
27ba641aa5
|
Added checkin on delete to API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 14:30:34 +01:00 |
|
snipe
|
5823197e6f
|
Added checkin action on delete for checked out assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 14:29:02 +01:00 |
|
snipe
|
cfc04a1d12
|
Merge pull request #15588 from snipe/added_more_maxlengths
Added maxlengths to additional fields
|
2024-10-01 14:08:58 +01:00 |
|
snipe
|
cae8aa7840
|
Added maxlengths to additional fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-01 14:02:54 +01:00 |
|
snipe
|
5d5e999384
|
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-10-01 01:44:24 +01:00 |
|
snipe
|
12da43303f
|
Fixed #15584 - regression with required css change
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-01 01:44:05 +01:00 |
|
snipe
|
b04afbbc85
|
Merge pull request #15564 from uberbrady/improve_autoclose
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
Get us better debugging output for new Github Stale Action
|
2024-09-30 19:26:08 +01:00 |
|
snipe
|
b964ce1025
|
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations
Removed sortablity for current value column in depreciations report
|
2024-09-30 19:25:05 +01:00 |
|
snipe
|
6217cba201
|
Merge pull request #15524 from Godmartinz/double-notif-bug
Fixed double webhook notifications // Separated email and webhook notifications.
|
2024-09-30 19:24:19 +01:00 |
|
Godfrey M
|
68e3f375fc
|
removes sortablity from current value column
|
2024-09-30 11:15:49 -07:00 |
|
snipe
|
21af36b105
|
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-30 18:24:19 +01:00 |
|
snipe
|
5689e940b8
|
Fixed #15581 - missing bracker
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-30 18:23:12 +01:00 |
|
snipe
|
d6d5dfb3d2
|
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-29 14:33:50 +01:00 |
|