snipe
e321aeabae
Merge branch 'master' into integrations/2020-08-31-v5-rc
...
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
2020-08-31 12:14:44 -07:00
Godfrey Martinez
0c1a1de2a2
Update general.php
...
fixed typo
2020-07-22 11:24:36 -07:00
Godfrey M
20c9ae5818
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
2020-07-22 10:21:19 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
70cb5ed215
Updated language strings
2018-07-18 08:55:38 -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
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
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
Andrea Bergamasco
4f73a13c6b
Hotfix/translate row delete msg ( #3305 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added missing translation to bootstrap table partial
The "Are you sure to delete" confirmation was hardcoded. Added translation row to all locales and other small corrections to it/general lang file.
2017-02-21 14:25:46 -08: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
f9a06a183e
Updated language strings
2016-10-25 12:30:52 -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
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
ed9c6183c1
Updated language files
2016-05-16 21:54:13 -07:00
snipe
2ec44ae14a
Updated translation strings with new purge text
2016-04-19 12:26:49 -07:00
snipe
fe00b0e401
Version 3 - hold onto your butts
2016-03-25 01:18:05 -07:00
