snipe
26c0cf5d33
Allow null for logCheckin $action_date
2019-03-14 01:22:29 -07:00
snipe
239f21b0d7
Set null option for $action_date
2019-03-14 01:09:16 -07:00
snipe
0b927623e8
Added “record created” string for clarification in asset/license history
2019-03-13 22:06:57 -07:00
snipe
96f069c417
Change action_datwe to datetime in transformer
2019-03-13 21:57:06 -07:00
snipe
60e52cc927
Make action_date a datetime
2019-03-13 21:53:56 -07:00
snipe
9f79028391
Fixed copypasta in email_logo down() method
2019-03-13 21:53:45 -07:00
Ivan Nieto
c7f48951a9
Valo/checkin date in history of asset ( #6733 )
...
* To see checkin/checkout Date in History of Asset
* Added some logic to get today's date if the checkin_at input is blank
* Updating the action_date taking the value from the action_log table
* Hide created_at field and rename 'Action Date' as only 'Date'
2019-03-13 21:36:32 -07:00
Marián Skrip
8d63533205
Add write-only image_source
field for asset create/edit API endpoint ( #6146 )
...
`image_source` should contain base64 encoded image data with mime-type.
2019-03-13 21:00:40 -07:00
Ivan Nieto
8c65214b1f
Ignore the soft deleted assets in the eloquent query ( #6824 )
2019-03-13 20:14:30 -07: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
55f727ef28
Fixed HTML labels on alerts setting page
...
Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block
2019-03-13 19:53:23 -07:00
snipe
6c71e72dcd
Fixed labels labels (wha?)
...
Wrong HTML labels for some fields in the Settings > Labels page.
Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
2019-03-13 19:50:35 -07:00
snipe
79f4f46e3a
Add @timothyfarmer as a contributor
2019-03-13 19:45:40 -07:00
snipe
fddf0cdd15
Added hungary time format
2019-03-13 19:45:30 -07:00
snipe
8efbde61c9
Merge branch 'fixes/kit_fixes' into develop
2019-03-13 12:16:20 -07:00
snipe
2c79ed5fc1
Added kit permissions
2019-03-13 12:15:54 -07:00
snipe
1b0d855c00
Added translation, removed commented out code
2019-03-13 12:15:48 -07:00
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
7e8d337ed5
Moved kit icon
2019-03-08 16:49:05 -08: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