DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 17:44:17 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
2197 commits 96 branches 267 tags 295 MiB
Commit graph

2197 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe dcfc434075 Added suppliers back to new side menu (oops) 2017-05-15 20:55:53 -07:00
snipe 0c8308f5a4 Fixes for ordering on asset listing 2017-05-15 20:55:39 -07:00
snipe 1bd798c4d2 Removed Brady’s email address 2017-05-15 19:51:05 -07:00
snipe 23be188a49 Fixes #3579 2017-05-15 19:28:26 -07:00
snipe fdd88af44a Fixes #3556 2017-05-15 19:14:55 -07:00
Nate Felton 5a3816c907 Fixing a regression for RHEL 6 with snipe/snipe-it#2993 (#3572) 2017-05-12 17:19:41 -07:00
snipe c8796cf045 Only prompt for checkin if there is an assigned user 2017-05-10 03:37:30 -07:00
snipe f4095c6dd0 Bumped version 2017-05-09 15:32:34 -07:00
snipe ee2c67a65f Added missing logging back in 2017-05-09 15:30:45 -07:00
snipe 5614578710 Don’t make the item clickable if it’s been deleted 2017-05-09 15:30:19 -07:00
snipe 07882110fa Cleanup dashboard controller 
We ajax this data in now
 2017-05-09 00:38:45 -07:00
snipe 7a05467dbf Fixed missing password routes 2017-05-09 00:37:37 -07:00
snipe b7843ea565 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-05-08 20:07:03 -07:00
snipe 4f9a253103 Fixes #3546 - increases size of field values in custom fields for listboxes 2017-05-08 20:06:52 -07:00
snipe 322817b8b1 Bumped version 2017-05-08 20:02:52 -07:00
Daniel Meltzer 82dc06ae19 Remove php7 feature (#3548) 
...
 2017-05-08 18:19:34 -07:00
Daniel Meltzer 38372f2b37 Remove php7 specific feature (#3547) 
Not sure how this got in... I don't remember writing it (but I guess I did!)
 2017-05-08 18:19:15 -07:00
Daniel Meltzer e9b056f66c Importer fixes v2 (#3524) 
* Pave the imports table

* Format error response if file is the wrong type.

* If a custom field doesn't exist, don't insert a blank string into the custom fields table

* CustomField::db_column_name can return the stored name in the db.  It's slugified when that value is set initially.  This fixes a weird issue where _1 was replaced with _xx
 2017-05-03 12:14:35 -07:00
snipe f6be7caaeb Updated composer to prevent ambiguous warnings 2017-04-27 18:50:00 -07:00
snipe d7f6d8e997 Fix for completely erroneous DBAL error 
This should not work, but somehow does.

¯\_(ツ)_/¯
(╯° °）╯︵ ┻━┻

I hate computers.
 2017-04-27 16:56:15 -07:00
snipe 841e3efe96 Add passport commands to boot() to allow us to call them via PHP 2017-04-27 07:09:46 -07:00
snipe 8ba19aa855 Fixes explode for trusted proxy 2017-04-27 07:09:23 -07:00
snipe 5ad9e8585d New composer options 2017-04-27 05:24:30 -07:00
snipe 68e831d555 Fixes #3514 - removed debugging code that was forcing 404 2017-04-27 05:22:03 -07:00
snipe 6fbf45554b Updated phpunit, removed post install and post update commands to see if that fixes upgrade issues 2017-04-27 02:28:22 -07:00
snipe 07f8c9dc5e Added additional mail markdown config variables 2017-04-27 02:27:57 -07:00
snipe e088eea2f7 Pull out weird query scope that breaks stuff when querying large datasets 2017-04-26 22:40:20 -07:00
snipe f4cdeaa956 Fixes #3514 - move tinker requirement out of dev 2017-04-25 07:46:56 -07:00
snipe 59a4e161ff Fixes checkout buttons on licenses list 2017-04-24 21:37:20 -07:00
snipe 6d53a5f58d Updated test for new JSON 2017-04-22 19:31:22 -05:00
snipe 54a2c46101 Fixes #3491 - adds supplier info to assets listing 2017-04-22 19:14:28 -05:00
snipe a7132fcdd7 Updated translation strings 2017-04-06 21:36:33 -07:00
snipe 7305169b79 Removed extra comments 2017-04-06 21:18:42 -07:00
snipe dcd8e800b1 Moved statuslabels API for route priority 2017-04-06 21:18:35 -07:00
snipe 9c637ba62c Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-04-06 21:03:47 -07:00
snipe 08ef78356d Update Crowdin configuration file 2017-04-06 20:59:25 -07:00
snipe ef42bcc223 Update Crowdin configuration file 2017-04-06 20:59:24 -07:00
snipe 120c08b3a3 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-04-06 20:08:52 -07:00
snipe e32d2f98b5 Added nameUrl presenters (for now) 2017-04-06 20:08:47 -07:00
snipe aa354e883e Removed erroneous comments 2017-04-06 20:08:38 -07:00
itsupportcmsukorg 89ba221765 fix upload hour so it's 24hr instead of always AM (#3480) 
correct an error where logUpload was trying to save 12-hr time to a 24-hr field, e.g. 15:00 (3pm) was becoming 3:00 (3am)
 2017-04-06 19:48:15 -07:00
snipe c7acbc0eee Stunning hook 2017-04-06 19:45:47 -07:00
snipe 961c019554 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-03-31 15:48:49 -07:00
snipe b2e122c1e9 Add @HinchK as a contributor 2017-03-31 15:46:42 -07:00
Kasey 5663429280 applying PR #3456 changes to develop branch (#3472) 
* updating with changes made to master

apply PR # 3456 to develop as well

* updating develop with changes made to master

apply PR # 3456 to develop as well

* updating paveit with passport-created oauth tables
 2017-03-31 15:43:37 -07:00
Manasses Ferreira 47ac59abef We noted that the barcode folder was not being created. (what is done now in the entrypoint.sh) At the same time, a wrong directory was being created. (which explains the deleted line in Dockerfile) (#3456) 2017-03-31 13:48:50 -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
Andrea Bergamasco 7ee172888d /api_tests: Completed tests for basic CRUD for Assets and Components (#3426) 
* Refactored AssetsTransformer

Casted all ids to int, escaped all text values,

* Added warranty_expires attribute to Asset model

$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.

* Ignoring php-cs cache files

* Restored asset tests expectations

Work in progress - tests still fail

* API controller refactoring, fixed HTTP status codes in responses

* Restored $request->get - debugging

* Added further checks in ApiAssetsCest::updateAssetWithPatch

* /api_tests: Fixed bugs in update() method + code formatting

* /api_tests: Minor code formatting

* /api_tests: Mirrored test code for PATCH and PUT methods

* Removed repeated code

* Test cleanup

* Fixed issues with update() through PATCH and PUT methods

* Added API test suite to .travis.yml
 2017-03-31 13:48:11 -07:00
snipe 45ac1de6bb Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-03-14 16:21:49 -07:00
snipe f45a3fedca Remove circle-ci config 2017-03-14 16:21:37 -07:00