Code

Integrations/develop into master#7352

Code

Merged

snipe merged 136 commits intodevelopsnipe/snipe-it:developfrom integrations/develop-into-mastersnipe/snipe-it:integrations/develop-into-masterCopy head branch name to clipboardAug 15, 2019

+1,817-860

Commits

Commits on May 6, 2019

• Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992)

  Show description for e5c2d77
  snipe

  authored
  e5c2d77

  Copy full SHA for e5c2d77

• Leave the activated state for users alone in normal LDAP synchronisation. (#6988)

  

  Joris van Eijden

  authored and

  snipe

  committed
  486c708

  Copy full SHA for 486c708

Commits on May 7, 2019

• Fixed #7003 - crash when warranty months or purchase date is null

  snipe

  committed
  23fa5d0

  Copy full SHA for 23fa5d0

Commits on May 8, 2019

• Fixed #6956 - viewKeys policy inconsistent (#7009)

  Show description for d016076
  snipe

  authored
  d016076

  Copy full SHA for d016076

• Added API middleware to API routes to enable throttling

  Show description for f47b960
  snipe

  committed
  f47b960

  Copy full SHA for f47b960

• Merge branch 'master' of https://github.com/snipe/snipe-it

  snipe

  committed
  dbdc511

  Copy full SHA for dbdc511

Commits on May 13, 2019

• Import locations from CSV via command line (#7021)

  Show description for d67c931
  snipe

  authored
  d67c931

  Copy full SHA for d67c931

Commits on May 15, 2019

• Added ability to update groups via API

  Show description for 888bdbd
  snipe

  committed
  888bdbd

  Copy full SHA for 888bdbd

• Bumped version

  snipe

  committed
  33b59d7

  Copy full SHA for 33b59d7

Commits on May 16, 2019

• Fixed #6883 - remove escaping of fields on LDAP import

  snipe

  committed
  6728089

  Copy full SHA for 6728089

• Fixed #6880 - correctly encrypt encrypted fields via the API

  snipe

  committed
  9eb7b66

  Copy full SHA for 9eb7b66

• Fixes #5054: LDAP users deactivated for none-ad (#7032)

  Show description for 0963933
  

  thinkl33t

  authored and

  snipe

  committed
  0963933

  Copy full SHA for 0963933

Commits on May 20, 2019

• Updated packages

  Show description for c944304
  snipe

  committed
  c944304

  Copy full SHA for c944304

• Fixed #7044 - API update deleted custom fields if they are not re-presented

  snipe

  committed
  0358d13

  Copy full SHA for 0358d13

Commits on May 22, 2019

• Fixed XSS vulnerability when creating a new categories, etc via modal on create

  Show description for 978533b
  snipe

  committed
  978533b

  Copy full SHA for 978533b

• Updated email strings

  snipe

  committed
  729e3eb

  Copy full SHA for 729e3eb

• Fixed #7046 - added user website url back into UI

  snipe

  committed
  b2eacb1

  Copy full SHA for b2eacb1

• Updated language strings

  snipe

  committed
  21ec670

  Copy full SHA for 21ec670

• Bumped version

  snipe

  committed
  7b34cf1

  Copy full SHA for 7b34cf1

• Updated packages

  snipe

  committed
  77c3b8f

  Copy full SHA for 77c3b8f

• New backups config for spatie

  snipe

  committed
  8244a2a

  Copy full SHA for 8244a2a

• Removed debugbar service provider (autodiscovery)

  snipe

  committed
  144a32b

  Copy full SHA for 144a32b

• Use laravel v5.5 withCount manual aliases

  snipe

  committed
  20d0dce

  Copy full SHA for 20d0dce

• Added spatie language files

  snipe

  committed
  de11892

  Copy full SHA for de11892

• Removed old laravel backups config

  Show description for 57e80ee
  snipe

  committed
  57e80ee

  Copy full SHA for 57e80ee

• Set the serialization

  snipe

  committed
  bfb910f

  Copy full SHA for bfb910f

• Added the command loader to console kernel

  snipe

  committed
  77547c5

  Copy full SHA for 77547c5

• Renamed fire() to handle()

  snipe

  committed
  df8008f

  Copy full SHA for df8008f

• Updated withCount to use manual naming

  snipe

  committed
  4be8ba9

  Copy full SHA for 4be8ba9

• Updated backup path in backup admin

  snipe

  committed
  6cd25fb

  Copy full SHA for 6cd25fb

• Updated travis with new php versions

  snipe

  committed
  b3132a4

  Copy full SHA for b3132a4

• Bumped laravel version in readme

  snipe

  committed
  0dfc28b

  Copy full SHA for 0dfc28b

• Fixed custom field edit screen

  snipe

  committed
  12ec2d1

  Copy full SHA for 12ec2d1

Commits on May 23, 2019

• Fixed baseUrl is undefined error

  Show description for f6ef139
  snipe

  committed
  f6ef139

  Copy full SHA for f6ef139

Commits on May 24, 2019

• Fix for included files in backup

  snipe

  committed
  8e86d78

  Copy full SHA for 8e86d78

• Bumped version

  snipe

  committed
  79156ff

  Copy full SHA for 79156ff

• Switch has() to filled()

  snipe

  committed
  8db2470

  Copy full SHA for 8db2470

• Change ->has() to ->filled()

  snipe

  committed
  2d036c6

  Copy full SHA for 2d036c6

• Removed cosole log

  snipe

  committed
  149ac4b

  Copy full SHA for 149ac4b

• Bumped packages

  snipe

  committed
  d1a8955

  Copy full SHA for d1a8955

• Use getReader instead of fetchAssoc for CSV parser

  Show description for bf93e8c
  snipe

  committed
  bf93e8c

  Copy full SHA for bf93e8c

• Handle JSON validation errors like 5.4

  snipe

  committed
  96e2d74

  Copy full SHA for 96e2d74

• Handle JSON validation errors like 5.4

  snipe

  committed
  84c3709

  Copy full SHA for 84c3709

• Handle JSON validation errors like 5.4

  snipe

  committed
  dd5d5cc

  Copy full SHA for dd5d5cc

• Trying to fix ajax asset validation

  Show description for 5be5e32
  snipe

  committed
  5be5e32

  Copy full SHA for 5be5e32

• Fixed missing asset validation

  snipe

  committed
  aa0b627

  Copy full SHA for aa0b627

• Check that a model exists before trying to fiddle with fieldsets

  snipe

  committed
  d4725b6

  Copy full SHA for d4725b6

• Tidied up license check

  snipe

  committed
  8914d14

  Copy full SHA for 8914d14

• Removed extra escaping on checkin

  snipe

  committed
  4be95ea

  Copy full SHA for 4be95ea

• Updated importer to work with newer CSV Reader::getRecords() method

  snipe

  committed
  d6f251e

  Copy full SHA for d6f251e

• Fixed field mapping

  snipe

  committed
  9995f1a

  Copy full SHA for 9995f1a

• Small fix for reordering fields

  Show description for b6d2392
  snipe

  committed
  b6d2392

  Copy full SHA for b6d2392

• Fixed bug where sorting by company name in Users API did not work

  Show description for c5a23e8
  snipe

  committed
  c5a23e8

  Copy full SHA for c5a23e8

• Removed custom fields from AssignedSearch to prevent confusing data in selectlist

  Show description for 1e6c85d
  snipe

  committed
  1e6c85d

  Copy full SHA for 1e6c85d

• Removed alert-danger from tests

  snipe

  committed
  0e48d7b

  Copy full SHA for 0e48d7b

• Fixed missed consumables_count withCount() statement

  snipe

  committed
  93bf541

  Copy full SHA for 93bf541

• Fixed Undefined variable user in $backto if checked out to a non-user

  Show description for fcbc7e4
  snipe

  committed
  fcbc7e4

  Copy full SHA for fcbc7e4

• Check for valid model before attempting to access fieldsets

  Show description for 1472e9d
  snipe

  committed
  1472e9d

  Copy full SHA for 1472e9d

• Only build the log upload destination path if there is a matching record

  Show description for 78fb2b2
  snipe

  committed
  78fb2b2

  Copy full SHA for 78fb2b2

• Fixed free_seats_count variable name

  Show description for d596ced
  snipe

  committed
  d596ced

  Copy full SHA for d596ced

• Only gtry to delete the file if a record is found in the log

  snipe

  committed
  18db0a5

  Copy full SHA for 18db0a5

• Only try to get fieldset if model is valid

  snipe

  committed
  d5c3ee5

  Copy full SHA for d5c3ee5

• Fixed more camel-casing -> snake-casing

  snipe

  committed
  56576d9

  Copy full SHA for 56576d9

• Only display the file if the log record can be found

  snipe

  committed
  6dcdb5a

  Copy full SHA for 6dcdb5a

• Fixed casing in sync command

  snipe

  committed
  b2c9a38

  Copy full SHA for b2c9a38

Commits on May 25, 2019

• Updated README

  snipe

  committed
  6b43cd1

  Copy full SHA for 6b43cd1

• Derp - typo

  snipe

  committed
  58e72e5

  Copy full SHA for 58e72e5

• Added link to Atlassian plugin

  snipe

  committed
  68acdff

  Copy full SHA for 68acdff

• More Atlassian clarifications

  snipe

  committed
  5db7a7c

  Copy full SHA for 5db7a7c

• Show accessory image on view page

  snipe

  committed
  237acdc

  Copy full SHA for 237acdc

• Increased image size to 800px, added lightboxes

  snipe

  committed
  2dd3154

  Copy full SHA for 2dd3154

Commits on May 28, 2019

• Fixed #7083 - Removed user_exists constraint on department save

  Show description for a014af4
  snipe

  committed
  a014af4

  Copy full SHA for a014af4

• Updated branch in version file

  snipe

  committed
  6f2717a

  Copy full SHA for 6f2717a

• Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084)

  Show description for 186b947
  

  HinchK

  authored and

  snipe

  committed
  186b947

  Copy full SHA for 186b947

Commits on May 29, 2019

• Bumped version

  snipe

  committed
  7aa6ef5

  Copy full SHA for 7aa6ef5

• Merge branch 'master' of https://github.com/snipe/snipe-it

  snipe

  committed
  40f101d

  Copy full SHA for 40f101d

• Bumped release again :(

  snipe

  committed
  03cf3b5

  Copy full SHA for 03cf3b5

• Missed one

  snipe

  committed
  db76090

  Copy full SHA for db76090

• Fixed #7098 - updated backup config for deleteFile() method

  snipe

  committed
  829d44b

  Copy full SHA for 829d44b

• Fixed #7092 - handle weird port forwarding/port numbers for baseUrl

  snipe

  committed
  087cdd8

  Copy full SHA for 087cdd8

• Bumped version

  snipe

  committed
  b07a254

  Copy full SHA for b07a254

Commits on May 30, 2019

• Fixed #7099 - set email to null by default for backup notifications

  snipe

  committed
  37f950a

  Copy full SHA for 37f950a

Commits on May 31, 2019

• Removed old comments

  snipe

  committed
  2c64739

  Copy full SHA for 2c64739

• Fixed #7100 - Check if $user isset on checkin

  snipe

  committed
  74a2c29

  Copy full SHA for 74a2c29

• Increased throttle to 120 requests per minute

  snipe

  committed
  d2bbc09

  Copy full SHA for d2bbc09

• Added Filipino, corrected order for Spanish variations

  snipe

  committed
  c29ab90

  Copy full SHA for c29ab90

• Update language strings

  snipe

  committed
  6966c13

  Copy full SHA for 6966c13

• Bumped hash

  snipe

  committed
  925d3a2

  Copy full SHA for 925d3a2

• Changed has to filled to fix bulk asset editing

  snipe

  committed
  49a255c

  Copy full SHA for 49a255c

• Bumped point version

  snipe

  committed
  765417c

  Copy full SHA for 765417c

Commits on Jun 4, 2019

• Small fixes for phpleague CSB reader v9

  snipe

  committed
  27231d4

  Copy full SHA for 27231d4

Commits on Jun 11, 2019

• Improved error checking in locations importer

  snipe

  committed
  cbff66c

  Copy full SHA for cbff66c

Commits on Jun 12, 2019

• Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility

  snipe

  committed
  1d0d25d

  Copy full SHA for 1d0d25d

• Reduce minimum group name length to 2 (from 3)

  Show description for 30904dd
  snipe

  committed
  30904dd

  Copy full SHA for 30904dd

• Back in time fix FOR #7145 for new installs on MySQL 8+

  snipe

  committed
  2bfa05f

  Copy full SHA for 2bfa05f

Commits on Jun 13, 2019

• Fixed permission insert

  Show description for cef030c
  snipe

  committed
  cef030c

  Copy full SHA for cef030c

• Possible fix for reporting/admin migration back in time

  snipe

  committed
  26a1181

  Copy full SHA for 26a1181

Commits on Jun 14, 2019

• Fixed #7164 - change table name to permission_groups

  snipe

  committed
  a85251a

  Copy full SHA for a85251a

Commits on Jun 15, 2019

• Fixed LDAP password blanking on save

  snipe

  committed
  de992e4

  Copy full SHA for de992e4

Commits on Jun 19, 2019

• fixing previous commit's actual wiping of password (#7183)

  Show description for 03a4512
  

  Kasey

  authored and

  snipe

  committed
  03a4512

  Copy full SHA for 03a4512

Commits on Jun 24, 2019

• Bumped version

  snipe

  committed
  d19df4d

  Copy full SHA for d19df4d

Commits on Jun 26, 2019

• Downgrading rollbar for Laravel 5.5

  snipe

  committed
  740d5a6

  Copy full SHA for 740d5a6

Commits on Jun 28, 2019

• Spelling Correction (#7206)

  Show description for e1b33f3
  

  misilot

  authored and

  snipe

  committed
  e1b33f3

  Copy full SHA for e1b33f3

Commits on Jul 15, 2019

• Fix #6910: Add logic to manipulate the eloquent query. (#7006)

  Show description for d409be6
  

  inietov

  authored and

  snipe

  committed
  d409be6

  Copy full SHA for d409be6

• Addresses #7238 - add PWA code to layout

  Show description for 6736b1c
  snipe

  committed
  6736b1c

  Copy full SHA for 6736b1c

• Better log message for bad LDAP connection

  snipe

  committed
  984c2a8

  Copy full SHA for 984c2a8

• Merge branch 'master' of https://github.com/snipe/snipe-it

  snipe

  committed
  f82ffe3

  Copy full SHA for f82ffe3

• Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed

  snipe

  committed
  8c73a47

  Copy full SHA for 8c73a47

• Comment clarification on #7186

  snipe

  committed
  b4b6d6b

  Copy full SHA for b4b6d6b

Commits on Jul 17, 2019

• Check for valid seat on hardware view

  snipe

  committed
  79ab0d8

  Copy full SHA for 79ab0d8

• Added space between footer and custom message

  snipe

  committed
  fecf801

  Copy full SHA for fecf801

• Cap warranty months to three characters

  Show description for 15bfd07
  snipe

  committed
  15bfd07

  Copy full SHA for 15bfd07

• Cap warranty months to 3 on the frontend blade

  snipe

  committed
  77a6f6f

  Copy full SHA for 77a6f6f

Commits on Jul 18, 2019

• Fixed countable() strings on user destroy

  snipe

  committed
  444e250

  Copy full SHA for 444e250

• Check that the user has assets and that the aset model is valid

  snipe

  committed
  0e93495

  Copy full SHA for 0e93495

• Bumped hash

  snipe

  committed
  61fb380

  Copy full SHA for 61fb380

• Caps asset warranty to 20 years

  snipe

  committed
  cef22c3

  Copy full SHA for cef22c3

• Command to fix custom field unicode conversion differences between PHP versions (#7263)

  snipe

  authored
  eec445f

  Copy full SHA for eec445f

• Fixes #7252 form request changes (#7272)

  Show description for 55ee90b
  snipe

  authored
  55ee90b

  Copy full SHA for 55ee90b

• Apply fix from PR #7273 to master

  snipe

  committed
  74e647f

  Copy full SHA for 74e647f

• Bumped hash

  snipe

  committed
  a0f3fc6

  Copy full SHA for a0f3fc6

Commits on Jul 24, 2019

• Fixed #7250 - permission issue for API fieldsets and fields endpoints

  Show description for 250a797
  snipe

  committed
  250a797

  Copy full SHA for 250a797

• Add @mskrip as a contributor

  snipe

  committed
  9af9ed9

  Copy full SHA for 9af9ed9

Commits on Jul 26, 2019

• Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name

  snipe

  committed
  ab86e42

  Copy full SHA for ab86e42

• CORS for api (#7292)

  Show description for 3dc2cc9
  snipe

  authored
  3dc2cc9

  Copy full SHA for 3dc2cc9

• Bumped version

  snipe

  committed
  c7be250

  Copy full SHA for c7be250

Commits on Jul 31, 2019

• Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317)

  

  inietov

  authored and

  snipe

  committed
  28ae90f

  Copy full SHA for 28ae90f

• Added comments to the ByFilter query scope for clarity

  snipe

  committed
  c593b36

  Copy full SHA for c593b36

Commits on Aug 2, 2019

• Added accessories checkout/checkin API endpoint

  snipe

  committed
  e7b0ee2

  Copy full SHA for e7b0ee2

Commits on Aug 7, 2019

• Fixed CVE-2019-10742

  Show description for d372805
  snipe

  committed
  d372805

  Copy full SHA for d372805

Commits on Aug 8, 2019

• Update README.md (#7334)

  Show description for 5591c86
  

  gastamper

  authored and

  snipe

  committed
  5591c86

  Copy full SHA for 5591c86

Commits on Aug 11, 2019

• Group related variables in .env

  snipe

  committed
  6ebb01a

  Copy full SHA for 6ebb01a

• Merge branch 'master' of https://github.com/snipe/snipe-it

  snipe

  committed
  6c7e5cb

  Copy full SHA for 6c7e5cb

Commits on Aug 14, 2019

• History importer fixes

  snipe

  committed
  99cd552

  Copy full SHA for 99cd552

• Fixes to history importer

  snipe

  committed
  8b4a9aa

  Copy full SHA for 8b4a9aa

Commits on Aug 15, 2019

• Merge branch 'develop' into integrations/develop-into-master

  Show description for 881f2a3
  snipe

  committed
  881f2a3

  Copy full SHA for 881f2a3