diff --git a/.all-contributorsrc b/.all-contributorsrc index 9d1ca9105..8cbf9d64e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -755,6 +755,15 @@ "contributions": [ "code" ] + }, + { + "login": "imjennyli", + "name": "Jenny Li", + "avatar_url": "https://avatars3.githubusercontent.com/u/404729?v=4", + "profile": "https://github.com/imjennyli", + "contributions": [ + "doc" + ] } ] } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1ef3672c..df81e9809 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ### Contributing -Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing). +Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview). Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. diff --git a/README.md b/README.md index f737d050a..93b2eb511 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.io) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-81-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-82-orange.svg?style=flat-square)](#contributors) ## Snipe-IT - Open Source Asset Management System @@ -67,7 +67,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Jay Richards](http://www.cordeos.com)
[💻](https://github.com/snipe/snipe-it/commits?author=technogenus "Code") | [
Alexander Innes](https://necurity.co.uk)
[💻](https://github.com/snipe/snipe-it/commits?author=leostat "Code") | [
Danny Garcia](https://buzzedword.codes)
[💻](https://github.com/snipe/snipe-it/commits?author=buzzedword "Code") | [
archpoint](https://github.com/archpoint)
[💻](https://github.com/snipe/snipe-it/commits?author=archpoint "Code") | [
Jake McGraw](http://www.jakemcgraw.com)
[💻](https://github.com/snipe/snipe-it/commits?author=jakemcgraw "Code") | [
FleischKarussel](https://github.com/FleischKarussel)
[📖](https://github.com/snipe/snipe-it/commits?author=FleischKarussel "Documentation") | [
Dylan Yi](https://github.com/feeva)
[💻](https://github.com/snipe/snipe-it/commits?author=feeva "Code") | | [
Gil Rutkowski](http://FlashingCursor.com)
[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [
Desmond Morris](http://www.desmondmorris.com)
[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [
Nick Peelman](http://peelman.us)
[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [
Abraham Vegh](https://abrahamvegh.com)
[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [
Mohamed Rashid](https://github.com/rashivkp)
[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [
Kasey](http://hinchk.github.io)
[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [
Brett](https://github.com/BrettFagerlund)
[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") | | [
Jason Spriggs](http://jasonspriggs.com)
[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [
Nate Felton](http://n8felton.wordpress.com)
[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [
Manasses Ferreira](http://homepages.dcc.ufmg.br/~manassesferreira)
[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [
Steve](https://github.com/steveelwood)
[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [
matc](http://twitter.com/matc)
[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [
Cole R. Davis](http://www.davisracingteam.com)
[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [
gibsonjoshua55](https://github.com/gibsonjoshua55)
[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") | -| [
Robin Temme](https://github.com/zwerch)
[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [
Iman](https://github.com/imanghafoori1)
[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [
Richard Hofman](https://github.com/richardhofman6)
[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [
gizzmojr](https://github.com/gizzmojr)
[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | +| [
Robin Temme](https://github.com/zwerch)
[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [
Iman](https://github.com/imanghafoori1)
[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [
Richard Hofman](https://github.com/richardhofman6)
[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [
gizzmojr](https://github.com/gizzmojr)
[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [
Jenny Li](https://github.com/imjennyli)
[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 2f7d22115..87c8e147a 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -856,10 +856,10 @@ class Asset extends Depreciable } if ($key =='checkedout_to') { - $query->whereHas('assigneduser', function ($query) use ($search) { - $query->where(function ($query) use ($search) { - $query->where('users.first_name', 'LIKE', '%' . $search . '%') - ->orWhere('users.last_name', 'LIKE', '%' . $search . '%'); + $query->whereHas('assigneduser', function ($query) use ($search_val) { + $query->where(function ($query) use ($search_val) { + $query->where('users.first_name', 'LIKE', '%' . $search_val . '%') + ->orWhere('users.last_name', 'LIKE', '%' . $search_val . '%'); }); }); } @@ -876,8 +876,8 @@ class Asset extends Depreciable } if ($key =='category') { - $query->whereHas('model', function ($query) use ($search) { - $query->whereHas('category', function ($query) use ($search) { + $query->whereHas('model', function ($query) use ($search_val) { + $query->whereHas('category', function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) { $query->where('categories.name', 'LIKE', '%' . $search_val . '%') ->orWhere('models.name', 'LIKE', '%' . $search_val . '%') diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php index abc5e1f8b..075f72720 100755 --- a/resources/views/accessories/checkin.blade.php +++ b/resources/views/accessories/checkin.blade.php @@ -56,19 +56,10 @@ {!! $errors->first('note', ' :message') !!} - -
- -
- {{ trans('button.cancel') }} - -
-
- - - -
- +
+
+ {{ trans('button.cancel') }} +
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index d89ea825d..830e9492a 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -79,8 +79,9 @@ @endif -
- +
+ {{ trans('button.cancel') }} +
diff --git a/snipeit.sh b/snipeit.sh index ebb7d4832..799096a71 100644 --- a/snipeit.sh +++ b/snipeit.sh @@ -341,13 +341,13 @@ case $distro in setenv vhenvfile - - echo "* Starting the MariaDB server."; + + echo "* Starting the MariaDB server."; service mysql status >/dev/null || service mysql start - + echo "* Securing MariaDB server."; /usr/bin/mysql_secure_installation - + echo "* Creating MariaDB Database/User." echo "* Please Input your MariaDB root password:" mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" @@ -356,10 +356,10 @@ case $distro in cd $webdir/$name/ curl -sS https://getcomposer.org/installer | php php composer.phar install --no-dev --prefer-source - + perms chown -R www-data:www-data "/var/www/$name" - + service apache2 restart echo "* Generating the application key." @@ -452,7 +452,7 @@ case $distro in echo "## Starting the apache server."; chkconfig httpd on /sbin/service httpd start - + echo "## Configuring .env file." tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g'); setenv @@ -475,7 +475,7 @@ case $distro in fi service httpd restart - + echo "## Generating the application key." php artisan key:generate --force @@ -584,7 +584,7 @@ case $distro in echo "## Creating scheduler cron." (crontab -l ; echo "* * * * * /usr/bin/php $webdir/$name/artisan schedule:run >> /dev/null 2>&1") | crontab - - + else echo "Unable to Handle Centos Version #. Version Found: " $version return 1