DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12920 commits 96 branches 267 tags 295 MiB
Commit graph

753 commits

Author SHA1 Message Date
snipe c211cc733c Bumped hash 2019-03-05 21:26:24 -08:00
snipe 53db96edad Bumped minor version 2019-02-22 13:24:45 -08:00
snipe 1573e2a91f Bumped hash 2019-02-20 20:52:08 -08:00
snipe e2834fab90 Bumped minor version 2019-02-16 11:48:20 -08:00
snipe 6256abddf2 Bumped point release 2019-02-14 15:07:11 -08:00
snipe 9035707bd6 Bumped point version 2019-02-13 07:40:52 -08:00
snipe 533649f24e Merge branch 'develop' into dev-master-integration 
# Conflicts:
#	.gitignore
#	.travis.yml
#	app/Console/Commands/LdapSync.php
#	app/Console/Commands/SendExpectedCheckinAlerts.php
#	app/Console/Commands/SendExpirationAlerts.php
#	app/Console/Commands/SendInventoryAlerts.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/Importer.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/License.php
#	app/Models/Location.php
#	app/Models/Recipients/AlertRecipient.php
#	app/Models/User.php
#	app/Providers/AppServiceProvider.php
#	composer.json
#	composer.lock
#	config/trustedproxy.php
#	config/version.php
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
#	resources/lang/ar/admin/settings/general.php
#	resources/lang/bg/admin/settings/general.php
#	resources/lang/en-ID/admin/settings/general.php
#	resources/lang/en-ID/passwords.php
#	resources/lang/en/passwords.php
#	resources/lang/es-CO/passwords.php
#	resources/lang/es-ES/passwords.php
#	resources/lang/es-MX/passwords.php
#	resources/lang/es-VE/passwords.php
#	resources/lang/fi/admin/settings/general.php
#	resources/lang/id/admin/settings/general.php
#	resources/lang/id/passwords.php
#	resources/lang/ja/passwords.php
#	resources/lang/nl/passwords.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/passwords.php
#	resources/lang/pt-BR/admin/settings/general.php
#	resources/lang/pt-BR/passwords.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/admin/statuslabels/table.php
#	resources/lang/ru/passwords.php
#	resources/lang/sr-CS/general.php
#	resources/lang/sr-CS/mail.php
#	resources/lang/sv-SE/admin/settings/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/passwords.php
#	resources/lang/vi/admin/models/message.php
#	resources/lang/vi/admin/users/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/views/importer/import.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/partials/forms/edit/image-upload.blade.php
#	resources/views/users/edit.blade.php
#	resources/views/users/view.blade.php
#	tests/unit/ImporterTest.php
 2019-02-13 06:42:52 -08:00
snipe 471fcd1272 Set beta version tag 2019-02-13 02:27:56 -08:00
snipe c0669150fb Bumped point version 2019-02-12 23:48:31 -08:00
snipe 117b4c59cc Bumped minor version 2019-01-25 21:06:08 -08:00
snipe 601c129bbf Embed images in emails 2019-01-17 20:45:24 -08:00
Steffen 1de9087427 LDAP fixes (#6533) 
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder

* php 7.3 collect() fix (undefined variable)

* Fix travis ci

* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder

* php 7.3 collect() fix (undefined variable)

* change LDAP implementation from model to (singleton) service

* Re-apply check for content in ldap_server variable before parsing

* Update LDAP implementation

* Switch iCheck to minimal as referenced in js

* Don't init on load but on first access via init (returns ldap enabled status)

* Re-Enable notifications

* Re-add missing test target php versions

* Only init() once (singleton class, so ldap variable is already set)
 2019-01-10 13:20:43 -08:00
snipe 794824713e Bumped minor version 2019-01-03 11:22:06 -08:00
Brady Wetherington 89a325c0ea Handle missing Flysystem env vars; let Debugbar autodiscover (#6514) 2018-12-17 14:04:56 -08:00
Ben RUBSON 4ffb8f14b8 Improve Memcached settings (#6485) 
* Improved memcached settings

* Improved memcached settings
 2018-12-06 14:39:14 -08:00
snipe 9f73fcf308 Added #6463 - ability to override session path in .env 2018-12-05 17:17:11 -08:00
snipe 925258bfb4 Bumped version 2018-10-26 15:29:10 -07:00
snipe a483e9365b Add APP_LOG_LEVEL to new logging config 2018-10-25 21:01:14 -07:00
snipe 41b5b1dfd0 Bumped hash 2018-10-09 17:32:46 -07:00
snipe c39e3acb59 Bumped hash 2018-10-04 02:24:41 -07:00
snipe db385e024b Possible proxy issue fix 2018-10-03 13:04:25 -07:00
snipe 79367642b1
[WIP] Added #5957 - Flysystem support (#6262) 
* Added AWS url to example env

* Upgrader - added check for new storage path and attempt to move

* Ignore symlink

* Updated paths for models

* Moved copy methods

* Added AWS_URL support

For some reasin, Flysystem was generating the wrong AWS url (with a region included)

* Switch to Flysystem for image uploads

* Nicer display of image preview

* Updated image preview on edit blades to use Flysystem

* Twiddled some more paths

* Working filesystems config

* Updated Asset Models and Departments to use Flysystem

* Janky workaround for differing S3/local urls/paths

* Try to smartly use S3 as public disk if S3 is configured

* Use public disk Storage options for public files

* Additional transformer edits for Flysystem

* Removed debugging

* Added missing use Storage directive

* Updated seeders to use Flysystem

* Default logo

* Set a default width

We can potentially override this in settings later

* Use Flysystem for logo upload

* Update downloadFile to use Flysystem

* Updated AssetFilesController to use Flysystem

* Updated acceptance signatures to use Flysystem

* Updated signature view to use Flysystem

This isn’t working 100% yet

* Use Flysystem facade for displaying asset image

* Set assets path

Should clean all these up when we’re done here

* Added Rackspace support for Flysystem

* Added Flysystem migrator console command

* Added use Storage directive for categories

* Added user avatars to Flysystem

* Added profile avatar to Flysystem

* Added the option to delete local files with the migrator

* Added a check to prevent people from trying to move from local to local

* Fixed the selectlists for Flysystem

* Fixed the getImageUrl method to reflect Flysystem

* Fixed AWS copy process

* Fixed models path

* More selectlist updates for Flysystem

* Updated example .envs with updated env variable names

* *sigh*

* Updated non-asset getImageUrl() methods to use Flysystem

* Removed S3 hardcoding

* Use Flysystem in email headers

* Fixed typo

* Removed camera support from asset file upload

We’ll find a way to add this in later (and add that support to all of the other image uploads as well)

* Fixed path for categories

* WIP - Switched to standard handleImages for asset upload.

This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now.

* Fixed css URL error

* Updated Debugbar to latest version (#6265)

v3.2 adds support for Laravel 5.7

* Fixed: Missing CSS file in basic.blade.php (#6264)

* Fixed missing CSS file in basic.blade.php

* Added

* Changed stylesheet import for authorize.blade.php

* Updated composer lock

* Added AWS_BUCKET_ROOT as env variable

* Use nicer image preview for logo upload

* Removed AssetRequest form request

* Removed asset form request, moved custom field validation into model

* Added additional help text for logo upload

* Increased the size of the image resize - should make this a setting tho

* Few more formatting tweaks to logo section of branding blade preview

* Use Flysystem for asset/license file uploads

* Use Flysystem for removing images from models that have been deleted

* Enable backups to use Flysystem

This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3

* Use Flysystem to download license files

* Updated audits to use Flysystem
 2018-09-29 21:33:52 -07:00
snipe ef0bd72076 Bumped version 2018-09-28 11:21:39 -07:00
snipe ba3662a9ed Bumped hash 2018-09-07 18:12:29 -07:00
snipe 22ef2ce0b6 Bumped hash 2018-09-07 03:20:31 -07:00
snipe 60459d07ce Added email image auto-embed support 2018-09-05 18:57:49 -07:00
snipe d8a8e1cc09 Bumped version 2018-08-28 11:43:56 -07:00
snipe e4f6aefdad Added self-checkout permission option 2018-08-21 23:26:12 -07:00
snipe 101dfd01f2 Bumped hash 2018-08-14 18:22:53 -07:00
snipe 1a660911e7 Check for minimum PHP version in setup 2018-08-02 21:36:18 -07:00
snipe 1fd0b14b98 Removed ide-helper config 2018-07-25 12:07:50 -07:00
snipe c90dee4cf4 Added barryvdh/laravel-ide-helper 2018-07-25 11:58:00 -07:00
snipe 9535c68dfe Fixed base path in local file driver 2018-07-25 10:44:37 -07:00
snipe 068ae5805b Set base path for storage default on local disk 2018-07-25 07:39:47 -07:00
snipe 054de06522 Added cache variables to S3 2018-07-25 07:29:23 -07:00
snipe 9a99626b9e Added SFTP to filesystem config 2018-07-25 07:27:31 -07:00
snipe 684a892e8b Removed rackspace for now 2018-07-25 06:59:58 -07:00
snipe 501f096a2c Updated spatie backup config file for their latest version 2018-07-25 01:36:30 -07:00
snipe 4cc7ed9ec7 Backup updates 2018-07-25 01:28:30 -07:00
snipe 24c949c886 Bumped version to v5.0.0-pre 2018-07-24 21:13:02 -07:00
snipe de84e1bd88 Added hashing config 2018-07-24 21:13:02 -07:00
snipe 60c4fa1d90 Updated trustedproxy w/config 2018-07-24 21:13:02 -07:00
snipe 3d3ed6ab03 Logging updates for 5.6 2018-07-24 21:13:02 -07:00
snipe 14735057a8 New spatie config file 2018-07-24 21:13:02 -07:00
snipe b58314493a Use array for db dump configs 2018-07-24 21:13:02 -07:00
snipe 6ebc653620 Sparie backups config upgrade 2018-07-24 21:13:02 -07:00
snipe f69e34f6ca Applying @dmeltzer’s changes from afc8ac5e72 2018-07-24 21:13:02 -07:00
snipe 4e55a18a60 Bumped version 2018-07-24 19:46:23 -07:00
snipe e332442132 Bumped version 2018-07-24 19:45:23 -07:00
snipe 3de1de9dc6 Merge branch 'develop' 2018-07-24 14:04:16 -07:00
snipe 376eb52f00 Fixed #5938 - added “self location edit” as permission 2018-07-24 12:42:16 -07:00
snipe aa9c0078a1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-19 14:47:27 -07:00
snipe 9677115055 Bumped version 2018-07-19 14:46:08 -07:00
snipe f692fb5bff Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-19 10:50:18 -07:00
snipe 83692696ba Bumped version 2018-07-19 10:49:40 -07:00
snipe 8d23398176 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-18 20:07:14 -07:00
snipe 5aae930e8c Bumped version 2018-07-18 20:05:48 -07:00
snipe 8a25677a8d Bumped hash 2018-07-16 21:35:21 -07:00
Till Deeke 27699aa99c Adds permission checks for custom fields and custom fieldsets (#5645) (#5795) 
* adds permission checks to custom fields

* adds permission checks to custom fieldsets

* adds separate permissions for custom fieldsets

* check for permissions in views

* Removes custom fieldsets from permissions config

* Proxy the authorization for custom fieldsets down to custom fields.

This allows us to use the existing permissions in use and have more semantically correct authorization checks for custom fieldsets.

* simplifies the authorization check for the custom fields overview

* removes special handling of custom fieldsets in base policy

I just realised that this code duplicates the logic from the custom fieldset policy.
Since we are checking for the authorization of custom fields anyway, we can just use the columnName for the fields.

* cleanup of unused imports
 2018-07-12 18:28:20 -07:00
snipe 52d605d13e Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-09 19:21:23 -07:00
snipe 0182615e7e Bumped version 2018-07-09 19:18:38 -07:00
snipe fad84d4437 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-09 19:07:49 -07:00
snipe c162e9a4de Bumped hash 2018-07-09 19:06:56 -07:00
snipe ea4cdadc6e Bumped version 2018-06-21 07:44:58 -07:00
snipe eb412c2bcb Missed one 2018-06-21 07:43:12 -07:00
snipe fde4a59510 Bumped version 2018-06-21 07:40:37 -07:00
snipe f8429ad357 Merge branch 'docker-fixes' of https://github.com/thelamer/snipe-it into thelamer-docker-fixes 2018-06-21 07:31:15 -07:00
snipe 087e114d34 Merge branch 'develop' 2018-05-31 16:34:25 -07:00
snipe 6ec75714f0 Force default srtorage engine 2018-05-22 14:57:05 -07:00
snipe 2ecc4aead7 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 15:43:48 -07:00
snipe d8210847a4 Bumped version 2018-05-21 15:43:04 -07:00
snipe 11832daf5c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 15:17:40 -07:00
snipe 79555f5647 Bumped version 2018-05-21 15:16:56 -07:00
snipe 1868013704 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 14:59:08 -07:00
snipe 39cc13f155 Bumped version 2018-05-21 14:58:16 -07:00
snipe 0b5bb520a7 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-16 19:24:31 -07:00
snipe fa89f45cb8 Bumped hash 2018-05-16 19:22:59 -07:00
snipe 25f537e730 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-08 03:49:28 -07:00
snipe 6d8af3d9c0 Bumped hash 2018-05-08 03:48:35 -07:00
snipe 0116fa9b95 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-02 14:35:16 -07:00
snipe 42f0eebf8f Bumped version 2018-05-02 14:33:01 -07:00
snipe 4c5f20fde4 Merge branch 'develop' 
# Conflicts:
#	app/Importer/Importer.php
#	config/version.php
 2018-04-23 13:33:34 -07:00
snipe def1eb0b5f Bumped hash 2018-04-20 13:52:32 -07:00
snipe bdbc189a4f Bumped hash 2018-04-20 13:51:54 -07:00
snipe c1838a60df Bumped hash 2018-04-04 17:36:47 -07:00
snipe 83781f3a70 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-26 15:20:40 -07:00
snipe 5f1ec550ec Fixed hash 2018-03-26 15:16:35 -07:00
snipe 95f8dccc14 Bumped hash 2018-03-26 15:15:43 -07:00
snipe 846613c244 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-22 20:48:02 -07:00
snipe c4c137dc08 Bumped to 4.2.0 2018-03-22 20:47:09 -07:00
snipe 469efc923b Merge branch 'develop' 
# Conflicts:
#	README.md
#	config/version.php
 2018-03-22 20:08:55 -07:00
snipe dcd74f6922 Bumped version 2018-03-22 20:07:06 -07:00
snipe 96bab5697d Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
#	database/migrations/2018_02_22_160436_add_remote_user_settings.php
 2018-03-22 09:46:50 -07:00
snipe abac3e7758 Bumped hash 2018-03-22 09:44:54 -07:00
snipe 01eaf48471 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-07 18:25:12 -08:00
snipe 238a075c6a Bumped hash 2018-03-07 18:24:09 -08:00
snipe 95d935d917 Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
snipe d42361bac1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-05 20:27:50 -08:00
snipe fabc9e5d1c Bumped hash 2018-03-03 17:15:59 -08:00
snipe 2dd56f5bda Backup the .env if BACKUP_ENV is set to true 2018-02-26 18:12:48 -08:00
snipe c250c632f3 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-26 15:46:49 -08:00
snipe e3fb4f8799 Bumped hash 2018-02-26 15:44:36 -08:00
snipe 7c9c6ea3df Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-22 16:40:19 -08:00
snipe 7d49c4de87 Bumped hash 2018-02-22 16:39:12 -08:00
snipe 3131c0d0ac Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 16:45:21 -08:00
snipe 364e9cf3de Bumped version 2018-02-21 16:43:00 -08:00
snipe d511d90a2f Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 06:50:42 -08:00
snipe 54d6cafda9 Bumped hash 2018-02-21 06:49:36 -08:00
snipe cccd75fc42 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 05:48:02 -08:00
snipe dbc16a6c9b Bumped hash 2018-02-21 05:47:12 -08:00
snipe 42c8de5620 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 04:44:48 -08:00
snipe ba4f63bca3 Bumped version 2018-02-21 04:43:52 -08:00
snipe 97bd87773c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 02:40:23 -08:00
snipe b560828173 Bumped hash 2018-02-21 02:18:14 -08:00
snipe 7865fbea7e Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 01:27:11 -08:00
snipe 5fcbf9091e Bumped version 2018-02-21 01:23:19 -08:00
snipe 918db39eba Merge branch 'develop' 2018-02-19 18:06:58 -08:00
snipe 213fe2ecea Fixed #5044 - incorrect env values for SSL DB paths 2018-02-19 18:03:50 -08:00
snipe 6e70352d0b Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-17 01:05:20 -08:00
snipe 9a4f5e0ba8 Bumped hash 2018-02-16 22:10:06 -08:00
snipe 5302108556 Update to master 2018-02-16 13:27:03 -08:00
snipe 27c1bc0271 Bumped hash 2018-02-16 13:24:47 -08:00
snipe 8b2045523d Bumped hash 2018-02-01 15:55:33 -06:00
snipe e77aae703b Bumped hash 2018-01-25 11:03:45 -08:00
snipe f5636f325d Bumped hash 2018-01-24 11:01:51 -08:00
snipe fcb5eea951 Bumped hash 2018-01-24 08:28:53 -08:00
snipe a28fee1ff4 Bumped hash 2018-01-20 07:47:07 -08:00
snipe f53c68e040 Bumped hash 2018-01-20 04:40:26 -08:00
snipe 913e6a5709 Bumped hash 2018-01-20 03:59:42 -08:00
snipe a9ffe8d210 Bumped hash 2018-01-19 17:52:40 -08:00
snipe c242abb42e Added Company policy to fix company deletion issue 2018-01-19 17:51:28 -08:00
snipe 6133f09056 Bumped hash 2018-01-17 19:30:31 -08:00
snipe e8252d9468 Bumped hash 2018-01-17 12:41:11 -08:00
snipe 9e605e0f79 Bumped hash 2018-01-17 12:11:39 -08:00
snipe 78efeec368 Bumped hash 2018-01-11 15:24:37 -08:00
snipe bc3d27fac6 Bumped hash 2018-01-10 22:57:22 -08:00
snipe 30716b349b Bumped dev hash 2017-12-15 18:55:56 -08:00
snipe 9018af4f1d Bumped hash 2017-12-12 10:45:20 -08:00
snipe 55eaea0110 Derp. 2017-12-12 09:25:06 -08:00
snipe 671a125c62 Bumped hash 2017-12-12 09:24:40 -08:00
snipe 035f7a5292 Formatted version 2017-12-07 19:24:03 -08:00
snipe 0ea3100896 Bumped hash 2017-12-07 19:23:34 -08:00
snipe 808cd0f728 Nicer groups permission edit UI 2017-12-05 18:11:06 -08:00
snipe 027f6a7c12 Bumped hash 2017-12-05 13:18:52 -08:00
snipe 28fdbdd5d8 Bumped version 2017-12-04 23:50:45 -08:00
snipe 2aafdb1400 Bumped version 2017-12-01 20:49:04 -08:00
snipe cbc09f3a12 Fixes #4508 - adds image to location view (and google map, if address and API key exist) 2017-12-01 19:12:35 -08:00
snipe 5a3233da37 Grr. 2017-12-01 14:54:18 -08:00
snipe 80109071a2 Fixed version number 2017-12-01 14:54:02 -08:00
snipe c43bb670d2 Bumped hash 2017-12-01 14:50:46 -08:00
snipe 5efb803b60 Auto-bumped hash/version 2017-11-30 16:41:06 -08:00
snipe 51168e8e10 Auto-bumped hash/version 2017-11-30 13:40:36 -08:00
snipe cc5eee1890 Auto-bumped hash/version 2017-11-30 13:32:12 -08:00
snipe 8cf70e7e20 Auto-bumped hash/version 2017-11-27 22:10:54 -08:00
snipe 290cf79778 Auto-bumped hash/version 2017-11-27 21:25:21 -08:00
snipe 8af1481749 Auto-bumped hash/version 2017-11-27 21:20:38 -08:00
snipe 82fca0c72d Auto-bumped hash/version 2017-11-24 11:25:57 -08:00
snipe 76e3398d44 Auto-bumped hash/version 2017-11-22 18:42:33 -08:00
snipe 64b670033d Auto-bumped hash/version 2017-11-22 18:30:45 -08:00
snipe 66ac147c9e Auto-bumped hash/version 2017-11-22 07:32:40 -08:00
snipe 05e0d15ae4 Auto-bumped hash/version 2017-11-22 07:31:50 -08:00
snipe 09f20873df Auto-bumped hash/version 2017-11-21 22:35:05 -08:00
snipe 2adc1e8ba9 Auto-bumped hash/version 2017-11-21 22:35:04 -08:00
snipe 4a6c18532b Auto-bumped hash/version 2017-11-21 22:35:02 -08:00
snipe 921f882680 Auto-bumped hash/version 2017-11-21 22:35:01 -08:00
snipe f79e5add58 Auto-bumped hash/version 2017-11-21 22:34:59 -08:00
snipe 8c15a4e0c6 Auto-bumped hash/version 2017-11-21 21:00:07 -08:00
snipe 9250b45e6e Auto-bumped hash/version 2017-11-21 21:00:05 -08:00
snipe 3a1de3d2a5 Auto-bumped hash/version 2017-11-21 21:00:02 -08:00
snipe b59dd11304 Auto-bumped hash/version 2017-11-21 21:00:00 -08:00
snipe b6222abb7c Auto-bumped hash/version 2017-11-21 20:59:58 -08:00
snipe dcf8e4f5ef Auto-bumped hash/version 2017-11-21 20:59:54 -08:00
snipe f195073ac3 Auto-bumped hash/version 2017-11-21 20:59:52 -08:00
snipe 452a9d6725 Auto-bumped hash/version 2017-11-21 20:59:50 -08:00
snipe 1d74ddc547 Auto-bumped hash/version 2017-11-21 20:59:45 -08:00
snipe 932b589a14 Auto-bumped hash/version 2017-11-21 20:59:43 -08:00
snipe 671e514785 Auto-bumped hash/version 2017-11-21 20:59:41 -08:00
snipe 1e2ebdb69c Auto-bumped hash/version 2017-11-21 20:59:39 -08:00
snipe 148751d927 Auto-bumped hash/version 2017-11-21 20:59:37 -08:00
snipe efecdfaea0 Auto-bumped hash/version 2017-11-21 20:59:35 -08:00
snipe ab9c84a6b6 Auto-bumped hash/version 2017-11-21 20:59:33 -08:00
snipe 7ce63e653b Auto-bumped hash/version 2017-11-21 19:39:53 -08:00
snipe a922c1a298 Auto-bumped hash/version 2017-11-21 19:38:29 -08:00
snipe 0c9e41e1fa Updated versioning script to handle githooks better 2017-11-21 19:01:47 -08:00
snipe 4fd35573ad Bumped version 2017-11-20 21:20:34 -08:00
snipe f137e516a6 Bumped version 2017-11-14 16:49:18 -08:00
snipe 9b1fb90519 Change default log type back to single 2017-11-08 10:58:56 -08:00
snipe e6ff447ee8 Bumped hash 2017-11-07 23:12:59 -08:00
snipe eed50112d5 Better fallback for local that won’t break migrations 2017-11-07 18:18:27 -08:00
snipe 30ec919048 Remove AWS package 
We unfortunately can’t use it right now because it requires a symlink from the storage/app directory. Until we have a better way of checking for configuration issues and/or automatically handling that symlink creation, we’re pulling it for now, since it’s not used anywhere.
 2017-11-06 21:45:31 -08:00
snipe 231dea0ebc Break out service providers by responsibility 2017-11-06 21:17:17 -08:00
snipe badc763c06 Bumped version 2017-11-04 00:32:33 -07:00
snipe 1859c8f5ab Reply to seems to be overwritten 2017-11-03 14:55:03 -07:00
snipe 513a1b1e3b Bumped version 2017-11-02 12:52:44 -07:00
snipe 01bb4bf64a Bumped version 2017-11-02 11:24:01 -07:00
snipe 3343cf16dd Bumped version 2017-11-02 04:37:08 -07:00
snipe 1076ec96be Bumped version 2017-10-28 15:46:02 -07:00
snipe 41994c95e0 Bumped version 2017-10-28 11:22:27 -07:00
snipe fe70792cbd Bumped hash 2017-10-28 08:41:34 -07:00
snipe e8d938e188 Bumped hash 2017-10-25 20:18:06 -07:00
snipe 21c1ca2336 Bumped hash 2017-10-24 19:26:21 -07:00
snipe c18220069d Bumped version 2017-10-23 21:17:23 -07:00
snipe f5ce580593 Bumped version 2017-10-23 19:51:14 -07:00
snipe 341ddec9d8 Adds built-in mail notification vendor templates 2017-10-20 16:52:12 -07:00
snipe f757da1a98 Bumped hash 2017-10-19 16:45:04 -07:00
snipe 81aaed92ce Change default session name 2017-10-19 06:08:58 -07:00
snipe 34442362ca Fixes bad route for new groups 2017-10-18 02:35:30 -07:00
snipe ab3f5f4f4d Bumped version 2017-10-18 01:21:50 -07:00
snipe aa7091d962 Fixes #4226 - adds log_max_files to app config and sample env 2017-10-17 20:04:07 -07:00
snipe c0103cd878 Bumped version 2017-10-17 18:55:30 -07:00
snipe 176a26e6c3 Bumped version 2017-10-16 09:26:44 -07:00
snipe 13a716310c Bumped hash 2017-10-11 13:10:29 -07:00
snipe f468b37f36 Bumped hash 2017-10-07 07:45:43 -07:00
snipe 85da30894b Bumped version 2017-10-03 21:23:27 -07:00
snipe d303cbd7cb Bumped version 2017-10-03 05:15:52 -07:00
snipe 3687cbfdb3 Added rollbar support 2017-10-02 20:27:45 -07:00
snipe 9420913d25 Set referrer policy to same origin - should fix a lot of weird validation redirects 2017-10-02 16:35:57 -07:00
snipe cd2e137fcc Bumped version 2017-10-02 15:27:18 -07:00
snipe aab635154a Default to turning CSP off until we can fix vue/CSP issues 2017-10-02 13:29:14 -07:00
Daniel Meltzer c2616412c0 Add laravel routes to javascript (#4092) 
* Add laravel routes to javascript

This will clean up a lot of passing of urls.  Adds a route() helper and
everything...

This commit also moves the customfield fetching to only be fetched once
and shared with each file, rather than once for each file.

* Try to fix travis unit test things.

* Downgrade doctrine/inflector for php5

* Attempt to occasional seeder issues on travis if the asset does not generate validatable data.

* Update sql dump for functional tests.

* Try to fix api tests.
 2017-10-01 12:59:55 -07:00
snipe 9ce2d1f560 Merge branch 'csp-middleware' into develop 2017-09-29 04:14:33 -07:00
snipe c6069b905b Bumped version 2017-09-29 03:47:50 -07:00
snipe d9824a0454 Bumped version 2017-09-28 21:20:37 -07:00
snipe 46d87849f4 Added content security middleware 2017-09-28 19:45:15 -07:00
snipe 26a7701cda Added referrer-policy header 2017-09-28 17:12:58 -07:00
snipe 5e1df7049c Make collation and charset for mysql an env variable 2017-09-26 16:02:55 -07:00
snipe 4324242475 Bumped version 2017-09-26 11:12:36 -07:00
snipe d5e6d82ca1 Bumped version 2017-09-25 22:17:00 -07:00
snipe b354ca817d Bumped version 2017-09-25 22:10:06 -07:00
snipe abc2f7e789 Bumped build number 2017-09-25 21:57:16 -07:00
snipe 9b6276f281 Bumped version 2017-09-25 16:04:23 -07:00
snipe 0715791229 Include oauth keys in backup 2017-09-25 15:45:33 -07:00
snipe f0a49fefd7 Bumped version 2017-09-22 15:50:24 -07:00
snipe aff104fa5d Bumped version for beta 2017-09-18 18:10:43 -07:00
snipe eba145503b Bumped version 2017-09-06 19:02:05 -07:00
snipe 7c390cee2c Bumped version 2017-09-05 18:35:39 -07:00
snipe a7a10455ae Bumped version 2017-08-25 13:27:58 -07:00
snipe 16f57e16cb Fixes #1190 - added basic audit workflow 2017-08-25 10:04:19 -07:00
snipe e6323e0a1b Version bump for beta 2 2017-08-24 23:32:33 -07:00
snipe 9bda62d295 ADDED: Password rules for complexity, min length, rejecting common passwords 2017-08-22 20:32:39 -07:00
snipe ac8f46c93c Bumped version for beta release 2017-08-09 19:01:07 -07:00
snipe 241bf0cd4b Allow port number to be configured via env 2017-08-08 12:36:44 -07:00
Daniel Meltzer f432f98e12 Importer tests + Fixes (#3733) 
* Fix Bug in User::generateFormattedNameFromFullName

In a name "John Doe", this method would split it into "John" and " Doe",
Leaving a space in the last name when importing to the database.  Strip
this space.

* Cleanup/fix some item mapping.

Also make some changes to the importer schema to allow for unit testing.
Generate a default item mapping, and then merge that with any custom
mappings.

* Beginning work on importer unit tests.

* Strip out testrun branches from importer.  It added a lot of complexity and was not terribly useful with web importer as it stood, might reconsider down the road however.

* Normalize the mapped keys when using custom field mappings.

* Add test for custom asset import mapping.

* Make all unit tests inherit from a new custom base.

This baseclass currently calls Artisan::migrate() and seeds a Settings
instance.  This fixes unit tests after the autoincrement bits.

* Store requestable as a boolean.  Fixes some import oddities

* Work on tests for accessory importer.

* Test for custom mapping of accessory import, also adjust the internal field for purchase date.

* Update default locale fallback for currency detection

* Fix Reassignable in consumable as well.

* More importer tests and fixes.
 2017-07-11 20:37:02 -07:00
snipe 8aa920ca3a Update composer 2017-07-07 12:59:59 -07:00
Daniel Meltzer 5d4920c741 [WIP] Improvements to unit tests. (#3574) 
* Improvemenets to unit tests.

* Break up modelfactory into multiple files, populate many states.
* Begin testing validation at the unit test level, test relationships.
* Add tests for Asset::availableForCheckout.
* Model factories now generate all needed relationships on demand,
  which allows us to unit test with a empty database.
* To faciliate the empty database, we move to using sqlite in memory as
  the unit testing database.

* Fix bug with logs of checkouts to non users.

* Fix location finding for assets.  Also Fix location show page to show users associated with location.  Still need some work to show assets.

* More test and generator improvements

* More unit test fixes. PermissionsTest is borked still.

* More Updates

* Rewrite permissionstest.  Check that we have access on the model level rather than via web requests.  Also test delete permissions.

* Fix seeders.

* Make the default asset model factory generate assets that are rtd for testing.

* Save progress.

* Rebase tests, fix department unit test, update database for functional tests.

* Update functional and api tests to use new modelfactory signatures.
 2017-06-12 17:39:03 -07:00
snipe f57ebc664e Added dept management to permissions 2017-05-23 02:50:08 -07:00
snipe 322817b8b1 Bumped version 2017-05-08 20:02:52 -07:00
snipe 8ba19aa855 Fixes explode for trusted proxy 2017-04-27 07:09:23 -07:00
snipe 07f8c9dc5e Added additional mail markdown config variables 2017-04-27 02:27:57 -07:00
snipe c7acbc0eee Stunning hook 2017-04-06 19:45:47 -07:00
Daniel Meltzer 1bb89db451 A few fixes (#3437) 
* This method was renamed, so we need to rename the eager load

* Readd tinker to the composer dev packages.

* Update sql dump for functional tests.
 2017-03-31 13:48:31 -07:00
snipe 318ac2be9a Break cookie 2017-03-03 19:53:58 -08:00
snipe b5424462c9 Moved non-superadmin settings into sidebar 2017-03-03 17:30:12 -08:00
snipe dc38e575d9 Allow date/time formatting selection in settings 2017-03-03 17:29:41 -08:00
snipe 381526e488 Additional permissions 2017-02-22 22:21:26 -08:00
snipe 863735a6e5 Fix utf encoding on DB 2017-01-26 04:52:38 -08:00
snipe b462888850 Derp 2017-01-13 21:15:36 -08:00
snipe d39b7e19eb Updated debugbar settings 2017-01-13 21:00:02 -08:00
snipe e54036991c Updated trusted proxy config for newer version 2017-01-13 20:59:54 -08:00
snipe 8f31ee318e Removed extra commented out crap 2017-01-11 14:54:50 -08:00
snipe 84154d936a Added self.api permission 2017-01-11 04:05:39 -08:00
snipe b4bed2a11f Move cipher into the .env 2017-01-09 19:41:24 -08:00
snipe 6351746c62 Bumped to v4.0-develop 2016-12-30 16:28:47 -08:00
snipe 55415e8f56 Fix image resizing for later version of Intervention 2016-12-27 17:31:29 -08:00
snipe 2fe984013b Fixes #3092 - user location not being exported correctly 2016-12-22 15:53:34 -08:00
snipe 84e1b531fd Bumped hash 2016-12-15 20:53:50 -08:00
snipe 9ea05bacf3 User resource routes 2016-12-15 20:52:39 -08:00
snipe 4751bcd002 Use redirect()->route instead of ->to 2016-12-15 20:02:47 -08:00
snipe 25f60264bd Passport scaffolding 2016-12-14 10:06:05 -08:00
snipe 69031d4215 Put notifiable back in 2016-12-14 05:07:02 -08:00
snipe c5b24c83df Updated app config for 5.3 
THIS WILL BREAK ON UPGRADE RIGHT NOW.

I need to more gracefully handle the switch between mcrypt and the new cipher
 2016-12-14 04:33:27 -08:00
snipe 42fe481f71 Bumped hash 2016-12-12 19:06:36 -08:00
snipe 32c5a258a7 Updated hash 2016-12-07 17:14:48 -08:00
snipe eb48e5ed1c Bumped hash 2016-12-05 16:12:05 -08:00
snipe 77685fd52b Bumped version 2016-12-03 17:13:09 -08:00
snipe 659d9c10ca Bumped hash 2016-12-01 05:54:21 -08:00
snipe 99e79a02d6 Revert "Halp! Stuck in pre-commit loop hell. :(" 
This reverts commit 47c77fe042.
 2016-12-01 03:08:14 -08:00
snipe 47c77fe042 Halp! Stuck in pre-commit loop hell. :( 2016-12-01 03:07:47 -08:00
snipe e42da293ee Updated version for pre-release 2016-12-01 03:07:21 -08:00
snipe a2ffe77d55 Automatically updated version hash 2016-12-01 03:07:12 -08:00
snipe a7a9f027fb Automatically updated version hash 2016-12-01 03:00:18 -08:00
snipe e587b2dcee Automatically updated version hash 2016-12-01 03:00:02 -08:00
snipe c3b4342df4 Automatically updated version hash 2016-12-01 02:59:17 -08:00
snipe 5a7ea0e908 Updated hash 2016-12-01 02:59:11 -08:00
snipe 1be22cf051 Improved versioning script 2016-12-01 02:53:41 -08:00
snipe e62f3f9fb4 Bumped hash 2016-12-01 02:27:12 -08:00
snipe 3f8f6ad981 Fixes #2995 - adds max login attempts/duration as .env option 2016-12-01 02:04:15 -08:00
snipe 5bca1ed2b6 Allow supression of debug warning for demo 2016-12-01 00:48:43 -08:00
snipe 820d37cabb Custom logging to only show debug info if the app is in debug mode 
or if the user has overridden the APP_LOG_LEVEL in their env
 2016-11-30 20:38:46 -08:00
snipe b614470b21 Updated serial text to product key 2016-11-29 21:45:49 -08:00
snipe 227ac94aa2 Bumped version hash 2016-11-29 06:21:37 -08:00
snipe 6bb5555a73 Fixes #2980 - enable MySQL SSL settings 2016-11-28 19:25:26 -08:00
snipe 2ef4b58a8c Bumped version 2016-11-15 17:49:24 -08:00
snipe af97d8ed24 Bumped version 2016-10-31 21:05:07 -07:00
snipe cbfcf959f9 Allow certain users to override 2FA with permission 2016-10-31 16:52:25 -07:00
snipe cea255995c Fixes #106 - adds Google Authenticator support (#2842) 
* refactor to clean up LDAP login, and make the login method easier to handle.

* Login refactor cleanup

* Google 2FA package

* Adds Google Authenticator two-factor

* Removed unused blade

* Added optin setting in profile

* Removed dumb comments

* Made lock_passwords check more consistent

* Additional two factor strings

* Lock passwords check

* Display feature disabled text if in demo mode

* Two factor admin reset options

* Translation strings
 2016-10-29 05:50:55 -07:00
snipe 86ef44b43d Bumped version 2016-10-27 22:17:30 -07:00
snipe 43404e427d Bumped version 2016-10-26 10:31:13 -07:00
snipe f156ec58b6 Bumped version 2016-10-25 12:38:18 -07:00
snipe da0b6d4d90 Merge branch 'hotfixes/fix_typo_in_permissions_for_accessories_create' into develop 2016-10-25 11:40:34 -07:00
snipe 40befa7b37 Fixes #2792 - corrected typo in permissions array for creating accessories 2016-10-25 11:38:24 -07:00
snipe d6f7e03431 Bumped version for pre-release 2016-10-04 11:58:19 -07:00
snipe 85ddb9cfff Bumped version 2016-09-29 22:37:54 -07:00
snipe ed22ec4b36 Bumped hash 2016-09-27 08:42:55 -07:00
Andrés Núñez 40f00665b3 Translate emails (#2652) 
* commit temporal

* final translation commit -- added email translations

* final translation commit -- removed file for spanish translations

* final translation commit -- removed file for spanish translations

* added missing translations

* method overrided and config files back to default

* config files back to default

* config files back to default
 2016-09-26 14:13:07 -07:00
snipe bd5e6d8551 Add reply-to config setting 2016-09-20 07:20:10 -07:00
snipe 998624ad68 Bumped version for v3.5-beta 2016-09-20 00:50:35 -07:00
snipe 35f3f1432f Bumped version 2016-09-06 10:38:07 -07:00
snipe f81b21208b Bumped version for v3.4.0-beta 2016-08-30 07:39:55 -07:00
snipe 64cd4fb1c9 Allow X-Frame-Options to be disabled via env if necessary 2016-08-29 22:57:29 -07:00
snipe a92ed97b4e Definitely not beta ;) 2016-08-25 21:06:43 -07:00
snipe fcdea4825e Bumped version 2016-08-25 21:04:43 -07:00
snipe b1324c2e64 Removed beta from version 2016-08-23 11:37:49 -07:00
snipe 3c28be33c5 Bumped version 2016-08-23 11:37:00 -07:00
snipe d9f2e7bf58 If custom field is type URL, display it as a link 2016-08-18 12:44:55 -07:00
snipe 29c4189419 Bumped version 2016-08-16 18:20:42 -07:00
snipe 41a20d8f66 Tidied up some debugging code, better explanation 2016-08-12 17:10:03 -07:00
snipe 4c787891e4 Use custom maintenance middleware 2016-08-11 19:22:26 -07:00
snipe 8dbc098836 Bumped hash for 3.2.0 2016-08-02 15:25:23 -07:00
snipe 45ea44e172 Bumped hash 2016-08-02 15:16:16 -07:00
snipe e4355292e4 Bumped hash version 2016-08-02 13:30:00 -07:00
snipe 682c75e990 Bumped version 2016-08-02 10:34:30 -07:00
snipe 39929c7d89 Better handling for deleted users 2016-08-02 04:23:13 -07:00
snipe e7e8c487c9 Bumped version 2016-08-02 02:32:52 -07:00
snipe 64ffd261fc Bumped version 2016-08-02 01:14:11 -07:00
snipe 8246a319a2 Fixes #2363 and #1097 2016-08-02 00:54:38 -07:00
snipe b6986ad808 Bumped version 2016-08-01 10:31:46 -07:00
snipe b63a3abf70 Bumped hash 2016-07-29 14:18:05 -07:00
snipe c0f4e621ea Bumped version 2016-07-28 08:41:33 -07:00
snipe 214a7d548d Bumped version 2016-07-28 06:44:59 -07:00
snipe 075f8fd021 Fixed typo 2016-07-28 05:49:55 -07:00
snipe e9eb5ad372 Bumped version 2016-07-27 20:30:11 -07:00
snipe 7f5ea72dc7 Bumped version 2016-07-22 15:11:03 -07:00
snipe 78fda31379 Helper method to introspect into the model level validation to see if the field is required 
(This does not yet handle form request validation)
 2016-07-22 00:29:23 -07:00
snipe d427dcc8e2 updated version 2016-07-22 00:24:42 -07:00
snipe e256bdc9f7 Clearer version in footer 2016-07-21 21:39:23 -07:00
snipe 2e6e0e8911 Fixed versioning path 2016-07-21 21:30:49 -07:00
snipe 5266bd4415 Bumped version 2016-07-19 02:04:08 -07:00
snipe f3e99113d2 Bumped version 2016-07-13 05:53:23 -07:00
snipe 8fe1b88947 Disable email alerts on backups by default 2016-07-01 01:05:45 -07:00
Brady Wetherington 345a0da337 Add Unix Socket support to standard .env configurations for DB (#2208) 2016-06-28 20:15:03 -07:00
Nikolai Prokoschenko 8d03668d78 Fix reverse proxy support 
Reintroducing trusted proxies via fideloper/proxy:

* Upgraded fideloper/proxy to 3.1
* Added fideloper/proxy to Http/Kernel.php
* Added fideloper/proxy to config/app.php
* Added environment variable APP_TRUSTED_PROXIES to env (with '*' being the default fallback)
 2016-06-16 15:43:42 +02:00
snipe 9ced24b127 Bumped version for RC-3 release 2016-06-02 19:06:54 -07:00
snipe dce549cc5c Updated debugbar prefs 2016-06-02 02:49:17 -07:00
snipe 5f5fddb7a4 Updated permissions array 2016-06-02 02:39:23 -07:00
snipe 6724489be2 Added additional dump variables 2016-05-19 23:37:36 -07:00
snipe 1acfd525e8 Fixed stupid parse error 2016-05-12 17:12:52 -07:00
snipe cfe38322b9 Get backups to work again 
This is still a littlw wonky tho :(
 2016-05-12 17:11:26 -07:00
snipe 9cfde523b0 Updated laravel-backup package 
Files are still not being generated. Open a ticket with the package maintainer
 2016-05-12 16:54:07 -07:00
snipe 449163c875 Fixes #1995 - updated group admin to use native permissions 2016-04-28 14:03:54 -07:00
snipe e4b5d426db Set DB prefix in env 2016-04-19 00:47:12 -07:00
snipe bddb7fca23 Additional doc blocks, added private_uploads path 2016-03-25 15:50:08 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00