DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
3956 commits 101 branches 268 tags 288 MiB
Commit graph

3956 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe f6971b8ab2 Fixed #6082 - don’t show expected checkin in email if none given 2018-08-16 14:30:06 -07:00
snipe aed769c0be Honor active status for forgotten password request forms 2018-08-14 20:05:57 -07:00
snipe 1543cdbc61 Set activated checkbox to 1 by default on new user 2018-08-14 18:17:37 -07:00
snipe ce45c3af4e Updated password reset language 2018-08-14 18:11:32 -07:00
snipe 25097bce31 Only allow activated users to reset their password 2018-08-14 18:04:27 -07:00
Daniel Meltzer 2d0df24ef3 Check for an existing username before getting creative. Fixes #6016 (#6039) 2018-08-03 16:35:13 -07:00
snipe 1a660911e7 Check for minimum PHP version in setup 2018-08-02 21:36:18 -07:00
snipe 84f20b6287 Added php version check to upgrade.php 2018-08-02 20:55:52 -07:00
snipe 134bddf4c7 Fixed #6029 - model number not appearing in checkin/checkout emails 2018-08-02 11:43:11 -07:00
Daniel Meltzer e368a20427 Use filled instead of has. (#6033) 
I think this merged in a weird order and was missed by the global
find/replace.  This fixes bulkassets/bulkusers editing.

At some point we should look at refactoring BulkAssetsController@edit to
only run one DB query, rather than one per item.
 2018-08-02 09:54:19 -07:00
Daniel Meltzer 2637ce56a1 Allow importcontroller to return 200 for failed delete. (#6034) 2018-08-02 09:53:54 -07:00
snipe ffed306ecd
Removed old emaol templates (#6026) 
Still testing this to make sure it doesn’t break anything else :)
 2018-08-01 20:56:32 -07:00
snipe f5a5d830a5 Better handling for deleting imports where the files may have been moved 2018-08-01 20:49:55 -07:00
snipe 9168979d9e Fixed #6027 - added model to asset maintenances listing 2018-08-01 18:24:52 -07:00
snipe 6f8680efa6 Added external link formatter to BS tables 2018-08-01 18:01:31 -07:00
snipe 3f394f42c7 Partial fix for better UI on deleting files 
Still needs Vue stuff
 2018-08-01 18:01:16 -07:00
snipe b2c99c88bb Fixed #6028 - added supplier url to list view 2018-08-01 17:37:58 -07:00
snipe 9a3683ce7c Remove app_locked 2018-08-01 15:36:20 -07:00
snipe 2fa66f4551 Removed duplicate BACKUP_ENV in example env 2018-08-01 15:27:51 -07:00
snipe a4019c9f63 NIcer UI for activated user + email credentials 2018-08-01 14:18:37 -07:00
snipe 694166862e
Added attempted logins admin screen (#6018) 
* Added attempted logins admin screen

* Smaller table spacing
 2018-08-01 03:51:59 -07:00
snipe 911c2398ef Fixed #6004 - set a default next_audit_date if none provided 2018-08-01 03:04:29 -07:00
snipe a209a92de8 Fixed #6011 - use correct file created at date 2018-08-01 02:43:08 -07:00
snipe 462878a307 Production assets 2018-08-01 00:27:19 -07:00
snipe 3941437ad4 Limit width of title logo so it doesn’t break with long names 2018-08-01 00:27:14 -07:00
snipe 664cc24481 Fixed PR #6002 2018-08-01 00:26:50 -07:00
snipe 2c38036123
Improvement: Better documentation, small refactors (#6017) 
* Better documentation, small refactors

* Small comment fixes
 2018-08-01 00:06:41 -07:00
Sam 6ae096a56f These changes will allow submissions during the AJAX process in Select2s. This allows for barcode scanners, magstrip and NFC scanners that enter a carriage return. (#6002) 2018-08-01 00:06:28 -07:00
snipe 436bf152ec Config for new bots 2018-07-31 17:40:32 -07:00
snipe b1b5eeecba Fixed #6013 - add accessory checkout notes to detail page 2018-07-31 16:00:38 -07:00
snipe 400913631c Use language strings for bulk password reset 2018-07-30 20:37:19 -07:00
snipe 006a3adea0 Added ability to trigger forgotten password emails for users 2018-07-30 20:31:02 -07:00
Earl Ramirez c2bb3892b7 [WIP] Fix apache default page on ubuntu (#5998) 
* Added cron to list of packages

* Updated APP_PATH

* Rename virtual hosts config files
 2018-07-30 18:09:37 -07:00
Jason 5c820dd7b8 Added code to snipeit.sh for Raspbian 9.4 install (#5980) 
* Added code to snipeit.sh for Raspbian 9.4 install

* More additions to snipeit.sh to install php7.2  on raspian in prep for
version 5

* added public/phpinfo.php to .gitignore

* Deleted phpinfo.php

* removed phpinfo.php from .gitignore
 2018-07-27 12:57:39 -07:00
Daniel Meltzer 248fcfa869 Move findLicenseSeatToCheckout back to controller. (#5970) 
* Move findLicenseSeatToCheckout back to controller.

After discussion, move findLicenseSeatToCheckout method back to
controller from form request.  Also cleanup one tiny bit more with null
coalesce operator (Yay php 7).

* Revert Earlier change.

$target only exists in the checkoutTo* methods.  Need to log the
checkout individually in each of those.
 2018-07-27 12:03:04 -07:00
Daniel Meltzer b58c77c8b8 Feature: Import users department. (#5987) 
Maps to the "Department" header key by default.  Bug: #5382
 2018-07-27 12:02:18 -07:00
Daniel Meltzer 94c79fa69a Fixed #5964 - Feature: Group IDs can be passed to User Create. (#5990) 
Also added to update, and adjusted api tests to confirm.  Long term it
might be nice to look at support for passing group names instead.

Bug: 5964
 2018-07-27 12:01:59 -07:00
Daniel Meltzer a3811f632d Licence != License (#5993) 2018-07-27 12:01:25 -07:00
snipe d8f0102204 Merge branch 'features/restore_deleted_cmd' into develop 
# Conflicts:
#	config/version.php
#	resources/views/layouts/basic.blade.php
 2018-07-27 02:48:13 -07:00
snipe 6b013724aa Uncomment backup 2018-07-26 18:11:51 -07:00
snipe 8774f0cf45 Script to restore deleted users and put their asset assignments back 2018-07-26 18:08:49 -07:00
snipe 8762e158c4 Delete content from login attempts table 2018-07-26 18:08:25 -07:00
Daniel Meltzer 49d95892e3 Port asset history importer to league/csv9 (#5972) 2018-07-26 12:04:21 -07:00
snipe 9618878023 Restrict users asset listing to just assets checked out to users 2018-07-25 21:40:33 -07:00
snipe 614e858e44 Restrict users asset listing to just assets checked out to users 2018-07-25 21:38:14 -07:00
snipe b267b34762 Make sure there is a settings value 2018-07-25 19:02:35 -07:00
snipe 708b1a962c Split out custom_css from custom_header 
This makes it so that the custom_css will still be respected even if there is no custom header
 2018-07-25 19:01:47 -07:00
snipe a5daee811b Split out custom_css from custom_header color 2018-07-25 19:00:03 -07:00
snipe 1fd0b14b98 Removed ide-helper config 2018-07-25 12:07:50 -07:00
snipe ce44744dc6 Yoinked ide-helper 2018-07-25 12:07:03 -07:00