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

1150 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe aa92b93bd1 Fixes #2622 - add depreciation to license report 2016-09-20 02:58:08 -07:00
snipe 998624ad68 Bumped version for v3.5-beta 2016-09-20 00:50:35 -07:00
snipe d3d36315d3 Hotfixes adding company name to custom report 2016-09-20 00:49:08 -07:00
snipe 6dc143d95d Use Ajax activity report for dashboard to prevent data duplication 2016-09-20 00:46:46 -07:00
snipe d8753a7d86 Use Ajax for activity report 2016-09-20 00:46:24 -07:00
snipe 90af734f6b Fix migration from integer to string to handle polymorphic migration 2016-09-20 00:46:14 -07:00
snipe 3aa7c60765 Costometic cleanup 2016-09-20 00:45:25 -07:00
snipe 0962d770cf Ajax activity report 2016-09-20 00:45:16 -07:00
snipe 5d8c06bc30 Eager loading for custom report 2016-09-19 23:52:20 -07:00
snipe 2597a7b896 Added Ajax reporting view 2016-09-19 23:52:01 -07:00
snipe 3741a93884 Added docblocks and cleaned up spacing 2016-09-19 23:51:45 -07:00
snipe 71be73781b Add company name option to reports 2016-09-19 22:27:34 -07:00
Daniel Meltzer 7aea9341f8 Have the installer install php-xml in ubuntu 16.04, it's where the utf8_decode function is located (#2638) 2016-09-19 17:28:07 -07:00
tiagom62 e5098c3ba1 missing semicolon (#2629) 
Rookie mistake. Fixes missing semicolon in previous pr #2624.
 2016-09-17 11:39:24 -07:00
tiagom62 46507c929a Sort backups newest to oldest (#2624) 
Viewing the backup list produces a seemingly random list.

This PR sorts the files newest to oldest.
 2016-09-17 00:00:39 -07:00
tiagom62 8233d520c6 Missing file formats (#2621) 
Missing allowed file formats zip and rar.

Added rtf format pending PR 2614.
 2016-09-16 16:18:33 -07:00
tiagom62 06f174adf9 Allow uploading rtf files (#2620) 
Microsoft Open License Order Confirmation's are sent in RTF format. 

This change allows us to upload the RTF files under View License -> File Uploads.
 2016-09-16 16:18:24 -07:00
tiagom62 08f320b76a DB_DUMP_PATH not set when using install.sh (#2623) 
Backup errors out when DB_DUMP_PATH is not set. According to https://snipe-it.readme.io/docs/configuration#required-database-settings this is usually '/usr/bin'
 2016-09-16 16:17:04 -07:00
snipe 04898c49b2 Fixed wrong translation from PR 2016-09-15 20:03:47 -07:00
Karol eeff305b02 Update dashboard.blade.php (#2593) 2016-09-15 19:59:01 -07:00
Daniel Meltzer 2d8269ddcd Checkout Improvements, and initial support for requesting an asset model (#2573) 
* Create a new action_log table to replace asset_log.  Use Polymorphism to generalize class and targets.  Port everything I can find to use it.  Add a migration to port the asset_logs table to action_logs.

* Initial work on requestable asset models

* Backend work for polymorphic requests table to store checkout requests.

* Add missing files

* Add a record to the db when requesting items.  Build up a testing route for interfacing with this.

* Users can now toggle requests of items on the request page.  Reformat page to use the same tab layout we use elsewhere

* Polymorphic request function.  Implement requesting of asset models.  Need to port mail/slack to notifications still.

* Implement requesting of asset models.  Build up emails and notifications to support it.  Allow specifying a quantity of model to request.

* Add view to show currently requested assets.  Needs some work and cleanup, but it isn't accessible from anywhere yet.
 2016-09-15 19:58:27 -07:00
snipe b0a8a0427d Merge branch 'hotfix/license-clone' into develop 
# Conflicts:
#	app/Http/Controllers/ReportsController.php
 2016-09-14 19:08:06 -07:00
snipe f384593e19 Fix license cloning 2016-09-14 19:04:52 -07:00
snipe 5846f23d8b Fix stupid migration? Maybe? Might be more trouble later 2016-09-14 18:59:14 -07:00