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
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
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
, which alone improves the mobile view immensely,
on master.
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
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
Ivan Nieto Vivanco
e03a8cc721
Delete an extra entry for Departments when importing Users via GUI
2021-12-21 14:42:51 -06:00
snipe
48d3bfef03
Merge pull request #10421 from Robert-Azelis/patch-5
...
Create new user account from asset form - additional fields
2021-12-20 17:05:38 -08:00
Alex Janes
ead142cdf7
Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR)
2021-12-18 12:00:07 -05:00
Alex Janes
227ca61301
Changed phrasing of "SAML Force Login" to "SAML Default Login" (English only at this point)
2021-12-18 11:56:36 -05:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
snipe
4ca2252e3b
Switches GET to POST for request assset
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:32:29 -08:00
Wächtler, Yannick
2901525194
Merge branch 'snipe-develop' into added-localized-strings
2021-12-17 00:22:08 +01:00
Wächtler, Yannick
279fced877
merge
2021-12-17 00:14:36 +01:00
snipe
398180dc59
Small merge unmagling
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:38:04 -08:00
snipe
c3d55ee27e
Merge master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
2021-12-16 14:26:24 -08:00
Nuraeil
c3b7576d99
Merge pull request #7 from snipe/develop
...
Develop
2021-12-14 19:51:40 +01:00
Wächtler, Yannick
484b996879
fixed merge conflicts
2021-12-14 19:48:59 +01:00
snipe
52322806fa
Merge pull request #10434 from inietov/fixes/v6_components_error
...
Fix route to checkout components from the details page
2021-12-14 10:41:24 -08:00
Wächtler, Yannick
4397a12efc
Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop
2021-12-14 19:37:27 +01:00
Ivan Nieto Vivanco
d083f89f30
Delete extra character remaining from previous tests :(
2021-12-14 12:32:30 -06:00
Ivan Nieto Vivanco
2402f00a2e
Fix route to checkout components from the details page
2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco
c80aa2a289
Add title column to custom reports
2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco
0037cdb00c
Add title column to custom reports
2021-12-13 20:27:23 -06:00
snipe
1854d7d668
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-13 11:28:01 -08:00
Robert-Azelis
01608d81ab
Update user.blade.php
...
Create new user account from asset form - additional fields #10420
2021-12-13 09:22:25 +01:00
snipe
39b0dc136c
Added LDAP strings back
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-11 10:14:35 -08:00
snipe
e1bf3b50f4
Added model number to accessory report
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-10 15:09:29 -08:00
snipe
ff97b359ad
Removed form request on ajax, cleaned up some other things
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 17:58:46 -08:00
snipe
cde2bad297
Small mods to slack jquery
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 15:56:05 -08:00
snipe
713fbdc0a6
Merge pull request #10239 from Godmartinz/Adds-info-on-how-to-nullify-reorder-alerts
...
adds info on how to nullify reorder alerts for consumables, component…
2021-12-08 14:26:22 -08:00
snipe
6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk
...
WIP - Fixing unit tests, switching to dusk
2021-12-06 14:19:36 -08:00