DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
11022 commits 95 branches 267 tags 294 MiB
Commit graph

53 commits

Author SHA1 Message Date
snipe 0bb8cc63c5 Updated translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-13 17:12:01 +01:00
snipe aa9420cbad Updated Dutch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:44:15 -07: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 014eab3abc Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 11:09:26 -08:00
snipe 1360ce90a5 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:52:45 -07:00
snipe 81d2a3acda Updated lnaguage strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 17:48:43 -07:00
snipe 9db0b038a5 Updated translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 15:29:28 -07:00
snipe df1e2687d6 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 17:35:02 -07:00
snipe 5be7dee3d3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 15:07:14 -07:00
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
 2022-04-28 17:49:06 +01:00
snipe 5fba8202d6 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-11 15:40:58 +01:00
snipe 0d787fcc94 Updated language files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 22:21:44 -08:00
snipe 16fb2213b5 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-28 12:40:03 -08:00
snipe 1854d7d668 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-13 11:28:01 -08:00
snipe 903609b5a5 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:59:55 -07:00
snipe a4e307c4db Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-08 13:49:33 -07:00
snipe b01baec7a8 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 18:11:48 -07:00
snipe 382fb31670 Updated translations (Finnish, Polish, Japanese, Turkish, Spanish) 2020-12-30 12:51:09 -08:00
snipe 9b1e7ba8a6 Updated translations with new strings 2020-11-17 13:22:53 -08:00
snipe adf64361e8 Updated most recent translations 2020-11-10 04:43:02 -08:00
snipe 67f60127be Updated translations with latest from CrowdIn 2020-11-09 14:52:11 -08:00
snipe 893454dca7 Updated translations 2019-12-06 12:03:04 -08:00
snipe 3b21a19491 Updated language strings 2018-09-28 11:54:52 -07:00
snipe 78d27e82c8 Updated language strings 2018-07-18 20:03:31 -07:00
snipe 70cb5ed215 Updated language strings 2018-07-18 08:55:38 -07:00
snipe 260749337e Updated languages 2018-05-21 14:54:36 -07:00
snipe 8194660d16 Updated languages 2018-05-02 14:32:50 -07:00
snipe 4b7eaf6dae Updated translations 2018-03-22 20:01:45 -07:00
snipe 58eedce6fe Updated language files 2018-01-20 04:53:04 -08:00
snipe 5504dd435f Updated transslations 2017-12-12 09:20:57 -08:00
snipe 876dde1280 Fixed #4428 - updated translations 2017-11-15 15:31:34 -08:00
snipe 97ea68b15c Updated translations 2017-11-04 00:45:50 -07:00
snipe c776fa4f7b Updated language strings 2017-10-17 18:52:20 -07:00
snipe ae8c9d6afc Updated translations 2017-09-06 18:05:32 -07:00
snipe e27f6a483d Updated translations 2017-08-25 07:32:57 -07:00
snipe c8c279588f Updated language strings 2017-07-07 13:14:51 -07:00
snipe a7132fcdd7 Updated translation strings 2017-04-06 21:36:33 -07:00
snipe 34a9564f30 Updated language strings 2017-01-10 17:53:06 -08:00
snipe f532abebd4 Updated translations 2016-12-03 17:10:05 -08:00
snipe cea255995c Fixes #106 - adds Google Authenticator support (#2842) 
* refactor to clean up LDAP login, and make the login method easier to handle.

* Login refactor cleanup

* Google 2FA package

* Adds Google Authenticator two-factor

* Removed unused blade

* Added optin setting in profile

* Removed dumb comments

* Made lock_passwords check more consistent

* Additional two factor strings

* Lock passwords check

* Display feature disabled text if in demo mode

* Two factor admin reset options

* Translation strings
 2016-10-29 05:50:55 -07:00
snipe 1e82058f4d Fixes #2763 - added missing translations methods for dashboard 2016-10-12 13:01:29 -07:00
snipe fe5e813970 Updated translations 2016-10-04 12:23:02 -07:00
snipe 308fcf96de Updated language strings 2016-08-25 17:43:07 -07:00
snipe 0f72989953 Updated language strings 2016-07-29 14:32:31 -07:00
snipe 014e7ba9c4 Updated strings 2016-06-22 14:39:19 -07:00
snipe 0fd43c0a5d Updated language strings 2016-06-13 12:16:43 -07:00
snipe fd32f6d4d5 New language strings 2016-06-02 19:01:09 -07:00
snipe aad1ba4ab3 Updated language strings 2016-05-20 00:47:03 -07:00
snipe be0a60e049 Updated strings 2016-05-19 23:27:08 -07:00
snipe ed9c6183c1 Updated language files 2016-05-16 21:54:13 -07:00