snipe
|
43c57c8461
|
Merge master into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# 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/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
|
2022-01-12 20:51:33 -08:00 |
|
Alex Janes
|
d0bfd8dfd2
|
Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly.
|
2021-12-23 20:54:34 -05: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 |
|
Martin Meredith
|
e3e0d57f56
|
Minor code cleanup bits and bobs (#6805)
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
|
2019-03-13 20:12:03 -07:00 |
|
|
snipe
|
ecf041fa10
|
Fixes #4043 - standardize groups API response
|
2017-09-27 15:18:29 -07:00 |
|
|
snipe
|
847262e989
|
Fixes #3774 - fixes for inconsistent API responses (‘’ vs null) and adds escaping
|
2017-07-25 23:40:30 -07:00 |
|
|
snipe
|
fdd88af44a
|
Fixes #3556
|
2017-05-15 19:14:55 -07:00 |
|
|
snipe
|
097096aa24
|
More custom date display via API
|
2017-03-03 17:53:42 -08:00 |
|
|
snipe
|
eea90dda78
|
Added Gate integration into API transformers
|
2017-02-08 18:24:55 -08:00 |
|
|
snipe
|
f1c4aed5b5
|
Removed additional groups API fields
|
2017-02-03 19:35:22 -08:00 |
|
|
snipe
|
541a5e6776
|
Groups API starter
Edit/Create still broken for some reason
|
2017-02-01 18:50:28 -08:00 |
|