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 |
|
Brady Wetherington
|
ae466be153
|
Fix license output, tweak CleanFloat function to handle numbers over 1 million
|
2021-09-28 19:10:25 -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
|
0031fab0fe
|
Added termination date, depreciation in license column selection [ch14505] (#9052)
|
2021-01-27 01:34:32 -08:00 |
|
|
snipe
|
5f5b80acae
|
Added maintained and reassignable to license listing
|
2020-09-04 10:02:04 -07:00 |
|
Daniel Meltzer
|
f0546bf689
|
Clean up Transformers and extract an isDeletable() method to models where it makes sense.
|
2020-05-23 15:24:10 -04: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
|
7b8362b64c
|
Added license categories
|
2018-05-04 21:01:38 -07:00 |
|
|
snipe
|
a19cef07bf
|
Check for gate on license key display
|
2017-12-05 16:26:23 -08:00 |
|
|
snipe
|
0c794c103b
|
Return an integer value for free seats if null
|
2017-11-02 20:23:04 -07:00 |
|
|
snipe
|
0bd09f9c46
|
Added sorting on available and total seats
|
2017-11-02 19:37:30 -07:00 |
|
|
snipe
|
27d795508d
|
Fixed n+1 query, changed checkout behavior to just ask for a license ID
We’re offloading the freeSeat() to the checkout page now
|
2017-11-02 19:16:09 -07:00 |
|
|
snipe
|
368ac5b85d
|
First stab at handling the n+1 issue on licenses
|
2017-11-02 18:20:42 -07:00 |
|
|
snipe
|
f47075c180
|
Removed depreciation from Licenses transformer
|
2017-11-02 17:18:53 -07:00 |
|
|
snipe
|
f2ee7dcabb
|
Fixes #4001 - license checkout not working
|
2017-09-25 21:40:43 -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
|
c2e8803d1e
|
Addec clone button back to models, assets, licenses, etc
|
2017-07-07 18:45:49 -07:00 |
|
|
snipe
|
59a4e161ff
|
Fixes checkout buttons on licenses list
|
2017-04-24 21:37:20 -07:00 |
|
|
snipe
|
bb2b6cb642
|
Foxed license name in licenses API
|
2017-03-11 02:52:50 -08:00 |
|
|
snipe
|
097096aa24
|
More custom date display via API
|
2017-03-03 17:53:42 -08:00 |
|
|
snipe
|
c67b44b3d5
|
Moving license index to new API format
|
2017-02-10 18:43:30 -08:00 |
|
|
snipe
|
eea90dda78
|
Added Gate integration into API transformers
|
2017-02-08 18:24:55 -08:00 |
|
|
snipe
|
a80af854ba
|
Switch companyName to company
|
2017-01-26 21:05:33 -08:00 |
|
|
snipe
|
c907414e71
|
Added escaping
|
2017-01-24 19:24:47 -08:00 |
|
|
snipe
|
e4e4e6ae47
|
Licenses transformer for API
|
2017-01-24 18:57:33 -08:00 |
|