Dampfklon
29e1d657e3
fix missed rename
2022-03-11 21:33:25 +01:00
snipe
99541f0bee
Fixed string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 21:05:23 -08:00
snipe
8b8e93d703
Fixed #10659 - wrong translation string reference
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 21:03:09 -08:00
Ivan Nieto Vivanco
d71aa859fc
Add custom date to checkin actionlogs and show it in the history of the asset tab
2022-02-08 11:43:24 -06:00
Godfrey M
5a70bba51b
changed model for default currency requirement check
2022-02-07 09:51:35 -08:00
snipe
c0cc90066f
Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop
...
Fixes: Column activated cannot be null for develop [sc-18528]
2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco
fa2f8409f9
Add a casting to a truthy/falsy that needs to be integer
2022-02-02 14:09:23 -06:00
snipe
ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin
...
Added #10454 : Quick Scan Checkin
2022-02-01 20:19:45 -08:00
snipe
5fded57ec6
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
2022-02-01 18:53:05 -08:00
snipe
2815e0d36e
Fixed audit email template (applies #10592 to master)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 17:27:32 -08:00
Brady Wetherington
eaba560877
We had a markdown failure in the upcoming audits table, this fixes it.
2022-02-01 14:06:01 -08:00
snipe
16fb2213b5
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-28 12:40:03 -08:00
snipe
a65fb63b6b
Merge pull request #10511 from inietov/features/audit_date_in_importer
...
Adds audit dates in the asset importer
2022-01-27 10:58:53 -08:00
snipe
0eab249819
Merge pull request #10569 from inietov/fixes/donked_layout_required_field_error_depreciation_develop
...
Fixes donked layout required field error depreciation in develop[sc-17111]
2022-01-27 10:57:33 -08:00
Ivan Nieto Vivanco
a87478d3ac
Set the actual field we are evaluating as required (months)
2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco
34819ec5cf
Fixes the appearance of some error messages
2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco
44349db597
Fixes the appearance of some error messages
2022-01-26 22:58:02 -06:00
snipe
b153138d1e
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop
...
Add Zip field in the User Importer for develop [sc-18556]
2022-01-26 16:58:37 -08:00
Ivan Nieto Vivanco
7383ec7f1e
Add an early return if the model id is not set (for new Asset Models)
2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco
c86ed892ab
Add Zip field in the User Importer
2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco
1fc71a4111
Add Zip field in the User Importer
2022-01-19 13:35:54 -06:00
Ivan Nieto Vivanco
9ae03f21dc
Adds condition to only charge custom field's livewire when the model is updated
2022-01-15 12:14:34 -06:00
snipe
af2e407543
Normalize array format in en language to the new shitty way
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 21:30:35 -08:00
snipe
ddfa5776c5
Updated language strings
...
This absolutely sucks. Something changed in CrowdIn or something else, which results in this push being *thousands* of files because someone somewhere decided that `return [];` was vastly inferior to `return array();`
I'll try to fix it. :(
FML
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 21:27:29 -08:00
snipe
da47f62d17
Added strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 21:20:38 -08:00
Ivan Nieto Vivanco
949fe2a14a
Adds last_audit_date and next_audit_date in the asset importer
2022-01-13 15:14:20 -06:00
snipe
67ba8a6281
Removed extra spaces
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 23:18:39 -08:00
snipe
9368ddeaf0
Added badge count on requestable assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 23:17:54 -08:00
snipe
f206d4ed4e
Fixed double div in current purchase value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 22:26:56 -08:00
snipe
224d0b2fd2
Small language file additions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 22:21:00 -08:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
snipe
df0da0f3bc
Fixed escaped string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 11:20:31 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin
2022-01-11 16:40:20 -05:00
Alex Janes
edef640d35
Merge branch 'develop' into features/lock_logins_to_saml
2022-01-11 09:05:14 -05:00
snipe
d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings
...
Added #10242 : Improved localized strings
2022-01-10 14:48:52 -08:00
snipe
b98c97b00e
Merge pull request #10265 from uberbrady/remove_old_ldap
...
Remove old ldap
2022-01-10 14:34:34 -08:00
snipe
b18b3812df
Back to master: Added some BS tables style overrides for mobile
...
This repeats 06e8e826
2022-01-10 15:23:43 -06:00
Wächtler, Yannick
f906dbd81e
Added missed translation strings, fixed the column width for the date selector (too small in certain languages)
2022-01-10 09:21:23 +01:00
Nuraeil
5bb2f6fa0f
Merge branch 'develop' into added-localized-strings
2022-01-09 17:40:54 +01:00
Wächtler, Yannick
b77e7f88d4
fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix
2022-01-09 17:35:28 +01:00
snipe
0f5bb0e65d
Localize bakcup restore strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-07 16:50:19 -08:00
Wächtler, Yannick
c3ab4c7512
Fixed the tables not displaying the correct language
2022-01-06 14:29:10 +01:00
Wächtler, Yannick
04d649122b
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
2022-01-06 12:35:37 +01:00
Nuraeil
271c364ef8
Merge pull request #9 from snipe/develop
...
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
2022-01-04 10:48:51 +01:00
Brady Wetherington
3c7f2e89ec
Merge branch 'develop' into remove_old_ldap
...
Had to re-do the composer install because the conflicts were too complicated.
2022-01-03 12:56:58 -08:00
Alex Janes
5fe2083688
Adjusted the phrasing around auto-incrementing asset tags.
2021-12-31 16:33:30 -05:00
snipe
8be6d10dbe
Fixed #10467 - Safari only font-awesome bug
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-24 12:30:34 -08:00
snipe
f4ef828332
Fixex js table export
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-24 11:17:36 -08:00
Alex Janes
ea93f82bde
added the notes field to allow users to quickly add notes to multiple checkins at once
2021-12-23 17:37:48 -05:00
snipe
312200bf44
Removed duplicate "department" entry in importer, pulls #10460 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-21 13:37:20 -08:00
