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 |
|
|
snipe
|
903609b5a5
|
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 19:59:55 -07:00 |
|
Laravel Shift
|
934afa036f
|
Adopt Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
|
2021-06-10 20:15:52 +00:00 |
|
|
snipe
|
adf64361e8
|
Updated most recent translations
|
2020-11-10 04:43:02 -08: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
|
5504dd435f
|
Updated transslations
|
2017-12-12 09:20:57 -08:00 |
|
|
snipe
|
c776fa4f7b
|
Updated language strings
|
2017-10-17 18:52:20 -07:00 |
|
|
snipe
|
c8c279588f
|
Updated language strings
|
2017-07-07 13:14:51 -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
|
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
|
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 |
|