DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
1274 commits 101 branches 268 tags 320 MiB
Commit graph

1274 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 85ddb9cfff Bumped version 2016-09-29 22:37:54 -07:00
Michael T c6338d6a8b Apologies. Still learning Git, and CentOS isn't a big strength for me. (#2701) 
This should properly include #2674
Cleaned up the script itself, added progress bars so end users don't think the script is stuck
 2016-09-29 22:37:05 -07:00
Daniel Meltzer b92d26f3c4 When checking out a consumable, don't say asset (#2718) 2016-09-29 22:20:58 -07:00
Daniel Meltzer 2a95a95e00 Company to logs (#2717) 
* Fix the actionlog/companyables problem by adding a company_id to all actionlogs and scoping directly on that.  Works around bugs in laravel where trying to hunt down the polymorphic relationship would lead to an infinite loop

* Scope companyables in getactivityreport.  Also eager load.

* Improve reportscontroller, work on seeder to test this.

* Only show company users in checkout dialogs

* If no admin associated with log, it might be a request.  Leave blank instead of saying deleted admin

* When injecting company_id, use target instead of user if user is a superadmin

* Build up the seeder to generate users, companies, and logs.

* Eager load the log, don't scope the users log because the log should already include things only related to the user.
 2016-09-29 22:20:49 -07:00
snipe b41883c125 Use user object to prevent errors on deleted users 2016-09-29 11:37:38 -07:00
snipe 0a218a37d0 Check that the user exists before trying to get location id 2016-09-29 10:32:09 -07:00
Brady Wetherington 7ca7877740 Fix mismerged code. (#2705) 2016-09-28 22:57:19 -07:00
snipe 1394424760 Merge branch 'hotfixes/customfields_in_asset_report' into develop 
# Conflicts:
#	resources/views/models/custom_fields_form.blade.php
 2016-09-28 19:28:55 -07:00
snipe fc07753a5c Use $customfields in closure 2016-09-28 19:18:01 -07:00
snipe 7bbe85801e Fixed typo :( 2016-09-28 15:45:05 -07:00
snipe 8774927b91 PHPStorm lag = fail 2016-09-28 15:40:51 -07:00
snipe 8cb4954f8a Apply encrypted fields patch from develop 2016-09-28 14:58:01 -07:00
snipe 48b52a0ccc Merge branch 'hotfixes/p-typo' into develop 2016-09-28 08:59:07 -07:00
snipe 9ecb0e6ca1 Fixed errant typo 2016-09-28 08:58:16 -07:00
snipe 9091385182 Merge branch 'hotfixes/purchase_cost' into develop 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	config/version.php
 2016-09-27 19:13:21 -07:00
snipe b90c0de822 Fix companyable reult in maintenances 2016-09-27 19:07:45 -07:00
snipe ee2522571c Fixes #2673 2016-09-27 19:07:30 -07:00
snipe d3a13bcd45 Functional config for laravel 5 2016-09-27 18:47:00 -07:00
snipe 67f199b09d Added customfields to asset CSV export 2016-09-27 15:09:47 -07:00
snipe f1c458185d Client-side pagination on asset report for faster loading 2016-09-27 14:56:05 -07:00
snipe ed22ec4b36 Bumped hash 2016-09-27 08:42:55 -07:00
snipe fa72e64b98 Add checkout date to asset report 2016-09-27 08:42:48 -07:00
snipe 2a8ab06ca3 Remove escaping for CSV to prevent weird encoding 2016-09-27 07:25:28 -07:00
snipe 61d07bdc7c Sigh. 2016-09-27 07:24:26 -07:00
snipe 3061ce2983 Missed delimiter for CSV 2016-09-27 07:23:30 -07:00
snipe e9f3d622f5 Add company name to custom asset report 2016-09-27 07:19:52 -07:00
snipe 1e3244b2b3 Merge branch 'hotfixes/eol' into develop 
# Conflicts:
#	app/Http/Controllers/AssetModelsController.php
 2016-09-27 07:04:45 -07:00
snipe a92bfe8ade Default EOL to null, not 0, if no value entered 2016-09-27 06:53:59 -07:00
snipe c42dfadd17 Merge branch 'hotfixes/purchase_order' into develop 
# Conflicts:
#	app/Http/Controllers/LicensesController.php
 2016-09-27 01:31:02 -07:00
snipe 0a391de09f Fixes #2682 - search on purchase_order 2016-09-27 01:29:31 -07:00
snipe b6cc7e7c14 Fixes bug where 12-hour fprmat for hours was used 2016-09-26 22:35:51 -07:00
snipe 819ca2921b Fixes bug where 12-hour format was used for hours 2016-09-26 22:34:09 -07:00
Joris van Eijden 7d272e3c96 Fix pre-flight port number check. (#2681) 2016-09-26 18:23:56 -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
tiagom62 03ee6b8f91 SELinux and iptables update for installer (#2674) 
* detect SELinux

detect SELinux is enforcing and set required security policies for
CentOS 7

* Centos 6 iptables

allow http/https if iptables is running
 2016-09-26 14:11:43 -07:00
snipe 937192f7ce Ugh… git… why? 2016-09-23 14:13:41 -07:00
snipe ce1f62b9be Merge branch 'hotfixes/2672' into develop 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
 2016-09-23 14:12:52 -07:00
snipe 3208522dd1 Fixes #2672 - model_no field updated to be string 2016-09-23 14:10:08 -07:00
snipe c3cd329604 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-09-23 13:14:18 -07:00
snipe 2ba4986396 Updated history importer message 2016-09-23 13:14:11 -07:00
snipe 8ba19632cf Removed new badge 2016-09-23 13:13:42 -07:00
Michael T caf6a10227 grr.. Fixed git commit message stuck in file. (#2659) 2016-09-21 15:27:09 -07:00
Eammon Hanlon 580091269d mkdir not recursive (#2460) 
* Fix path to snipeit-ssl.crt (#2428)

* Modified 'recursive' part of the tuple to true
 2016-09-21 12:05:06 -07:00
Michael T bcc6ca5180 Deb/Ubu pro bar & Ubu 16 php-xml pkg (#2644) 2016-09-20 13:26:53 -07:00
snipe 7fdd4fbe98 Updates to the history importer to make it a little less brittle and provide better feedback 2016-09-20 09:22:49 -07:00
snipe aecef2618f Add reply-to for mail 2016-09-20 07:20:40 -07:00
snipe bd5e6d8551 Add reply-to config setting 2016-09-20 07:20:10 -07:00
snipe 1e4e9dd3d7 Updated language files 2016-09-20 05:08:04 -07:00
snipe 2ab91fed01 Fixes #2607 - non-encrypted now visible to non-admins with asset access 2016-09-20 03:48:38 -07:00
snipe 5b0220ac1e Fixed typo 2016-09-20 03:01:04 -07:00