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 |
|
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 |
|
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
|
2e5820e29d
|
small phrase change
|
2021-12-20 23:31:10 -05:00 |
|
|
Alex Janes
|
b01a4468c7
|
refactored from bulkcheckin to quickscancheckin
|
2021-12-20 23:27:36 -05:00 |
|
|
Alex Janes
|
55b8d080b9
|
more lang changes
|
2021-12-20 19:39:06 -05:00 |
|
|
Alex Janes
|
bc4fe88ac0
|
First version of bulk checkin
|
2021-12-19 16:53:31 -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 |
|
|
Wächtler, Yannick
|
279fced877
|
merge
|
2021-12-17 00:14:36 +01: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 |
|
|
Wächtler, Yannick
|
484b996879
|
fixed merge conflicts
|
2021-12-14 19:48:59 +01: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 |
|
|
snipe
|
39b0dc136c
|
Added LDAP strings back
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-11 10:14:35 -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
|
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 |
|
|
snipe
|
ebdbc20740
|
Adds stricter validation for slack endpoints
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-06 11:40:24 -08:00 |
|
|
snipe
|
d08c1787a1
|
First steps at getting dusk working
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:09:29 -08:00 |
|
|
Wächtler, Yannick
|
9164daf5bc
|
Added localized strings for admin/settings
|
2021-11-19 15:23:48 +01:00 |
|
|
Wächtler, Yannick
|
6917d59185
|
Added localized strings for reports
|
2021-11-19 12:39:19 +01:00 |
|
|
Wächtler, Yannick
|
04fec144a0
|
Added localization strings for partials, added file structure
|
2021-11-19 12:12:11 +01:00 |
|
|
Wächtler, Yannick
|
5a2f8788a9
|
Fixed merge issue in view.blade.php and added translatable string
|
2021-11-16 19:34:20 +01:00 |
|
|
Wächtler, Yannick
|
6feb39f6b9
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop
|
2021-11-16 08:50:45 +01:00 |
|
Ivan Nieto Vivanco
|
b07db3b324
|
Added the current_value string to correspondig 'en' language directory
|
2021-11-11 14:43:47 -06:00 |
|
|
snipe
|
cf070866f0
|
INCOMPLETE: Added more generic language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:07:47 -08:00 |
|
|
Wächtler, Yannick
|
6b2801867d
|
Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general
|
2021-11-04 20:15:23 +01:00 |
|
|
Wächtler, Yannick
|
97030866e4
|
Adding newly added template files
|
2021-11-04 20:12:47 +01:00 |
|
|
Wächtler, Yannick
|
63b30489df
|
Added localized strings for notifications
|
2021-11-02 15:44:57 +01:00 |
|
|
Wächtler, Yannick
|
670b70c7e1
|
Added localized strings for models
|
2021-11-02 15:34:50 +01:00 |
|
|
Wächtler, Yannick
|
c0891e6827
|
Added localized strings for modals
|
2021-11-02 15:27:13 +01:00 |
|
|
Wächtler, Yannick
|
30d30490a3
|
Added localized strings for locations
|
2021-11-02 15:14:54 +01:00 |
|
|
Wächtler, Yannick
|
4fcd4a930f
|
Added localized strings for layouts
|
2021-11-02 14:45:58 +01:00 |
|
|
Wächtler, Yannick
|
8bad9c5140
|
Added localized strings for kits
|
2021-11-02 14:25:21 +01:00 |
|
|
Wächtler, Yannick
|
c16ade2d87
|
Added localized strings for hardware
|
2021-11-02 14:02:48 +01:00 |
|
|
Wächtler, Yannick
|
167bf97d46
|
Added localized strings for groups
|
2021-11-02 12:03:41 +01:00 |
|
|
Wächtler, Yannick
|
e825fa81aa
|
Added localized strings for depreciations
|
2021-11-02 11:50:56 +01:00 |
|
|
Wächtler, Yannick
|
a96c53784c
|
Added localized strings for custom_fields
|
2021-11-02 11:27:53 +01:00 |
|
|
Wächtler, Yannick
|
c11af0e222
|
Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php
|
2021-11-02 10:40:41 +01:00 |
|
|
Wächtler, Yannick
|
433d6fd3e0
|
Added localized strings for admin/companies
|
2021-11-02 10:23:15 +01:00 |
|
|
Wächtler, Yannick
|
b784e63aa8
|
Added localized strings for account
|
2021-11-02 10:13:22 +01:00 |
|
Godfrey M
|
1683b04244
|
changed min_amt_help message
|
2021-11-01 11:05:44 -07:00 |
|
|
Godfrey M
|
b0da936c5c
|
changed get to receive in the message
|
2021-10-27 16:41:38 -07:00 |
|
|
Godfrey M
|
8719667c44
|
adds info on how to nullify reorder alerts for consumables, components and accessories
|
2021-10-27 16:36:04 -07:00 |
|
|
snipe
|
aa8f1378c9
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
|
2021-10-20 17:26:41 -07:00 |
|
Dampfklon
|
ab4a234e20
|
fix rebase errors
|
2021-10-07 21:32:57 +02:00 |
|
|
Dampfklon
|
4418ad2340
|
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
|
2021-10-07 21:03:46 +02:00 |
|