snipe
|
4c5b82ae37
|
Merge pull request #15188 from Godmartinz/1d_barcode_select_bug
Fixed 1d barcode targeting.
|
2024-07-29 20:00:21 +01:00 |
|
Spencer Long
|
fd7082c30f
|
Merge branch 'develop' into bug/sc-23936
|
2024-07-29 14:00:00 -05:00 |
|
|
snipe
|
8d0b72293f
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-07-29 18:51:19 +01:00 |
|
|
snipe
|
f3d98f90c0
|
Add @arne-kroeger as a contributor
|
2024-07-29 18:51:12 +01:00 |
|
|
snipe
|
4eccb5ffc6
|
Merge pull request #15185 from arne-kroeger/feat/accesspories-checkout-to-location-or-asset
Added #14979: add checkout to location and assets functionality to accessories
|
2024-07-29 18:50:48 +01:00 |
|
Godfrey M
|
86049624c7
|
retargeted new label engine to correct 1d column
|
2024-07-29 10:42:26 -07:00 |
|
|
snipe
|
3972782033
|
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:
# config/version.php
|
2024-07-29 18:27:56 +01:00 |
|
|
snipe
|
33b86057d1
|
Version bump
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 18:27:01 +01:00 |
|
arne-kroeger
|
3c3b922eae
|
Adjusted newly added tests to new checkout form
|
2024-07-29 19:15:01 +02:00 |
|
|
arne-kroeger
|
e8d0147075
|
Adjusted missing down on migration and code smells
|
2024-07-29 19:04:10 +02:00 |
|
|
snipe
|
c2bcc2e2d9
|
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-07-29 14:39:13 +01:00 |
|
|
snipe
|
55f9886412
|
Merge pull request #15187 from snipe/feature/sc-26458
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
Use the `pwd_secure_min` value (plus 5) for generated password
|
2024-07-29 14:38:39 +01:00 |
|
|
snipe
|
a77ece01a6
|
Fixed test name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 14:34:10 +01:00 |
|
|
snipe
|
1c1101aeac
|
Use the pwd_secure_min value (plus 5) for generated password
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 14:26:18 +01:00 |
|
|
snipe
|
de04ead55d
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-29 10:11:39 +01:00 |
|
|
snipe
|
bc18fac97e
|
Fixed missing div
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 10:11:11 +01:00 |
|
|
arne-kroeger
|
3a0b03348e
|
added additional tests
|
2024-07-29 11:06:36 +02:00 |
|
|
arne-kroeger
|
b18baf74d2
|
added options to checkout accessoires to locations and assets
Added #14979: add checkout functionality to accessoires
|
2024-07-29 10:54:53 +02:00 |
|
|
snipe
|
28c7355697
|
Fixed missing div
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 09:52:38 +01:00 |
|
|
snipe
|
0dd0baa511
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-27 10:12:23 +01:00 |
|
|
snipe
|
c3a296c19f
|
Added qr code back
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-27 10:12:13 +01:00 |
|
|
snipe
|
f6cc923e01
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-26 17:29:46 +01:00 |
|
|
snipe
|
aab29fbb6b
|
Use translated string for restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 16:47:40 +01:00 |
|
|
snipe
|
d9d3ff27ae
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-26 15:31:52 +01:00 |
|
|
snipe
|
614d05acb5
|
Merge pull request #15170 from uberbrady/simplify_css_skin_building
Dynamically iterate through the skin listing to build skins
|
2024-07-26 15:14:24 +01:00 |
|
|
snipe
|
e4a82edd3f
|
Merge pull request #15172 from snipe/features/blade_component_for_submit
Use blade component for submit redirect on asset edit/create
|
2024-07-26 15:13:30 +01:00 |
|
|
snipe
|
eceaa72781
|
And more tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 15:07:43 +01:00 |
|
|
snipe
|
ddf45c5ee9
|
Renamed test
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 15:00:16 +01:00 |
|
|
snipe
|
ff100c0b9f
|
Added more tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 14:58:10 +01:00 |
|
|
snipe
|
037cc4d098
|
More tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 14:27:07 +01:00 |
|
|
snipe
|
ff6e6ef88c
|
Added more tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 13:43:10 +01:00 |
|
|
snipe
|
e8ec11652f
|
Very basic checkin tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 13:16:31 +01:00 |
|
|
snipe
|
cd7f276c40
|
Fixed logging for component
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 13:09:21 +01:00 |
|
|
snipe
|
fc8bb82a02
|
Made dropdown wider
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:48:18 +01:00 |
|
|
snipe
|
5d7f1f77a3
|
Added redirect to checkin/checkout controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:48:07 +01:00 |
|
|
snipe
|
5dea3f4495
|
Added blade component to checkin/checkout pages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:47:33 +01:00 |
|
|
snipe
|
c6e709cd36
|
Added parameters
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:45:06 +01:00 |
|
Brady Wetherington
|
daf5a80081
|
Use a similar loop for the minification step for CSS
|
2024-07-26 12:03:03 +01:00 |
|
|
snipe
|
759ab78f80
|
Added more redirects
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 11:27:36 +01:00 |
|
|
snipe
|
b6d9f736e3
|
Pulled use session
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:41:28 +01:00 |
|
|
snipe
|
243ab51def
|
Fixed back button
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:40:48 +01:00 |
|
|
snipe
|
c5603a0e10
|
Merge remote-tracking branch 'origin/develop'
|
2024-07-26 10:26:23 +01:00 |
|
|
snipe
|
57f6ecb1da
|
Added created_by to license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:24:13 +01:00 |
|
|
snipe
|
64082ada1e
|
Updated test
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:08:51 +01:00 |
|
|
snipe
|
068535a80c
|
Removed logging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:08:46 +01:00 |
|
|
snipe
|
08f4fe5f35
|
Add status messages to redirect
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:02:34 +01:00 |
|
|
snipe
|
018b5684fc
|
Refactor helper method for redirection
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:02:03 +01:00 |
|
|
snipe
|
73a80a5fbc
|
Use blade component for redirect option
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 21:35:13 +01:00 |
|
|
Brady Wetherington
|
4c8bf9ae19
|
Dynamically iterate through the skin listing to build skins
|
2024-07-25 21:20:06 +01:00 |
|
|
snipe
|
f77d300549
|
Merge pull request #15169 from uberbrady/create_directories_when_needed_on_restore
Create intermediate directories on restore if needed - Fixes [SC-25950]
|
2024-07-25 18:45:54 +01:00 |
|