snipe
f2f8f96991
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# 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/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
2021-11-15 19:24:38 -08:00
snipe
960028b376
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-03 16:04:39 -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
snipe
a88f622ec3
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-18 16:45:51 -07:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
snipe
38a544ea42
Updated version branch to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-08 13:50:52 -07:00
snipe
116bc4ece4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-08 13:42:48 -07:00
snipe
5c92ddb2c6
Fixed version back to develop from master downmerge
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-30 12:57:06 -07:00
snipe
f99602c039
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-08-18 00:47:33 -07:00
snipe
0aa328f908
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 00:45:35 -07:00
snipe
615bdd0499
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:29:07 -07:00
snipe
5b5b70e639
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-06-28 11:01:45 -07:00
snipe
6521f16b80
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:00:34 -07:00
snipe
2e6bac7db5
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 18:36:43 -07:00
snipe
335f4e50a5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-06-23 16:07:01 -07:00
snipe
1808986bf5
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 16:06:30 -07:00
snipe
a67ce965ec
Update version.php
2021-06-22 20:13:03 -07:00
snipe
aebb30cea8
Fixed Cors wildcard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 00:23:51 -07:00
snipe
2cddd7faf0
Fixed filesystem config
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:26:10 -07:00
snipe
a5f144b4e0
Merge branch 'shift-46327' into develop-v6-integration
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-06-11 14:10:10 -07:00
snipe
a8123092af
Misc fixes for shift
...
// TODO - re-fix the exception handler
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:07:50 -07:00
snipe
aae6a8fc6c
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-10 17:42:29 -07:00
Laravel Shift
7e93086dd4
Default config files
...
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them and merged your true customizations -
where ENV variables may not be used.
2021-06-10 20:18:10 +00:00
Laravel Shift
cc3c59bf97
Shift config files
2021-06-10 20:18:10 +00: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
7d5a9180e6
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:57:56 -07:00
snipe
aa98e4ea7a
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-05-05 00:04:17 -07:00
snipe
6935d94184
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 00:03:33 -07:00
snipe
a1bc984d17
Generate production assets, bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:34:02 -07:00
snipe
31944cd4d4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:28:38 -07:00
Renee Margaret McConahy
e6c3d7fe57
Restore LOG_CHANNEL environment variable. ( #9464 )
...
This allows selecting the Monolog channel with the LOG_CHANNEL variable.
2021-04-21 11:40:23 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
Tetrachloromethane250
157d9e4ebb
Added #5977 : Add permission to view files attached to licenses ( #9264 )
...
* Add permission to view and modify files for licenses
* Actually use the permission
2021-04-05 21:51:47 -07:00
snipe
b2a3a80f96
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
# config/version.php
2021-03-17 20:04:43 -07:00
snipe
afb7fcfa3e
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 20:02:54 -07:00
snipe
9f3a8a43cc
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
2021-03-17 19:41:02 -07:00
snipe
72f7baf5ee
Removed unused class references
2021-03-17 16:56:32 -07:00
snipe
ab092fd209
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Providers/AppServiceProvider.php
# config/logging.php
# config/services.php
2021-03-15 12:29:29 -07:00
snipe
3fc24b4e61
Set spatie encryption to null
2021-03-09 21:07:41 -08:00
snipe
0fa07a4bca
Bumped point version
2021-03-09 16:19:21 -08:00
snipe
c3871c98df
Updated rollbar package
2021-03-09 16:16:57 -08:00
snipe
f05a8d782c
Added spatie encryption line
2021-03-09 13:38:53 -08:00
snipe
e9ee9ea2e9
Fixed rollbar integration
2021-03-09 12:40:00 -08:00
snipe
fcd805638e
Changed branch from develop to master
2021-02-25 16:54:23 -08:00
snipe
6373ef3283
Bumped version
2021-02-25 16:53:37 -08:00
snipe
db3f80bb9b
Fixed #9198 - added stdout as a log driver
2021-02-24 09:10:03 -08:00
snipe
a5731a3088
Updated hash
2021-02-19 10:09:22 -08:00
snipe
681c41bd18
Bumped version
2021-02-05 14:28:31 -08:00
snipe
fdde844ce5
Bumped version to 5.1.0
2021-02-02 21:48:42 -08:00
