snipe
06a05e6340
Added remote to view
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 05:37:28 -08:00
snipe
43c1949092
Add remote option to user
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 05:35:26 -08:00
snipe
a9069e65e5
Don’t show groups in menu if there are none yet
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 04:39:39 -08:00
snipe
1400c610a1
Use correct button translation
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 04:22:44 -08:00
snipe
67ed0d91c0
Handle file_get_contents more gracefully
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 02:54:37 -08:00
snipe
349715576a
Bumped RC version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 22:23:24 -08:00
snipe
0d787fcc94
Updated language files
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 22:21:44 -08:00
snipe
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
snipe
afd83311aa
Fixed version number (vV)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:58:54 -08:00
snipe
29a2e80984
Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display
...
Retry fix bad metadata display
2022-03-03 20:49:30 -08:00
snipe
fa576bc78f
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:45:34 -08:00
snipe
3e22dce117
Merge pull request #10774 from snipe/features/added_notes_to_accessories_etc
...
Fixed #6918 - added notes to accessories, components, consumables
2022-03-03 20:41:18 -08:00
snipe
9adcf58ae5
Added notes migration
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:30:58 -08:00
snipe
5266b2c71f
Added notes field to view blades
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:30:27 -08:00
snipe
94dded3785
Added notes field to presenters for table view show/hide columns
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:30:07 -08:00
snipe
ac8a7d0bc9
Made notes field fillable and searchable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:48 -08:00
snipe
6fca8350f9
Added notes field to transformers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:35 -08:00
snipe
9acb5413f6
Added notes field to controllers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:25 -08:00
snipe
08a2fe4edb
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api
...
Features/adds ldap import and assets count to user api
2022-03-03 19:15:14 -08:00
snipe
6abe8f296b
We don’t need the users table here
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:12:03 -08:00
snipe
a53a67be4a
Added consumables, licenses, accessories count filters too
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:08:08 -08:00
snipe
b72cac3511
Adds ldap_import and assets_count filter to user API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:03:35 -08:00
snipe
698b7301b6
Merge pull request #10772 from snipe/fixes/use_correct_gate_for_maintainances
...
Use “update” instead of edit in gate
2022-03-03 18:50:33 -08:00
snipe
c940d36fff
Updated maintenance gate in API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:49:54 -08:00
snipe
cd12028845
Use “update” instead of edit in gate
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:47:20 -08:00
Brady Wetherington
3225605ef3
Handling the old weirdly-formatted data wasn't quite working.
2022-03-03 18:17:29 -08:00
Brady Wetherington
31dde20a2b
Actually, re-introduce this code comment as it's still relevant and tricky
2022-03-03 15:48:04 -08:00
Brady Wetherington
aa36ebc947
Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display
2022-03-03 15:46:19 -08:00
Brady Wetherington
92434fa943
Revert "Revert "refactor and clean up attribute-changing logic for assets""
...
This reverts commit bdc737ce0c
2022-03-03 15:45:54 -08:00
Godfrey M
14bd07e97d
gerge branchevelop' into gh10191-css-dropdownmenu
2022-03-03 10:14:30 -08:00
Godfrey M
4435ea95fd
removes changes to mix-manifest
2022-03-03 09:47:11 -08:00
Godfrey M
f115385243
C&P mix-manifest to be tracked
2022-03-03 09:32:05 -08:00
Godfrey M
708dc08b4f
mixes color contrast on dropdown menu from navbar
...
on file
2022-03-03 09:27:52 -08:00
Brady Wetherington
0164354463
Fix for the weird error that blew up the demo when my PR got merged
2022-03-02 15:15:16 -08:00
snipe
bdc737ce0c
Revert "refactor and clean up attribute-changing logic for assets"
...
This reverts commit 290baf1c8d
2022-03-02 14:45:14 -08:00
snipe
733b3a7550
Merge pull request #10682 from uberbrady/fix_bad_metadata_display
...
Fixed weird JSON-handling on log_meta updates
2022-03-02 14:36:38 -08:00
snipe
16fd109540
Merge pull request #10417 from inietov/fixes/trying_to_get_property_id_of_nonobject
...
Fixes trying to get property 'id' of non-object when running develop seeders.
2022-03-02 14:35:53 -08:00
snipe
2b4ee4827f
Merge branch 'develop' into fixes/trying_to_get_property_id_of_nonobject
2022-03-02 14:35:35 -08:00
snipe
3339a691e1
Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint
...
Added consumables endpoint to user API
2022-03-02 14:33:45 -08:00
snipe
dc1e0ecdb7
Merge pull request #10739 from insert-waffle/fixes/prevent_double_values_email
...
Feature: Prevent showing of double values in a checkin or checkout email
2022-03-02 14:28:22 -08:00
snipe
2eef43e8bf
Applies develop fix to master for location drop downs
2022-03-01 12:43:35 -08:00
snipe
5d1cd89838
Merge pull request #10751 from aranar-pro/bug_fix/location-drop-down-#10701
...
Fix for location and model drop down with granular permissions.
2022-02-28 16:33:12 -08:00
Andrew Roth
74248a4314
removing composer.lock from PR
2022-02-28 19:30:32 -05:00
Andrew Roth
2e60420aeb
Fix for location and model drop down with granular permissions.
2022-02-28 17:38:38 -05:00
Jens Maes
9b88f650d2
Prevents showing double values
...
- If the asset name and tag are the same, the tag does not get shown in an email.
- If the model name is the same as the model number (when importing from LanSweeper for example), do not show the model number.
2022-02-25 08:19:46 +01:00
snipe
336d8e6574
Updated version
2022-02-24 18:17:15 -08:00
Godfrey M
533670f3f1
faulty method for converting asset acceptance to pdf
2022-02-24 14:50:16 -08:00
snipe
a5c16c6a9c
Update @insert-waffle as a contributor
2022-02-24 14:47:48 -08:00
snipe
1ee37212f1
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2022-02-24 14:47:14 -08:00
snipe
ed43d36895
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-24 14:47:09 -08:00
