snipe
|
253975ce72
|
Updated translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 20:27:55 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
|
snipe
|
27e0484072
|
I lied. Missed one
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:12:22 -07:00 |
|
|
snipe
|
ec76de607b
|
Final google login tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:08:29 -07:00 |
|
|
snipe
|
ed370a0104
|
Added translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:47:28 -07:00 |
|
Godfrey M
|
cb68f41d9c
|
added ldap_location to settings
|
2023-04-25 11:44:04 -07:00 |
|
|
snipe
|
b690ed97d5
|
Fixed unclosed parens in translation file
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-13 12:05:06 -07:00 |
|
|
Godfrey M
|
3c28242a2e
|
save button updates accordingly
|
2023-03-21 15:53:09 -07:00 |
|
|
Godfrey M
|
1bd37b49e9
|
adds translations for webhook names
|
2023-03-13 16:13:02 -07:00 |
|
|
Godfrey M
|
27a2ed5c79
|
Merge branch 'develop' into generalize_webhooks
|
2023-03-13 10:41:08 -07:00 |
|
|
Godfrey M
|
82504c9764
|
updates alerts to notifications in notification settings
|
2023-03-13 09:51:25 -07:00 |
|
|
Godfrey M
|
15c19a7ab7
|
silenced Discord option and validation, more translations
|
2023-03-08 10:35:45 -08:00 |
|
|
Godfrey M
|
69944853f9
|
more translations
|
2023-03-07 15:57:58 -08:00 |
|
|
Godfrey M
|
35dd0d8def
|
adds generalized webhooks, updates settings page, translations, validation
|
2023-03-07 15:48:21 -08:00 |
|
|
Godfrey M
|
354f04534e
|
add multi array, migration, still having issues
|
2023-03-01 12:30:32 -08:00 |
|
|
Godfrey M
|
e8fc895e51
|
"adds variables, but still not working"
|
2023-02-27 09:19:59 -08:00 |
|
|
snipe
|
a0b05bac8d
|
Updated translations with new strings and new translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-21 03:54:55 -08:00 |
|
|
snipe
|
27e5832a28
|
Use existing slack translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-15 14:06:52 -08:00 |
|
|
cram42
|
c2c009a018
|
Merge branch 'develop' into develop
|
2023-01-24 09:53:42 +08:00 |
|
Brady Wetherington
|
cbffd105a2
|
Fix LDAP default group feature
|
2023-01-09 15:23:19 -08:00 |
|
|
snipe
|
b77d5801fa
|
English is hard, apparently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-04 13:56:16 -08:00 |
|
|
Godfrey M
|
2e228ccb0b
|
redid a few things. should be good now :)
|
2022-12-15 10:45:42 -08:00 |
|
Cram42
|
a4b93d4bbd
|
Create Field Definitions helper control
|
2022-11-10 19:20:18 +08:00 |
|
|
Cram42
|
d37605ff18
|
Add localization strings
|
2022-11-01 20:01:18 +08:00 |
|
|
Godfrey M
|
f9ac447dd1
|
adds default group to LDAP
|
2022-10-18 15:18:09 -07:00 |
|
|
snipe
|
5ba01728d9
|
More text tweaking
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:51:25 -07:00 |
|
|
snipe
|
ae0eb378e4
|
Additional clarification
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:43:54 -07:00 |
|
|
snipe
|
ad8a2387f0
|
Updated help text to be more clear
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:38:37 -07:00 |
|
|
Godfrey M
|
193b31e427
|
select options working, testing sync then done
|
2022-08-31 12:58:33 -07:00 |
|
|
Godfrey M
|
fc6fefdb4e
|
adds migration, variables, checkbox,working on groups
|
2022-08-25 15:19:38 -07:00 |
|
|
snipe
|
5be7dee3d3
|
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-24 15:07:14 -07:00 |
|
|
snipe
|
5030c7e5ff
|
Added missing backups help string
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 10:24:03 -07:00 |
|
|
Godfrey M
|
4956eb0410
|
WIP: needs to be tested. adds ldap_manager field to ldap sync
|
2022-03-21 11:15:39 -07: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
|
42fcd29200
|
Fixed #10436 on master, applies #10449
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-22 21:06:54 -08:00 |
|
|
snipe
|
dd5f812d88
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
|
2022-02-20 13:29:12 -08:00 |
|
|
snipe
|
34ebc629c2
|
Remove unusued translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-20 11:15:56 -08:00 |
|
Ivan Nieto Vivanco
|
f1ba5c7742
|
Changed the warning message in the Backups page
|
2022-02-17 22:47:35 -06:00 |
|
|
snipe
|
5fe999eb02
|
Shored up the date math, updated the explanation
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:34:33 -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
|
16fb2213b5
|
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-28 12:40:03 -08: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
|
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 |
|
Alex Janes
|
edef640d35
|
Merge branch 'develop' into features/lock_logins_to_saml
|
2022-01-11 09:05:14 -05:00 |
|
Nuraeil
|
5bb2f6fa0f
|
Merge branch 'develop' into added-localized-strings
|
2022-01-09 17:40:54 +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
|
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 |
|
Alex Janes
|
5fe2083688
|
Adjusted the phrasing around auto-incrementing asset tags.
|
2021-12-31 16:33:30 -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 |
|
|
Wächtler, Yannick
|
2901525194
|
Merge branch 'snipe-develop' into added-localized-strings
|
2021-12-17 00:22:08 +01:00 |
|