Commit graph

5824 commits

Author SHA1 Message Date
snipe 785bc40d9d Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-yellow.css
#	public/mix-manifest.json
2021-02-17 13:50:14 -08:00
snipe 9d50e0e8d0 Fixed weird table formatting in expected checkin report 2021-02-17 13:44:35 -08:00
snipe 9deb4204c8 Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report 2021-02-17 13:41:08 -08:00
snipe 1ab349a63d Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-02-17 13:34:59 -08:00
Ivan Nieto 2e2d087639
Added logic to handle the CLI importer. (#9088) 2021-02-17 13:13:17 -08:00
snipe bfadb2cea6 Add @koelle25 as a contributor 2021-02-17 12:58:57 -08:00
Kevin Köllmann 44eb67440a
Fixed #9115: Duplicate column name 'provider' (#9137) 2021-02-17 12:57:08 -08:00
Godfrey Martinez 8fb97da314
Color of asset selection in bulk checkout [ch15525] (#9145) 2021-02-17 12:56:26 -08:00
Ivan Nieto 12ff465cdb
Added feature: Checkbox Custom Fields as list of values. (#9112)
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.

* Added the same functionality when the custom fieldset is encrypted.

* Added missing bits, so the edit custom assets view shows what values have been already stored in database
2021-02-16 17:20:29 -08:00
Ivan Nieto f89d789832
Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133)
* Fixes the validation rules on Manufacturer Model

* Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it
2021-02-16 12:52:55 -08:00
snipe 834e0a9dd5 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
2021-02-05 14:29:13 -08:00
snipe 681c41bd18 Bumped version 2021-02-05 14:28:31 -08:00
snipe 74488ddceb Added provider column to oauth_clients table for passport upgrade 2021-02-05 14:27:56 -08:00
snipe 19820f1b42 Merge remote-tracking branch 'origin/develop' 2021-02-03 16:08:36 -08:00
snipe 2a88781cd5 Add @Kurokat as a contributor 2021-02-03 16:07:25 -08:00
snipe f96c867bd3 Update @ghost as a contributor 2021-02-03 16:07:06 -08:00
snipe 06f8e8620a Add @EDVLeer as a contributor 2021-02-03 16:06:28 -08:00
snipe 95d907c9e9 Add @sean-borg as a contributor 2021-02-03 16:06:14 -08:00
snipe d990152856 Add @andres-baller as a contributor 2021-02-03 16:05:45 -08:00
snipe 05609230b2 Add @ncareau as a contributor 2021-02-03 16:05:21 -08:00
snipe 220c254093 Add @benwa as a contributor 2021-02-03 16:05:06 -08:00
snipe 02313ce361 Add @fashberg as a contributor 2021-02-03 16:04:47 -08:00
snipe e70f7c610a Add @winstan as a contributor 2021-02-03 16:03:20 -08:00
snipe 32f77c3285 Add @alek13 as a contributor 2021-02-03 16:02:49 -08:00
snipe 0a639f4fcc Add @ThoBur as a contributor 2021-02-03 16:02:38 -08:00
snipe f2b55fb641 Add @PauloLuna as a contributor 2021-02-03 16:02:27 -08:00
snipe 0e443356f0 Add @iansltx as a contributor 2021-02-03 16:02:00 -08:00
snipe 76f7f01398 Add @derlucas as a contributor 2021-02-03 16:01:42 -08:00
snipe 992de0156b Add @phenixdotnet as a contributor 2021-02-03 16:01:27 -08:00
snipe c96b5f5a85 Add @sigmoidal as a contributor 2021-02-03 16:01:12 -08:00
snipe 8d2685f0f0 Add @PeterDaveHello as a contributor 2021-02-03 16:01:00 -08:00
snipe eb14cc7f43 Add @giannello as a contributor 2021-02-03 15:59:48 -08:00
snipe 3dc67cdba6 Updated dark skins with compiled assets for prod 2021-02-03 15:20:26 -08:00
snipe 0bbe0c85d7 Small improvement to topnav dropdown text colors in dark skins 2021-02-03 15:17:31 -08:00
snipe 49415806e1 Nicer formatting of the page if custom logout [ch15660] 2021-02-03 14:56:26 -08:00
Giuseppe Iannello 5edbb4b229
Support Google Cloud IAP (#8768)
Following up on 7c2da81700,
this extends the logic, adding support for Google Cloud IAP.
2021-02-03 11:59:55 -08:00
ThoBur c40b8334fc
Update edit.blade.php (#8876)
Fix issue #8518
2021-02-03 11:59:05 -08:00
snipe 0a37c9564a Merge remote-tracking branch 'origin/develop' 2021-02-03 01:30:11 -08:00
snipe 985193ffff Fixed #9082 - allow deployable status type on checkout 2021-02-03 01:29:54 -08:00
snipe 721add5bc1 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
2021-02-03 00:57:58 -08:00
snipe ff8fa6ec77 Production assets for better contrast in dark mode skins 2021-02-03 00:52:23 -08:00
snipe e0a6f22489 Small fixes to dark mode skins 2021-02-03 00:49:09 -08:00
snipe 030fdd60ff Switched branch name to master 2021-02-02 21:49:21 -08:00
snipe fdde844ce5 Bumped version to 5.1.0 2021-02-02 21:48:42 -08:00
snipe d263990401 Updated min requirements in composer.json 2021-02-02 21:29:09 -08:00
snipe bf7a856fa6 Update minimum PHP requirements to 7.2.5 2021-02-02 21:05:37 -08:00
snipe 1e062d4fc8 Re-applying laravel update with PHP min 7.2.5 2021-02-02 20:58:15 -08:00
snipe ca37de5e45 Ugh. Rolling back composer.lock
Everything sucks
2021-02-02 20:44:07 -08:00
snipe 9ba2fd93c1 Reverted Laravel upgrade :( 2021-02-02 20:34:23 -08:00
snipe a2e177e754 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-02-02 20:30:36 -08:00