Commit graph

3815 commits

Author SHA1 Message Date
snipe 80ac46af78 Add @fgbs as a contributor 2018-07-18 06:55:12 -07:00
snipe 13c58b54fa Add @frapposelli as a contributor 2018-07-18 06:54:39 -07:00
snipe 355119187a Add @Erlpil as a contributor 2018-07-18 06:54:03 -07:00
snipe 0d96587b04 Add @EpixFr as a contributor 2018-07-18 06:53:30 -07:00
snipe be806def91 Add @dominiksenti as a contributor 2018-07-18 06:50:59 -07:00
snipe 8acf8027e9 Add @danielcb as a contributor 2018-07-18 06:49:25 -07:00
snipe 893a1fec57 Add @danielheene as a contributor 2018-07-18 06:48:58 -07:00
snipe d182e40aef Add @da-friedl as a contributor 2018-07-18 06:48:34 -07:00
snipe 6118aca949 Add @dpyroc as a contributor 2018-07-18 06:48:11 -07:00
snipe f0ac83179f Add @Wxcafe as a contributor 2018-07-18 06:47:18 -07:00
snipe 8969ffc14b Update @CronKz as a contributor 2018-07-18 06:46:45 -07:00
snipe 9fb130146a Add @kopi-item as a contributor 2018-07-18 06:46:24 -07:00
snipe d285ff673a Add @Againstreality as a contributor 2018-07-18 06:46:00 -07:00
snipe 7f586da856 Add @cwlin0416 as a contributor 2018-07-18 06:45:24 -07:00
snipe c35f5b3116 Add @chibacityblues as a contributor 2018-07-18 06:44:40 -07:00
snipe 12927d2d54 Add @rudashi as a contributor 2018-07-18 06:43:43 -07:00
snipe 6b06b87547 Add @benunter as a contributor 2018-07-18 06:42:30 -07:00
snipe 058f8ae3b8 Add @aschiavon91 as a contributor 2018-07-18 06:40:14 -07:00
snipe 1faedac04b Add @angeldeejay as a contributor 2018-07-18 06:39:39 -07:00
snipe 666c7321af Add @xelan as a contributor 2018-07-18 06:39:05 -07:00
snipe 6cbaf7396a Add @sirrus as a contributor 2018-07-18 06:38:25 -07:00
snipe b706acaa9f Add @RealEnder as a contributor 2018-07-18 06:36:42 -07:00
snipe 5870acb193 Add @albertoaldrigo as a contributor 2018-07-18 06:36:04 -07:00
snipe c00b633312 Add @a-royal as a contributor 2018-07-18 06:33:05 -07:00
snipe 1c0ee7c4c5 Fixed license checkout gate 2018-07-18 05:33:14 -07:00
snipe 5a1e1c73c9 Include show_in_list option in select 2018-07-18 03:59:02 -07:00
snipe 3be68ec721 Fix location edit permissions 2018-07-18 03:43:45 -07:00
snipe d88f66b019 Updated to stale.yml 2018-07-18 02:57:05 -07:00
snipe 027edbdb21 Fixed #5872 - asset maintenances listing showing created_at instead of start_date 2018-07-18 02:24:53 -07:00
Daniel Meltzer cf03d25934 Fix importer emailformat (#5871)
* Fix Importer emailformat

Str::slug() strips periods from the string, which caused our existing
logic to misbehave when generating a user's email on an import.  Adjust
logic to use generateEmail() helper on user instead.  Also clean up some
of the logic in this method.

* Remove dead code.

* More refactor/cleanup of the user create method.  I think it is almost readable now.
2018-07-17 16:46:08 -07:00
snipe 75232d2a70 Added link to jamf2snipe 2018-07-17 14:17:13 -07:00
snipe bcb966af12 Updated composer 2018-07-17 14:17:02 -07:00
snipe 0272e58868 Add @DeusMaximus as a contributor 2018-07-17 01:11:39 -07:00
snipe bcd988bb81 Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
2018-07-17 01:11:15 -07:00
snipe aa6c21f38d Fixed typo 2018-07-17 01:03:32 -07:00
snipe 3fb5f6f5be Revert 2018-07-17 01:03:25 -07:00
snipe 5dc2ac9e22 Try to fix test
This is a listing, not a single asset
2018-07-17 00:20:06 -07:00
snipe 0f85d6810b Added login log 2018-07-16 23:49:08 -07:00
snipe bf761946da Fix activated check for login 2018-07-16 23:48:46 -07:00
snipe d9fa2f0e91 Fixed #5842 - added components to location detail view 2018-07-16 21:50:14 -07:00
snipe 8a25677a8d Bumped hash 2018-07-16 21:35:21 -07:00
DeusMaximus 7c2da81700
Fix REMOTE_USER Header with IIS and AD
Remove DOMAIN\ portion of DOMAIN\user when using Windows Authentication and IIS with REMOTE_USER.
2018-07-17 14:03:19 +10:00
snipe a4799a495a
Fixes #5859 - add file name/size to file upload UI (#5861)
* Fixes #5859 - add file name/size to file upload UI

* Reverting assetcontroller

Not sure exactly what happened here…

* Production assets
2018-07-16 20:09:53 -07:00
Till Deeke b5de5ac19c Fix: Searching for multiple terms on assets (#5860)
* Give advancedTextSearch all search terms at one

The additional conditions for assets had some problems, since they were joining tables for the additional attributes. The method was called once for every search term, so the join was added multiple times if the user entered multiple search terms.

* Allows search to handle multiple search terms better

The search now better handles multiple search terms, adding additional orWhere clauses, instead of duplicating all queries.

* Fixing typo
2018-07-16 17:44:31 -07:00
Daniel Meltzer 638a7b2d91 Assetcontroller cleanup (#5858)
* Extract method/cleanup

* Remove apiStore method that is unusued since api controllers.

* Use proper model exception

* Remove old user importer.  This is now supported by the general importer framework.

* Refactor AssetsController methods.

This is a giant diff without many functional changes, mostly cosmetic.
I've pulled a number of methods out of assetscontroller, preferring
instead to create some more targetted controllers for related actions.
I think this cleans up the file some, and suggests some places for
future targetted improvement.

Fix weird missing things.

* Fix Unit test failing after date changes.

* Pass valid string to be translated.

* Some method cleanup for codacy.

* Extract trait for common checkout uses and codacy fixes.
2018-07-16 17:44:03 -07:00
Daniel Meltzer dcf72ce2da Strip timestamps from comparison for api tests, in an attempt to fix the test failures. (#5847) 2018-07-16 14:41:51 -07:00
Daniel Meltzer 8f6e0ad5be Only error if checking out to asset with same id (#5845)
A user with an id of 2 is perfectly fine as a checkout_target of an asset with an id of 2.
2018-07-16 14:25:36 -07:00
Daniel Meltzer 50e0b9b84e category_id not category_i (#5844) 2018-07-16 14:23:24 -07:00
Daniel Meltzer b6b93550fe Remove old helpers (#5843)
* Cleanup model bulk-edit

Use the general partials where appropriate, as well as display a list of
what models we are editing in the bulk edit.

* Use new api based fetch/display for modal select2.

This is just copy/pasting the code currently because I'm not entirely
sure how the two pieces of code interact.

* Remove old helper functions that are no longer necessary with our populating of select2 dropdowns via ajax.
2018-07-16 14:22:25 -07:00
Till Deeke baa3be728d Refactoring: A nicer and easier syntax for searching models (#5841)
* Adds the ability to search by dates

Adding extra „where“-conditions to the „TextSearch“ queries, allowing the users to search by dates

* Adds missing dates to $dates in models

* Removes duplicated „where“ conditions

* Adds the Searchable trait to models, defining the searchable attributes and relations

* Removes the old text search methods

* Adds back additional conditions to the search

These conditions could not be modeled in the „attributes“ or „relations“, so we include them here

* Removes unnecessary check for the deleted_at attribute

* Fixes typo in comments

* suppresses errors from Codacy

We can safely ignore the error codacy is throwing here, since this method is a standin/noop for models who need to implement more advanced searches
2018-07-16 14:13:07 -07:00