Martin Meredith
f403db274a
(develop) Fix asset auto-incrementation ( #6806 )
...
* Fix auto-increment not updating
This is due to the addition of caching for settings. If we're not
explicitly saving the Settings model, then the cache isn't getting
updated, causing the asset tag auto-increment to get an old cached
version with the wrong number
* Move Setting cache clear to an observer
2019-03-13 10:58:35 -07:00
Martin Meredith
a462e91983
(develop): Fix failing Unit Tests ( #6807 )
...
* Reference correct class for Licence Model
* Make sure we activate users in test to send Welcome Notification
2019-03-13 10:57:43 -07:00
snipe
400907cc40
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-03-08 16:24:12 -08:00
snipe
74f33441d3
Merge branch 'VELIKII-DIVAN-develop' into develop
2019-03-08 16:23:53 -08:00
snipe
61afdeac2e
Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop
2019-03-08 16:18:48 -08:00
Martin Meredith
55cbbf2b00
Fixes #6794 : Fix URLs to access some 'missing' images ( #6795 )
...
* Fix image path for Model view
* Fix URLs for images in account view
* Fix Supplier view Image URL
2019-03-08 12:47:37 -08:00
Martin Meredith
daf6d98a3b
Remove test data for Pie ( #6793 )
2019-03-08 12:46:47 -08:00
snipe
ab1f34604e
Add @Mezzle as a contributor
2019-03-06 18:46:36 -08:00
Martin Meredith
0840ab41d5
Hotfix: Fix ability to create assets ( #6790 )
2019-03-06 16:37:58 -08:00
snipe
5293cb30bd
Merge branch 'fixes/only_present_image_url_if_image_present_in_profile_api' into develop
2019-03-05 23:54:08 -08:00
snipe
0b0813b260
Fixed error if item requested or request was deleted
...
ch628
2019-03-05 23:46:40 -08:00
snipe
6f1a70ee09
Fixed ch1086 - Merge branch 'fixes/search_consumables_by_item_number' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
2019-03-05 23:23:46 -08:00
snipe
3b41aa52c8
Added ability to search consumables by item number
...
Fixes ch1086
2019-03-05 23:20:16 -08:00
snipe
c211cc733c
Bumped hash
2019-03-05 21:26:24 -08:00
snipe
28a450ea25
Added ability to do full name search in user dropdown selectlist ( #6784 )
2019-03-05 21:13:39 -08:00
snipe
6696685d0b
Merge branch 'fixes/full_name_search_user_selectlist' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# routes/api.php
2019-03-05 20:57:10 -08:00
snipe
f065bd7784
Added ability to do full name search in user dropdown selectlist
2019-03-05 20:40:05 -08:00
Steffen
de39906cae
Put file contents instead of file object (creates subdirectory with a single file) ( #6760 )
2019-03-05 12:08:18 -08:00
snipe
1393f44070
Create FUNDING.yml
2019-03-04 23:57:17 -08:00
snipe
27280b8866
Added link to marksman
2019-03-01 17:41:02 -08:00
snipe
8016939f31
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-03-01 17:39:55 -08:00
snipe
c1ad2f9376
Added link to Marksman - A Windows agent for Snipe-IT
...
Per https://github.com/Scope-IT/marksman/issues/9#issuecomment-468275142
2019-03-01 17:39:50 -08:00
snipe
288cc01c41
Merge branch 'features/accessories_users' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# config/version.php
# routes/api.php
2019-03-01 17:30:03 -08:00
snipe
9575cd2651
Add accessories endpoint to user API ( #6775 )
2019-03-01 17:21:03 -08:00
snipe
348c13f318
Add accessories endpoint to user API
2019-03-01 16:31:22 -08:00
Steffen
e1907e30b1
Allow multiple upload fields and add logo option to labels ( #6736 )
...
* Change upload js to work with multiple upload elements on a single page
* Change uploadFile in upload modal and form partial
* Change uploadFile to js-uploadFile to avoid potential issues in the future
* Remove duplicate style attribute causing webpack to fail
* Missed a css class in rename to js- prefix
* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
* Add more css classes to labels
* Allow unescaped " (quot) in css ouput
* Add max size param to partial, set defaults for allowedType and size
2019-03-01 15:25:42 -08:00
Dmitrii Minaev
16bb784e78
Codestyle & bug fixes
2019-02-28 01:37:58 +03:00
snipe
c47fa5ad1c
Fixed missing @endcan
2019-02-26 19:14:28 -08:00
Dmitrii Minaev
d3c320e56f
Code comments and format
2019-02-23 22:44:03 +03:00
snipe
cf086b711e
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-02-22 13:24:58 -08:00
snipe
53db96edad
Bumped minor version
2019-02-22 13:24:45 -08:00
snipe
983a9a4e0e
Fixes/integrity constraint ( #6755 )
...
* Migration to fix nullables
This should fix an issue introduced in 90cddb7aee
where we’re passing null instead of an empty string (necessary to nullify values via the API)
* Removed asset migration - serial was already fixed
2019-02-22 13:21:31 -08:00
snipe
3b62c4a83a
Fixes/integrity constraint ( #6754 )
...
* Migration to fix nullables
This should fix an issue introduced in 90cddb7aee
where we’re passing null instead of an empty string (necessary to nullify values via the API)
* Removed asset migration - serial was already fixed
2019-02-22 13:20:42 -08:00
snipe
d0659bed35
Removed duplicate migration
2019-02-20 21:39:52 -08:00
snipe
f7e976cce9
Merge branch 'fixes/make_serial_nullable' into develop
2019-02-20 21:05:18 -08:00
snipe
5f3147cf36
Added support for enum that was added :(
2019-02-20 21:04:03 -08:00
snipe
1573e2a91f
Bumped hash
2019-02-20 20:52:08 -08:00
snipe
86a6322562
Merge branch 'fixes/make_serial_nullable' into develop
...
# Conflicts:
# app/Http/Controllers/Api/ConsumablesController.php
# config/version.php
2019-02-20 20:48:51 -08:00
snipe
738896bdc2
Make serial nullable
...
Guessing this is new due to later versions of mysql
2019-02-20 20:47:14 -08:00
Dmitrii Minaev
5f3a0bdea5
app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php
...
add accessories and consumables tables
add selectlist api to:
app\Http\Controllers\Api\AccessoriesController.php
app\Http\Controllers\Api\ConsumablesController.php
app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
2019-02-19 22:19:00 +03:00
snipe
e2834fab90
Bumped minor version
2019-02-16 11:48:20 -08:00
snipe
b91ba47b0e
Fixed migration
2019-02-16 11:42:35 -08:00
snipe
d687e1d762
Fixed #6725 - revert auro_increment_prefix to string
...
This was mis-migrated as boolean.
It’s essentially a duplicate migration, as it is fixed in-place on the existing migration, and then a new migratio was created to handle anyone who already upgraded.
2019-02-16 11:37:05 -08:00
snipe
6256abddf2
Bumped point release
2019-02-14 15:07:11 -08:00
snipe
0242b3ec74
Handled JS cookie offset issue on the server side
...
We may want to handle this via the blades instead, as I’m not sure if API users will run into weirdness here.
2019-02-14 15:01:34 -08:00
snipe
b26fbf986f
Fixed issue where offset could be greater than total items, resulting in “No results” confusion
2019-02-14 14:49:08 -08:00
snipe
5c9b1ed43a
Fixed #6676 - consumables API not respecting category id
2019-02-14 14:48:43 -08:00
snipe
2b6675138e
Added autolabeler for PRs
...
https://github.com/probot/autolabeler
2019-02-14 13:57:07 -08:00
snipe
2624b8c827
Added weekly digest app for repo
...
https://github.com/apps/weekly-digest
2019-02-14 13:52:56 -08:00
snipe
bfc1ebc4ba
Merge branch 'fixes/auto_increment_prefix' into develop
2019-02-14 13:09:40 -08:00