Marcus Moore
|
680cce3ee2
|
Align indents
|
2024-08-20 16:42:29 -07:00 |
|
|
Marcus Moore
|
6c5ec6a16c
|
Get datepicker working
|
2024-08-20 16:41:24 -07:00 |
|
|
Marcus Moore
|
5d1f98bf93
|
Simplify by directly wire:modeling
|
2024-08-20 15:38:43 -07:00 |
|
Godfrey M
|
9d484077ae
|
missed a file
|
2024-08-20 14:24:37 -07:00 |
|
|
Godfrey M
|
9858b0f37f
|
fixes info tab for users and assets
|
2024-08-20 14:23:55 -07:00 |
|
snipe
|
973e2e5756
|
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
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-08-20 19:45:53 +01:00 |
|
|
snipe
|
09033b19a7
|
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-08-20 19:44:13 +01:00 |
|
|
snipe
|
46ed076428
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-20 19:42:56 +01:00 |
|
|
snipe
|
5fdeb9c413
|
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20
Updated languages
|
2024-08-20 19:42:08 +01:00 |
|
|
snipe
|
22d3734075
|
Merge pull request #15350 from marcusmoore/icon-component-updates
Fixed icon not rotated and simplified component
|
2024-08-20 19:34:38 +01:00 |
|
|
Marcus Moore
|
eca6b03f44
|
Allow id to be rendered
|
2024-08-20 11:08:53 -07:00 |
|
|
Marcus Moore
|
bbdbec7197
|
Rely on $attributes behavior rendering passed attributes
|
2024-08-20 11:00:39 -07:00 |
|
|
snipe
|
6c450d1338
|
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 18:18:17 +01:00 |
|
spencerrlongg
|
a8cd1027f3
|
rm commented code
|
2024-08-20 11:40:15 -05:00 |
|
|
snipe
|
d3a555ce91
|
Updated assets
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
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 11:49:39 +01:00 |
|
|
snipe
|
0f8e041809
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-08-20 11:49:32 +01:00 |
|
|
snipe
|
d99b306ae9
|
Merge pull request #15345 from snipe/add_trim_strings_middleware
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
Added TrimStrings middleware
|
2024-08-20 11:46:55 +01:00 |
|
|
snipe
|
74136761df
|
Added TrimStrings middleware
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 11:45:13 +01:00 |
|
|
snipe
|
f597d64339
|
Merge pull request #15342 from snipe/snyk/bs-tables
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
|
2024-08-20 10:17:26 +01:00 |
|
|
snipe
|
0072f1500e
|
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 10:16:27 +01:00 |
|
|
snipe
|
64bed01a91
|
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
|
2024-08-20 10:13:43 +01:00 |
|
|
snipe
|
f6319e11e7
|
Added fa-fw to sidebar elements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 10:11:27 +01:00 |
|
|
snipe
|
5d9f988df3
|
Added fw class to topnav icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-20 10:01:49 +01:00 |
|
|
snipe
|
f8c72fb0ac
|
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
Improved handling attempted access of deleted files in importer
|
2024-08-20 09:57:03 +01:00 |
|
akemidx
|
8e1111c681
|
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
|
2024-08-19 19:33:44 -04:00 |
|
|
snipe
|
886514a25f
|
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
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
Fixed `)` being added to expected asset checkin report email header
|
2024-08-19 22:46:08 +01:00 |
|
|
Marcus Moore
|
fa765667f2
|
Merge branch 'develop' into livewire-importer-improvements
|
2024-08-19 14:41:58 -07:00 |
|
|
Marcus Moore
|
434bdcd6d4
|
Add missing parentheses to conditional
|
2024-08-19 14:31:47 -07:00 |
|
|
snipe
|
be5f3f38f8
|
Settings pages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 14:48:12 +01:00 |
|
|
snipe
|
08c3a25b39
|
Little more padding
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 14:16:57 +01:00 |
|
|
snipe
|
34cd4b6244
|
Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 14:15:36 +01:00 |
|
|
snipe
|
d89c8682be
|
Reversed location button ordering
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:46:31 +01:00 |
|
|
snipe
|
6f024849e9
|
Few more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:39:24 +01:00 |
|
|
snipe
|
e048f0955f
|
More icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:27:21 +01:00 |
|
|
snipe
|
479b2b4fd3
|
More icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:23:08 +01:00 |
|
|
snipe
|
84f14a05bd
|
Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:20:19 +01:00 |
|
|
snipe
|
8d52fa51b1
|
Fixed suppliers buttons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:20:06 +01:00 |
|
|
snipe
|
229d8b9bf5
|
Added location restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:19:59 +01:00 |
|
|
snipe
|
eb8d43a804
|
Updated buttons on models
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 12:32:44 +01:00 |
|
|
snipe
|
f82266fade
|
Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 11:58:31 +01:00 |
|
|
snipe
|
b4b6f7a35f
|
Added css-consumable to overrides for table headers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 11:58:21 +01:00 |
|
|
snipe
|
0bc995b87f
|
Updated more icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 11:58:05 +01:00 |
|
|
snipe
|
59725f2031
|
Removed extra debugging in test
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 11:57:40 +01:00 |
|
|
snipe
|
00bc9ac806
|
Fixed spacing
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 22:39:14 +01:00 |
|
|
snipe
|
f200960a57
|
Aaaand more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 22:26:57 +01:00 |
|
|
snipe
|
c700127f1a
|
Updated user view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 22:09:00 +01:00 |
|
|
snipe
|
ae2f9571b4
|
And still more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 21:57:37 +01:00 |
|
|
snipe
|
a77dcad336
|
More links
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 20:30:53 +01:00 |
|
|
snipe
|
7ace9324b4
|
Added padlock sound
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 20:30:22 +01:00 |
|
|
snipe
|
d2e889e927
|
Still more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-18 19:21:59 +01:00 |
|