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
5082 commits 96 branches 267 tags 295 MiB
Commit graph

5082 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 75b3c66908 Spatie backup lang updates 2018-07-24 21:13:02 -07:00
snipe 52bd7e4dfb Added language file for spatie 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 7bb50a61a7 Applying @dmeltzer’s changes from afc8ac5e72 2018-07-24 21:13:02 -07:00
snipe 6b31e2aca9 php7 composer 2018-07-24 21:13:02 -07:00
Antti a55a9ca4cd Fix: Made migration run original command for mysql (#5915) 
* Fix: Made migration run original command for mysql

* Added sqlite_testing migration

* Review suggested fix
 2018-07-24 20:57:47 -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
Daniel Meltzer 64d649be7f Monster: Cleanup/Refactor http controllers. (#5916) 
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods.

* Use same image upload/layout in accessories as consum+components.

* Monster: Cleanup/Refactor http controllers.

This cleans up docblocks, pulls most non-crudy actions into their own
controllers, and does general cleanup/logic refactoring.  There /should/
be no functional changes, but we all know how should works..

Extract checkin/checkout functions to a separate controller for accessories.

Move controllers to subdirectory.

Cleanup AssetModelsController

Extract component checkin/checkout

Assorted cleanups/doc/formatting in controllers.

Refactor LicenseController.

Refactor UsersController

Update viewassetscontroller.

* Codacy cleanups

* More codacy cleanups.  Extract a LicenseCheckout Form request as well.

* A bit more refactor/cleaning of the license checkout method.

* Review Related Cleanups

* Fix most of the item_not_found translations.  In many cases, the
string being generated did not even use the id parameter.  Where it
does, pass it as id instead of as a different value.

* Remove some old $data arrays from when we manually sent emails from
the controllers.  This has been superseeded by the notification system
(yay!)

* Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
 2018-07-24 19:35:26 -07:00
snipe 3de1de9dc6 Merge branch 'develop' 2018-07-24 14:04:16 -07:00
snipe e320d2ba05
Fixed #5944 - added logo option for print-assets page (#5950) 2018-07-24 13:37:02 -07:00
snipe ed78a4b8a0 Fixed activated issue for strict mode 2018-07-24 13:28:59 -07:00
snipe 376eb52f00 Fixed #5938 - added “self location edit” as permission 2018-07-24 12:42:16 -07:00
snipe 8ecceeacda Fixed weird display for self options 2018-07-24 12:41:58 -07:00
snipe f4cfb31bf4 Use request object 2018-07-24 12:10:02 -07:00
snipe 227dc7e81d Save model display setting - fix for issue in #5301 2018-07-24 12:10:02 -07:00
snipe 152d985ebc Add @Azerothian as a contributor 2018-07-24 12:10:02 -07:00
Earl Ramirez ef1e8df001 Disable file browsing (#5922) 
* Added cron to list of packages

* Disable file browsing from the public directory
 2018-07-23 20:40:04 -07:00
snipe 5c2b1a3b70 Add @Azerothian as a contributor 2018-07-23 20:29:15 -07:00
Azerothian 66c3f5432d implemented specific seat checkout (#5887) 2018-07-23 20:28:45 -07:00
Daniel Meltzer de413408f5 Port/reenable most unit tests. (#5921) 
* Port/reenable most unit tests.

Should probably flesh out notifications tests in the next few days.

* Disable json checkin in ApiAssetsTest@index for now.  It's broken, but hiding other real broken things.

* Re Disable Groups allowDelete
 2018-07-23 06:48:21 -07:00
Daniel Meltzer 059126f642 Checkout update locationid (#5919) 
* Fix missing punctuation.  Bad merge.

* If we're checking out to an location, use it's id instead of location_id
 2018-07-23 06:47:21 -07:00
Daniel Meltzer 3bc43210ab Add ID to the allowed sort fields in api/Users. (#5929) 2018-07-23 06:46:50 -07:00
Daniel Meltzer 82194cef8a bugfix: updating a user when an admin (not a superuser) would remove any groups from the user. (#5914) 2018-07-21 23:02:06 -07:00
snipe 1956a16d1e Merge branch 'develop' 2018-07-20 13:25:03 -07:00
Till Deeke e1c095adca Removes the typehint for search term string (#5904) 
The „string“ typehint only works in PHP >= 7.0.0.
Since we are still supporting versions below that, remove the type hint.
 2018-07-20 13:23:44 -07:00
Till Deeke 45a2932f4b Fixes the generation of where conditions (#5902) 2018-07-20 13:23:29 -07:00
Till Deeke b6e3715cd8 Fix: No Notifications for checking out Consumables (#5898) 
* Adds a method to consumables to check if a notification should be sent

Adds the checkin_email method to Consumables, this gets checked in notifications when checking out the consumable.

Without the method, no notifications get sent for checking out consumables.

* Fixes the checkin_email method on the License model

This should allow the License to also send checkout/checkin notifications again.
 2018-07-20 13:22:49 -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 d45e90e358 One more fix for #5893 2018-07-19 14:45:28 -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 bbb15d610f Merge branch 'develop' 2018-07-19 10:40:38 -07:00
snipe 7ebb7876c4 Partial fix for #5896 
Still need to fix the front end on edit, which seems to be defaulting to boolean
 2018-07-19 10:40:07 -07:00
snipe bd581d01a3 Use full row width for image field 2018-07-19 10:40:07 -07:00
snipe de2ebba577 Category add/edit UI tweaks 2018-07-19 10:40:07 -07:00
Daniel Meltzer 351274c633 Hotfix: the checkin_email does not exist on consumable. (#5891) 2018-07-19 10:38:50 -07:00
snipe 53fab3e9ba Merge branch 'develop' 2018-07-19 10:23:18 -07:00
snipe a0c0b7b1eb Fixed #5893 - activated typo 2018-07-19 10:22:08 -07:00
snipe 5a34d43a86 Fixed #5895 - wrong date validation in maintenances 2018-07-19 10:19:55 -07:00
snipe 86a0f77e6f Merge branch 'develop' 2018-07-19 10:15:38 -07:00
snipe 9d00ae6e50 Fixed #5894 - lookup by asset tag in top search broken 2018-07-19 10:14:02 -07:00