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
4014 commits 101 branches 268 tags 320 MiB
Commit graph

4014 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 8d23398176 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-18 20:07:14 -07:00
snipe 5aae930e8c Bumped version 2018-07-18 20:05:48 -07:00
snipe 6db096c336 Add @takuy as a contributor 2018-07-18 20:04:09 -07:00
snipe 78d27e82c8 Updated language strings 2018-07-18 20:03:31 -07:00
Sam 2a4fef6a61 adds select-id as an option for the asset-select partial. allows you to manually override the ID of an element. currently, the bulk-checkout partial has two asset-selects, with conflicting IDs. attempts to resolve #5882 (#5883) 2018-07-18 19:55:13 -07:00
snipe 9daeeeb851
Features/nicer notifications (#5886) 
* Improved expiring licenses notification

* Improved expiring assets notification

* Nicee low inventory notification

* Refactored stupid language strings

* Oops

* Use settings variable
 2018-07-18 19:15:45 -07:00
Daniel Meltzer 92671823d8 Userimport fixes/improvements (#5884) 
* Send notification when user is created.
* Flesh out default user mappings
* Add user importing test.
 2018-07-18 19:15:07 -07:00
Daniel Meltzer 19396b2107 Logic Fix (#5877) 
If we have a username, we should look that up even if we do not have a
first name.
 2018-07-18 19:10:36 -07:00
Brady Wetherington f0332a7388
Add DB port number to docker 
which gets copied to the docker image's `.env` file during installation. This closes #5718
 2018-07-18 19:10:06 -07:00
snipe 70cb5ed215 Updated language strings 2018-07-18 08:55:38 -07:00
snipe d309f67df0 Set activated to zero if no values passed for active user 2018-07-18 08:27:26 -07:00
snipe 7dc070ec2c Add @engrzhou as a contributor 2018-07-18 07:39:46 -07:00
snipe 2ecdf19569 Add @GodUseVPN as a contributor 2018-07-18 07:39:23 -07:00
snipe c56f2625b7 Add @grayhoax as a contributor 2018-07-18 07:38:57 -07:00
snipe 3dc154991a Add @wira-sandy as a contributor 2018-07-18 07:37:56 -07:00
snipe a5f57c050f Add @vipsystem as a contributor 2018-07-18 07:37:30 -07:00
snipe 36c4cd98e0 Add @vinzruzell as a contributor 2018-07-18 07:36:31 -07:00
snipe f6ef6039f4 Add @fraccie as a contributor 2018-07-18 07:35:55 -07:00