akemidx
|
fffcbdc44d
|
Merge remote-tracking branch 'upstream/develop' into upstream/dev
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
|
2024-07-31 07:14:06 -04:00 |
|
|
akemidx
|
8d1fa362f7
|
restoring code
|
2024-07-31 07:13:42 -04:00 |
|
snipe
|
31a2765b30
|
Merge pull request #15145 from Godmartinz/purge-storage
Added user storage files to purge command
|
2024-07-31 10:16:08 +01:00 |
|
|
snipe
|
e79a5b7efe
|
Merge pull request #15193 from Godmartinz/admin-settings
Fixed admin boxes alignment
|
2024-07-31 08:54:44 +01:00 |
|
|
snipe
|
ca531e85f3
|
Merge pull request #15194 from spencerrlongg/bug/sc-26247
Fixed A Translation Issue With Auth
|
2024-07-31 08:54:09 +01:00 |
|
spencerrlongg
|
0941c0944a
|
ok, found issue, but need to test some things now...
|
2024-07-30 22:55:15 -05:00 |
|
|
spencerrlongg
|
9b80843c77
|
tests a little broken, added some nullchecks
|
2024-07-30 21:44:22 -05:00 |
|
|
spencerrlongg
|
8684a3efc3
|
delete note, add trait to other request
|
2024-07-30 21:22:46 -05:00 |
|
|
akemidx
|
fccfce2ae8
|
first thought
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
|
2024-07-30 19:27:37 -04:00 |
|
Godfrey M
|
935d2ce29a
|
fixes admin box alignment
|
2024-07-30 15:05:09 -07:00 |
|
|
spencerrlongg
|
437ddc01b4
|
removed extraneous $request->validate() arguments
|
2024-07-30 16:26:24 -05:00 |
|
Godfrey Martinez
|
f19e58b352
|
Merge pull request #21 from Godmartinz/status_labels_check_emails_checkout
adds Status labels to check in and out emails
|
2024-07-30 09:41:05 -07:00 |
|
|
Godfrey M
|
eb6f330e67
|
adds status to check in and out
|
2024-07-30 09:38:39 -07:00 |
|
|
Godfrey M
|
f19899543d
|
changed error to info
|
2024-07-30 09:18:17 -07:00 |
|
|
snipe
|
3a2611f8e1
|
Merge pull request #14565 from spencerrlongg/bug/sc-23936
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
Checks that custom fields exist before saving
|
2024-07-30 11:36:55 +01:00 |
|
|
Godfrey M
|
53ad312700
|
added missing closing bracket
|
2024-07-29 15:17:32 -07:00 |
|
|
Godfrey M
|
89d375daad
|
add indents
|
2024-07-29 15:15:41 -07:00 |
|
|
Godfrey M
|
d46f9776fe
|
remove text
|
2024-07-29 15:14:58 -07:00 |
|
|
Godfrey M
|
f9a47c8a9f
|
adds a try catch
|
2024-07-29 15:12:48 -07:00 |
|
|
Godfrey M
|
e395ee1878
|
adds a try catch
|
2024-07-29 15:12:32 -07:00 |
|
|
snipe
|
4971c54b05
|
Fixed seeder
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-07-29 20:17:25 +01:00 |
|
|
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 |
|