Merge remote-tracking branch 'origin/develop'

Fixes #1170 - barcode alternative
Merge pull request #1168 from mtucker6784/develop
2015-09-11 16:14:20 -07:00 · 2015-09-11 16:13:44 -07:00 · 2015-09-10 16:20:52 -07:00 · 2015-09-10 15:11:16 -07:00 · 2015-09-10 15:08:07 -07:00 · 2015-09-10 11:49:47 -07:00
361 changed files with 4820 additions and 2647 deletions
@@ -31,3 +31,4 @@ nbproject/*
 app/config/local/ldap.php
 app/storage/dumps/*
 app/config/packages/schickling/backup/config.php
+app/config/app.backup.php
@@ -1,6 +1,6 @@
 addons:
    hosts:
-        - snipe-it.dev
+        - localhost
 sudo: false

 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
@@ -14,27 +14,30 @@ php:

 # optionally specify a list of environments, for example to test different RDBMS
 env:
-  - DB=mysql
+  - DB=mysql APP_ENV=travis-ci

 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
+  - hostname
  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis; fi
  - curl -s http://getcomposer.org/installer | php
-  - cp app/config/testing/app.example.php app/config/testing/app.php
-  - cp app/config/testing/database.example.php app/config/testing/database.php
-  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - cp app/config/travis-ci/app.example.php app/config/travis-ci/app.php
+  - cp app/config/travis-ci/database.example.php app/config/travis-ci/database.php
+  - cp app/config/travis-ci/mail.example.php app/config/travis-ci/mail.php
  - composer self-update
  - composer install --prefer-source --no-interaction
-  - php artisan key:generate --env=testing
-  - php artisan migrate:install --env=testing --no-interaction -vvv
-  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
-  - php artisan migrate --env=testing --no-interaction -vvv
-  - php artisan db:seed --env=testing --no-interaction -vvv
+  - php artisan key:generate
+  - php artisan migrate:install --no-interaction -vvv
+  - php artisan migrate --package cartalyst/sentry --no-interaction -vvv
+  - php artisan migrate --no-interaction -vvv
+  - php artisan db:seed --no-interaction -vvv
+  - ./vendor/bin/codecept build
+  - APP_ENV=travis-ci php artisan serve --port=8007 &
+  - sleep 5

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
-# script: ./vendor/bin/codecept run
-script: phpunit
+script: ./vendor/bin/codecept run --env travis-ci -vvv

 # configure notifications (email, IRC, campfire etc)
 notifications:
@@ -4,6 +4,8 @@ MAINTAINER Brady Wetherington <uberbrady@gmail.com>
 RUN apt-get update && apt-get install -y \
 apache2-bin \
 libapache2-mod-php5 \
+php5-curl \
+php5-ldap \
 php5-mysql \
 php5-mcrypt \
 php5-gd \
@@ -38,29 +40,8 @@ WORKDIR /var/www/html
 #Patch bootstrap file
 RUN patch -p1 < /tmp/app_start.patch

-#DB create?
-# mysqladmin -u root  create snipeit_laravel
-
-#DB create user, grant access to new DB?
-# grant all privileges on snipeit_laravel.* TO snipeit;
-
-#DB config file init? (NEVER overwrite!)
-#RUN cp -n /var/www/html/app/config/production/database.example.php /var/www/html/app/config/production/database.php
-COPY docker/database.php /var/www/html/app/config/production/database.php
-
-COPY docker/mail.php /var/www/html/app/config/production/mail.php
-
-#change DB file user
-#RUN sed -i s/travis/snipe_it/ /var/www/html/app/config/production/database.php
-
-#init app config file (DO NOT overwrite!)
-RUN cp -n /var/www/html/app/config/production/app.example.php /var/www/html/app/config/production/app.php
-
-# Change default hostname to blank...I guess?
-RUN sed -i s%http://staging.yourserver.com%% /var/www/html/app/config/production/app.php
-
-# turn off the toolbar
-RUN sed -i 's%\x27debug\x27 => true%\x27debug\x27 => false%' /var/www/html/app/config/production/app.php
+#copy all configuration files
+COPY docker/*.php /var/www/html/app/config/production/

 RUN chown -R docker /var/www/html

@@ -25,6 +25,8 @@ Please see the [requirements documentation](http://docs.snipeitapp.com/requireme

 To deploy on Ubuntu using Ansible and Vagrant, check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).

+To deploy on a fresh Ubuntu / CentOS install that will be dedicated to Snipe-It, run the "install.sh". Make sure to chmod +x install.sh and run as sudo on Ubuntu systems (or equivalent on CentOS.)
+
 -----
 ### Bug Reports & Feature Requests

@@ -101,10 +101,10 @@ return array(
        'Barryvdh\Debugbar\ServiceProvider',
        'Cartalyst\Sentry\SentryServiceProvider',
        'Chumper\Datatable\DatatableServiceProvider',
-        'Dinesh\Barcode\BarcodeServiceProvider',
        'Maknz\Slack\SlackServiceProvider',
        'Schickling\Backup\BackupServiceProvider',
        'Chumper\Zipper\ZipperServiceProvider',
+        'Fideloper\Proxy\ProxyServiceProvider',

    ),

@@ -176,8 +176,6 @@ return array(
            'Validator'       		=> 'Illuminate\Support\Facades\Validator',
            'View'            		=> 'Illuminate\Support\Facades\View',
            'Reader'				=> 'League\Csv\Reader',
-            'DNS1D'                 => 'Dinesh\Barcode\Facades\DNS1DFacade',
-            'DNS2D'                 => 'Dinesh\Barcode\Facades\DNS2DFacade',
            'Slack' 				=> 'Maknz\Slack\Facades\Slack',
            'Zipper'                => 'Chumper\Zipper\Zipper',

@@ -68,10 +68,10 @@ return array(
    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
    |
-    | Note: all these fields are required.
    |--------------------------------------------------------------------------
    |
    | The search filter for the LDAP query.
+    | Note: all these fields are required, and they should all be lowercase.
    |
    */
    'result.username' => "",
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */
+
+    'debug' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */
+
+    'url' => 'http://localhost:8007',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    | Run a php artisan key:generate --env=staging to create a random one
+    */
+
+    'key' => '8YHfiO4EyWBewqrpGHDA4Iuom2ZIahXQ',
+
+);
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cache Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default cache "driver" that will be used when
+    | using the Caching library. Of course, you may use other drivers any
+    | time you wish. This is the default when another is not specified.
+    |
+    | Supported: "file", "database", "apc", "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'array',
+
+);
@@ -0,0 +1,103 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */
+
+    'fetch' => PDO::FETCH_CLASS,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */
+
+    'default' => 'mysql',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */
+
+    'connections' => array(
+        'sqlite' => array(
+            'driver'   => 'sqlite',
+            'database' => ':memory:',
+            'prefix'   => ''
+        ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_unit',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk have not actually be run in the databases.
+    |
+    */
+
+    'migrations' => 'migrations',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */
+
+    'redis' => array(
+
+        'cluster' => true,
+
+        'default' => array(
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
+            'database' => 0,
+        ),
+
+    ),
+
+);
@@ -0,0 +1,112 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | URL
+    |--------------------------------------------------------------------------
+    |
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
+    |
+    */
+    'url' => "",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Username
+    |--------------------------------------------------------------------------
+    |
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
+    |
+    */
+	'username' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Password
+    |--------------------------------------------------------------------------
+    |
+    | Password to use when authenticating to LDAP.
+    |
+    */
+	'password' => "",
+
+	/*
+    |--------------------------------------------------------------------------
+    | Basedn
+    |--------------------------------------------------------------------------
+    |
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
+    |
+    */
+	'basedn'   => "",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | Filter
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
+    |
+    */
+	'filter' => "&(cn=*)",
+
+
+	/*
+    |--------------------------------------------------------------------------
+    | LDAP field names that will be retrieved to create a user.
+    |
+    | Using the username as an example:
+    | If I set 'result.username' => 'my-org-username', the code will connect to
+    | LDAP as follows (where $results[$i] represents a row in the LDAP query:
+    | $username-to-insert-in-snipe-it = $results[$i]["my-org-username"][0]
+    |
+    | Note: all these fields are required.
+    |--------------------------------------------------------------------------
+    |
+    | The search filter for the LDAP query.
+    |
+    */
+    'result.username' => "",
+    'result.last.name'  => "",
+    'result.first.name' => "",
+
+    /*
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
+    | be omitted.
+    */
+    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP filter query for authentication
+    |--------------------------------------------------------------------------
+    |
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
+    |
+    */
+    'authentication.filter.query' => "uid=",
+
+    /*
+    |--------------------------------------------------------------------------
+    | LDAP Version
+    |--------------------------------------------------------------------------
+    |
+    | Version of LDAP you are using.
+    |
+    */
+    'version' => 3,
+
+
+);
@@ -0,0 +1,124 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail"
+    |
+    */
+
+    'driver' => 'smtp',
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Postmark mail service, which will provide reliable delivery.
+    |
+    */
+
+    'host' => 'smtp.mandrillapp.com',
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to delivery e-mails to
+    | users of your application. Like the host we have set this value to
+    | stay compatible with the Postmark e-mail application by default.
+    |
+    */
+
+    'port' => 587,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */
+
+    'from' => array('address' => null, 'name' => null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */
+
+    'encryption' => 'tls',
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */
+
+    'username' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */
+
+    'password' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */
+
+    'sendmail' => '/usr/sbin/sendmail -bs',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail "Pretend"
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, e-mail will not actually be sent over the
+    | web and will instead be written to your application's logs files so
+    | you may inspect the message. This is great for local development.
+    |
+    */
+
+    'pretend' => true,
+
+);
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0',
-  'hash_version' => 'v2.0-RC-1-11-gda6770c',
-);
+  'app_version' => 'v2.0-95',
+  'hash_version' => 'v2.0-95-ge05baf1',
+);
@@ -33,11 +33,13 @@ class AuthController extends BaseController
        $ldappass    = Config::get('ldap.password');
        $baseDn      = Config::get('ldap.basedn');
        $filterQuery = Config::get('ldap.authentication.filter.query') . $username;
+        $ldapversion = Config::get('ldap.version');

 	// Connecting to LDAP
 	$connection = ldap_connect($ldaphost) or die("Could not connect to {$ldaphost}");
    // Needed for AD
    ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);
+    ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION,$ldapversion);

        try {
            if ($connection) {
@@ -207,7 +209,9 @@ class AuthController extends BaseController

        try {
            // Get the user password recovery code
-            $user = Sentry::getUserProvider()->findByLogin(Input::get('username'));
+            if (!$user = Sentry::getUserProvider()->findByLogin(Input::get('username'))) {
+                $user = User::where('email','=',Input::get('username'));
+            }

            $reset = $user->getResetPasswordCode();

@@ -221,11 +225,14 @@ class AuthController extends BaseController
            $user->save();


-            // Send the activation code through username
-            Mail::send('emails.forgot-password', $data, function ($m) use ($user) {
-                $m->to($user->username, $user->first_name . ' ' . $user->last_name);
-                $m->subject('Account Password Recovery');
-            });
+            if ($user->email) {
+                // Send the activation code through username
+                Mail::send('emails.forgot-password', $data, function ($m) use ($user) {
+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                    $m->subject('Account Password Recovery');
+                });
+            }
+
        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
            // Even though the username was not found, we will pretend
            // we have sent the password reset code through username,
@@ -22,8 +22,6 @@ use Response;
 use Config;
 use Location;
 use Log;
-use DNS1D;
-use DNS2D;
 use Mail;
 use Datatable;
 use TCPDF;
@@ -469,8 +467,12 @@ class AssetsController extends AdminController
            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.not_found'));
        }

+        // Check for a valid user to checkout fa-random
+        // This will need to be tweaked for checkout to location
        if (!is_null($asset->assigned_to)) {
            $user = User::find($asset->assigned_to);
+        } else {
+            return Redirect::to('hardware')->with('error', Lang::get('admin/hardware/message.already_checked_in'));
        }

        // This is just used for the redirect
@@ -507,7 +509,6 @@ class AssetsController extends AdminController

 			if ($settings->slack_endpoint) {

-
 				$slack_settings = [
 				    'username' => $settings->botname,
 				    'channel' => $settings->slack_channel,
@@ -538,19 +539,19 @@ class AssetsController extends AdminController

 			}

-			$data['log_id'] = $logaction->id;
-            		$data['first_name'] = $user->first_name;
-            		$data['item_name'] = $asset->showAssetName();
-            		$data['checkin_date'] = $logaction->created_at;
-            		$data['item_tag'] = $asset->asset_tag;
-            		$data['note'] = $logaction->note;
+            $data['log_id'] = $logaction->id;
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $asset->showAssetName();
+            $data['checkin_date'] = $logaction->created_at;
+            $data['item_tag'] = $asset->asset_tag;
+            $data['note'] = $logaction->note;

-            		if ((($asset->checkin_email()=='1')) && (!Config::get('app.lock_passwords'))) {
-                		Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
-                    			$m->to($user->email, $user->first_name . ' ' . $user->last_name);
-                    			$m->subject('Confirm Asset Checkin');
-                		});
-            		}
+            if ((($asset->checkin_email()=='1')) && ($user) && (!Config::get('app.lock_passwords'))) {
+                Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
+                	$m->to($user->email, $user->first_name . ' ' . $user->last_name);
+                	$m->subject('Confirm Asset Checkin');
+                });
+            }

 			if ($backto=='user') {
 				return Redirect::to("admin/users/".$return_to.'/view')->with('success', Lang::get('admin/hardware/message.checkin.success'));
@@ -607,31 +608,15 @@ class AssetsController extends AdminController

        if ($settings->qr_code == '1') {
            $asset = Asset::find($assetId);
+            $size = barcodeDimensions($settings->barcode_type);

            if (isset($asset->id,$asset->asset_tag)) {
-
-                if ($settings->barcode_type == 'C128'){
-		$content = DNS1D::getBarcodePNG(route('view/hardware', $asset->id), $settings->barcode_type,
-                    $this->barCodeDimensions['height'],$this->barCodeDimensions['width']);
-		}
-		else{
-                $content = DNS2D::getBarcodePNG(route('view/hardware', $asset->id), $settings->barcode_type,
-                    $this->qrCodeDimensions['height'],$this->qrCodeDimensions['width']);
-		}
-                $img = imagecreatefromstring(base64_decode($content));
-                imagepng($img);
-                imagedestroy($img);
-
-                $content_disposition = sprintf('attachment;filename=qr_code_%s.png', preg_replace('/\W/', '', $asset->asset_tag));
-                $response = Response::make($content, 200);
-                $response->header('Content-Type', 'image/png');
-                $response->header('Content-Disposition', $content_disposition);
-                return $response;
+                $barcode = new \Com\Tecnick\Barcode\Barcode();
+                $barcode_obj =  $barcode->getBarcodeObj($settings->barcode_type, route('view/hardware', $asset->id), $size['height'], $size['width'], 'black', array(-2, -2, -2, -2));
+                return $barcode_obj->getPngData();
            }
        }

-        $response = Response::make('', 404);
-        return $response;
    }

    /**
@@ -70,6 +70,7 @@ class SettingsController extends AdminController
 	        "per_page"   	=> 'required|min:1|numeric',
 	        "qr_text"		=> 'min:1|max:31',
 	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
+            "custom_css"   => 'alpha_space',
 	        "alert_email"   => 'email',
 	        "slack_endpoint"   => 'url',
            "default_currency"   => 'required',
@@ -113,6 +114,7 @@ class SettingsController extends AdminController

             if (Config::get('app.lock_passwords')==false) {
 	             $setting->site_name = e(Input::get('site_name'));
+                 $setting->custom_css = e(Input::get('custom_css'));
             }

            $setting->per_page = e(Input::get('per_page'));
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddCustomCssToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('settings', function(Blueprint $table)
+		{
+			$table->text('custom_css')->nullable()->default(NULL);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('settings', function(Blueprint $table)
+		{
+			$table->dropColumn('custom_css');
+		});
+	}
+
+}
@@ -85,3 +85,17 @@ function usersList() {
    $users_list = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
    return $users_list;
 }
+
+function barcodeDimensions ($barcode_type = 'QRCODE') {
+    if ($barcode_type == 'C128') {
+        $size['height'] = '-1';
+        $size['width'] = '-10';
+    } elseif  ($barcode_type == 'PDF417') {
+        $size['height'] = '-3';
+        $size['width'] = '-10';
+    } else {
+        $size['height'] = '-3';
+        $size['width'] = '-3';
+    }
+    return $size;
+}
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'اتفاقية ترخيص المستخدم',
    'id'      					=> 'رقم المعرف',
    'require_acceptance'      	=> 'القبول',
    'title'      				=> 'اسم الملحق',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'الأرشيف الخاص بـ :name',
    'last_login'        => 'آخر دخول للمستخدم',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'البرامج المسجلة لـ :name',
    'view_user'         => 'عرض المستخدم :name',
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+    'about_accessories_title' 			=> 'About Accessories',
+    'about_accessories_text'  			=> 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+    'accessory_category' 				=> 'Accessory Category',
+    'accessory_name'  					=> 'Accessory Name',
+    'create'  							=> 'Create Accessory',
+    'eula_text'							=> 'Category EULA',
+    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
+    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'qty'  								=> 'QTY',
+    'total'  							=> 'Oбщо',
+    'remaining'  						=> 'Avail',
+    'update'  							=> 'Update Accessory',
+    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
+    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+
+);
@@ -0,0 +1,37 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Няма такава категория.',
+    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Категорията е създадена.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Категорията е обновена.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Сигурни ли сте, че желаете изтриване на категорията?',
+        'error'   => 'There was an issue deleting the category. Please try again.',
+        'success' => 'Категорията бе изтрита успешно.'
+    ),
+    
+     'checkout' => array(
+        'error'   		=> 'Accessory was not checked out, please try again',
+        'success' 		=> 'Accessory checked out successfully.',
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Accessory was not checked in, please try again',
+        'success' 		=> 'Accessory checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'Download CSV',
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'require_acceptance'      	=> 'Acceptance',
+    'title'      				=> 'Accessory Name',
+
+
+);
@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Тип на поддръжка на актив',
+        'title'                  => 'Заглавие',
+        'start_date'             => 'Начална дата',
+        'completion_date'        => 'Крайна дата',
+        'cost'                   => 'Стойност',
+        'is_warranty'            => 'Подобрение на гаранцията',
+        'asset_maintenance_time' => 'Време за поддръжка на актив (в дни)',
+        'notes'                  => 'Бележки',
+        'update'                 => 'Редакция на поддръжка на актив',
+        'create'                 => 'Създаване на поддръжка на актив'
+    ];
@@ -0,0 +1,11 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Поддръжка на активи',
+        'edit'               => 'Редакция на поддръжка на актив',
+        'delete'             => 'Изтриване на поддръжка на актив',
+        'view'               => 'Преглед на поддръжка на актив',
+        'repair'             => 'Ремонт',
+        'maintenance'        => 'Поддръжка',
+        'upgrade'            => 'Upgrade'
+    ];
@@ -0,0 +1,17 @@
+<?php
+
+    return [
+        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'delete'                       => [
+            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
+            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
+            'success' => 'The asset maintenance was deleted successfully.'
+        ],
+        'create'                       => [
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
+        ],
+        'asset_maintenance_incomplete' => 'Все още неприключила',
+        'warranty'                     => 'Гаранция',
+        'not_warranty'                 => 'Без гаранция',
+    ];
@@ -0,0 +1,9 @@
+<?php
+
+    return [
+        'title'         => 'Поддръжка на активи',
+        'asset_name'    => 'Актив',
+        'supplier_name' => 'Доставчик',
+        'is_warranty'   => 'Гаранция',
+        'dl_csv'        => 'Сваляне на CSV'
+    ];
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'about_asset_categories' 			=> 'About Asset Categories',
+    'about_categories'  				=> 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you.',
+    'asset_categories' 					=> 'Asset Categories',
+    'category_name'  					=> 'Име на категория',
+    'checkin_email'                     => 'Send email to user on checkin.',
+    'clone'                             => 'Копиране на категория',
+    'create'  							=> 'Създаване на категория',
+    'edit'                              => 'Редакция на категория',
+    'eula_text'							=> 'Категория EULA',
+    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
+    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
+    'required_eula'						=> 'This user will be emailed a copy of the EULA',
+    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'update'  							=> 'Обновяване на категория',
+    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
+    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+
+);
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Категорията не съществува.',
+    'assoc_users'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Категорията е обновена успешно.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Желаете ли да изтриете тази категория?',
+        'error'   => 'Проблем при изтриване на категорията. Моля опитайте отново.',
+        'success' => 'Категорията бе изтрита успешно.'
+    )
+
+);
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Parent',
+    'require_acceptance'      	=> 'Утвърждаване',
+    'title'      				=> 'Категория на актива',
+
+);
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+    'about_consumables_title' 			=> 'Относно консумативите',
+    'about_consumables_text'  			=> 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.',
+    'consumable_name'                  => 'Консуматив',
+    'create'                             => 'Създаване на консуматив',
+    'remaining' 			             => 'Остава',
+    'total' 			                 => 'Oбщо',
+    'update'                            => 'Обновяване на консуматив',
+);
@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Consumable does not exist.',
+
+    'create' => array(
+        'error'   => 'Consumable was not created, please try again.',
+        'success' => 'Consumable created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Consumable was not updated, please try again',
+        'success' => 'Consumable updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'error'   => 'There was an issue deleting the consumable. Please try again.',
+        'success' => 'The accessory was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Consumable was not checked out, please try again',
+        'success' 		=> 'Consumable checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Consumable was not checked in, please try again',
+        'success' 		=> 'Consumable checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Consumable Name',
+);
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'about_asset_depreciations'  			=> 'Относно амортизацията на активи',
+    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'asset_depreciations'  					=> 'Asset Depreciations',
+    'create_depreciation'  					=> 'Create Depreciation',
+    'depreciation_name'  					=> 'Depreciation Name',
+    'number_of_months'  					=> 'Number of Months',
+    'update_depreciation'  					=> 'Update Depreciation',
+
+);
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Depreciation class does not exist.',
+    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Depreciation class was not created, please try again. :(',
+        'success' => 'Depreciation class created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Depreciation class was not updated, please try again',
+        'success' => 'Depreciation class updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
+        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
+        'success' => 'The depreciation class was deleted successfully.'
+    )
+
+);
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+
+    'id'      => 'ID',
+    'months'   => 'Месеци',
+    'term'   => 'Срок',
+    'title'      => 'Име',
+
+);
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Group already exists!',
+    'group_not_found'     => 'Group [:id] does not exist.',
+    'group_name_required' => 'The name field is required',
+
+    'success' => array(
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this group?',
+        'create' => 'There was an issue creating the group. Please try again.',
+        'update' => 'There was an issue updating the group. Please try again.',
+        'delete' => 'There was an issue deleting the group. Please try again.',
+    ),
+
+);
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Name',
+    'users'      => '# of Users',
+
+);
@@ -0,0 +1,13 @@
+<?php
+
+return array(
+
+    'group_management' 	 	=> 'Group Management',
+    'create_group' 	 		=> 'Create New Group',
+    'edit_group' 	 		=> 'Edit Group',
+    'group_name' 	 		=> 'Group Name',
+    'group_admin' 	 		=> 'Group Admin',
+    'allow' 	 			=> 'Allow',
+    'deny' 	 				=> 'Deny',
+
+);
@@ -0,0 +1,42 @@
+<?php
+
+return array(
+
+	'bulk_update'		=> 'Bulk Update Assets',
+	'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
+	'bulk_update_warn'	=> 'You are about to edit the properties of :asset_count assets.',
+    'checkedout_to'		=> 'Checked Out To',
+    'checkout_date'		=> 'Checkout Date',
+    'checkin_date'		=> 'Checkin Date',
+    'checkout_to'		=> 'Checkout to',
+    'cost'				=> 'Purchase Cost',
+    'create'			=> 'Create Asset',
+    'date'				=> 'Purchase Date',
+    'depreciates_on'	=> 'Depreciates On',
+    'depreciation'		=> 'Depreciation',
+    'default_location'	=> 'Default Location',
+    'eol_date'			=> 'EOL Date',
+    'eol_rate'			=> 'EOL Rate',
+    'expected_checkin'  => 'Expected Checkin Date',
+    'expires'			=> 'Expires',
+    'fully_depreciated'	=> 'Fully Depreciated',
+    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'mac_address'		=> 'MAC Address',
+    'manufacturer'		=> 'Manufacturer',
+    'model'				=> 'Model',
+    'months'			=> 'months',
+    'name'				=> 'Asset Name',
+    'notes'				=> 'Notes',
+    'order'				=> 'Order Number',
+    'qr'				=> 'QR Code',
+    'requestable'		=> 'Users may request this asset',
+    'select_statustype'	=> 'Select Status Type',
+    'serial'			=> 'Serial',
+    'status'			=> 'Status',
+    'supplier'			=> 'Supplier',
+    'tag'				=> 'Asset Tag',
+    'update'			=> 'Asset Update',
+    'warranty'			=> 'Warranty',
+    'years'				=> 'years',
+)
+;
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+	'archived'  				=> 'Archived',
+    'asset'  					=> 'Asset',
+    'checkin'  					=> 'Checkin Asset',
+    'checkout'  				=> 'Checkout Asset to User',
+    'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
+    'edit'  					=> 'Edit Asset',
+	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
+    'requestable'				=> 'Requestable',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
+    'view'  					=> 'View Asset',
+);
@@ -0,0 +1,58 @@
+<?php
+
+return array(
+
+    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+                        If this status has changed, please update the asset status.',
+    'does_not_exist' 	=> 'Asset does not exist.',
+    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
+    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+
+    'create' => array(
+        'error'   		=> 'Asset was not created, please try again. :(',
+        'success' 		=> 'Asset created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   			=> 'Asset was not updated, please try again',
+        'success' 			=> 'Asset updated successfully.',
+        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this asset?',
+        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'success' 		=> 'The asset was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   		=> 'Asset was not checked out, please try again',
+        'success' 		=> 'Asset checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Asset was not checked in, please try again',
+        'success' 		=> 'Asset checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+);
@@ -0,0 +1,23 @@
+<?php
+
+return array(
+
+    'asset_tag'   	=> 'Asset Tag',
+    'asset_model'       => 'Model',
+    'book_value'  	=> 'Value',
+    'change' 		=> 'In/Out',
+    'checkout_date' => 'Checkout Date',
+    'checkoutto' 	=> 'Checked Out',
+    'diff' 			=> 'Diff',
+    'dl_csv' 		=> 'Download CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'location' 		=> 'Location',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Purchased',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Status',
+    'title'      	=> 'Asset ',
+    'days_without_acceptance' => 'Days Without Acceptance'
+
+);
@@ -0,0 +1,28 @@
+<?php
+
+return array(
+
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'cost'              => 'Purchase Cost',
+    'create'            => 'Create License',
+    'date'              => 'Purchase Date',
+    'depreciation'      => 'Depreciation',
+    'expiration'        => 'Expiration Date',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software Name',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'notes'             => 'Notes',
+    'order'             => 'Order No.',
+    'purchase_order'    => 'Purchase Order Number',
+    'reassignable'      => 'Reassignable',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'serial'            => 'Serial',
+    'supplier'          => 'Supplier',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Update License',
+    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+);
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    'checkin'  					=> 'Checkin License Seat',
+    'checkout_history'  		=> 'Checkout History',
+    'checkout'  				=> 'Checkout License Seat',
+    'edit'  					=> 'Edit License',
+    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'clone'  					=> 'Clone License',
+    'history_for'  				=> 'History for ',
+    'in_out'  					=> 'In/Out',
+    'info'  					=> 'License Info',
+    'license_seats'  			=> 'License Seats',
+    'seat'  					=> 'Seat',
+    'seats'  					=> 'Seats',
+    'software_licenses'  		=> 'Software Licenses',
+    'user'  					=> 'User',
+    'view'  					=> 'View License',
+);
@@ -0,0 +1,50 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'License does not exist.',
+    'user_does_not_exist' => 'User does not exist.',
+    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
+    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'License was not created, please try again.',
+        'success' => 'License created successfully.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+    'update' => array(
+        'error'   => 'License was not updated, please try again',
+        'success' => 'License updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this license?',
+        'error'   => 'There was an issue deleting the license. Please try again.',
+        'success' => 'The license was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'There was an issue checking out the license. Please try again.',
+        'success' => 'The license was checked out successfully'
+    ),
+
+    'checkin' => array(
+        'error'   => 'There was an issue checking in the license. Please try again.',
+        'success' => 'The license was checked in successfully'
+    ),
+
+);
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Assigned To',
+    'checkout'   		=> 'In/Out',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'License Email',
+    'license_name'   	=> 'Licensed To',
+    'purchase_date'   	=> 'Purchase Date',
+    'purchased'   		=> 'Purchased',
+    'seats'   			=> 'Seats',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'License',
+
+);
@@ -0,0 +1,27 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
+    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this location?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'id'      		=> 'ID',
+    'city'   		=> 'Град',
+    'state'   		=> 'Област',
+    'country'   	=> 'Държава',
+    'create'		=> 'Create Location',
+    'update'		=> 'Update Location',
+    'name'			=> 'Location Name',
+    'address'		=> 'Aдрес',
+    'zip'			=> 'Пощенски код',
+    'locations'		=> 'Locations',
+    'parent'		=> 'Parent',
+    'currency'  	=> 'Location Currency', // this is deprecated
+);
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Manufacturer does not exist.',
+    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+
+    'create' => array(
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
+        'success' => 'The Manufacturer was deleted successfully.'
+    )
+
+);
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'asset_manufacturers'	=> 'Asset Manufacturers',
+    'create'				=> 'Create Manufacturer',
+    'id'   					=> 'ID',
+    'name'      			=> 'Manufacturer Name',
+    'update'				=> 'Update Manufacturer',
+
+);
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'deleted'  					=> 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'restore'                   => 'Restore Model',
+	'show_mac_address'			=> 'Show MAC address field in assets in this model',
+    'view_deleted'              => 'View Deleted',
+    'view_models'               => 'View Models',
+
+);
@@ -0,0 +1,31 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Model does not exist.',
+    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Model was not created, please try again.',
+        'success' => 'Model created successfully.',
+        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+    ),
+
+    'update' => array(
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this asset model?',
+        'error'   => 'There was an issue deleting the model. Please try again.',
+        'success' => 'The model was deleted successfully.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Model was not restored, please try again',
+        'success' 		=> 'Model restored successfully.'
+    ),
+
+);
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Create Asset Model',
+    'created_at' 			=> 'Created at',
+    'eol'	 				=> 'EOL',
+    'modelnumber'   		=> 'Модел №',
+    'name'      			=> 'Asset Model Name',
+    'numassets' 			=> 'Активи',
+    'title'					=> 'Модели на активи',
+    'update'				=> 'Update Asset Model',
+    'view'					=> 'View Asset Model',
+    'update'				=> 'Update Asset Model',
+    'clone'				=> 'Clone Model',
+    'edit'				=> 'Edit Model',
+);
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'info'   => 'Select the options you want for your asset report.'
+);
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'error'   => 'You must select at least ONE option.'
+);
@@ -0,0 +1,49 @@
+<?php
+
+return array(
+	'alert_email'				=> 'Send alerts to',
+	'alerts_enabled'			=> 'Алармите включени',
+	'asset_ids'					=> 'Asset IDs',
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
+	'backups'					=> 'Backups',
+	'barcode_type'				=> 'Тип на баркод',
+	'barcode_settings'			=> 'Настройки на баркод',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
+	'default_currency'  		=> 'Валута по подразбиране',
+	'default_eula_text'			=> 'EULA по подразбиране',
+	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'display_asset_name'        => 'Визуализиране на актив',
+    'display_checkout_date'     => 'Визуализиране на дата на изписване',
+    'display_eol'               => 'Визуализиране на EOL в таблиците',
+    'display_qr'                => 'Визуализиране на QR кодове',
+    'eula_settings'				=> 'Настройки на EULA',
+    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'general_settings'			=> 'Общи настройки',
+    'header_color'              => 'Header Color',
+    'info'                      => 'These settings let you customize certain aspects of your installation.',
+    'laravel'                   => 'Версия на Laravel',
+    'load_remote'				=> 'This Snipe-IT install can load scripts from the outside world.',
+    'logo'                    	=> 'Лого',
+    'optional'					=> 'optional',
+    'per_page'                  => 'Results Per Page',
+    'php'                       => 'PHP версия',
+    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
+    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'qr_help'                   => 'Enable QR Codes first to set this',
+    'qr_text'                   => 'Съдържание на QR код',
+    'setting'                   => 'Настройка',
+    'settings'                  => 'Настройки',
+    'site_name'                 => 'Site Name',
+    'slack_botname'             => 'Slack Botname',
+    'slack_channel'             => 'Slack Channel',
+    'slack_endpoint'            => 'Slack Endpoint',
+    'slack_integration'         => 'Slack Settings',
+    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new">create an incoming webhook</a> on your Slack account.',
+    'snipe_version'  			=> 'Snipe-IT version',
+    'system'                    => 'System Information',
+    'update'                    => 'Обновяване на настройките',
+    'value'                     => 'Стойност',
+);
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+
+    'update' => array(
+        'error'   => 'An error has occurred while updating. ',
+        'success' => 'Settings updated successfully.'
+    ),
+
+);
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this status label?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);
@@ -0,0 +1,15 @@
+<?php
+
+return array(
+    'about'      	=> 'About Status Labels',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
+);
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Supplier does not exist.',
+    'assoc_users'	 => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ',
+
+    'create' => array(
+        'error'   => 'Supplier was not created, please try again.',
+        'success' => 'Supplier created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Supplier was not updated, please try again',
+        'success' => 'Supplier updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this supplier?',
+        'error'   => 'There was an issue deleting the supplier. Please try again.',
+        'success' => 'Supplier was deleted successfully.'
+    )
+
+);
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'City',
+    'contact'               => 'Contact Name',
+    'country'               => 'Country',
+    'create'                => 'Create Supplier',
+    'email'                 => 'Email',
+    'fax'                   => 'Fax',
+    'id'                    => 'ID',
+    'licenses'              => 'Licenses',
+    'name'                  => 'Supplier Name',
+    'notes'                 => 'Notes',
+    'phone'                 => 'Phone',
+    'state'                 => 'State',
+    'suppliers'             => 'Suppliers',
+    'update'                => 'Update Supplier',
+    'url'                   => 'URL',
+    'view'                  => 'View Supplier',
+    'view_assets_for'       => 'View Assets for',
+    'zip'                   => 'Postal Code',
+
+);
@@ -0,0 +1,18 @@
+<?php
+
+
+return array(
+
+    'assets_user'       => 'Активи предадени на :name',
+    'clone'             => 'Копиране на потребител',
+    'contact_user'      => 'Връзка :name',
+    'edit'              => 'Редактиране на потребител',
+    'filetype_info'     => 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
+    'history_user'      => 'История за :name',
+    'last_login'        => 'Последен достъп до системата',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
+    'ldap_text'         => 'Връзка с LDAP и създаване на потребители. Паролите ще бъдат генерирани автоматично.',
+    'software_user'     => 'Софтуерни продукти, изписани на :name',
+    'view_user'         => 'Преглед на потребител :name',
+    'usercsv'           => 'CSV файл',
+    );
@@ -0,0 +1,54 @@
+<?php
+
+return array(
+
+    'accepted'                  => 'You have successfully accepted this asset.',
+    'declined'                  => 'You have successfully declined this asset.',
+    'user_exists'               => 'User already exists!',
+    'user_not_found'            => 'User [:id] does not exist.',
+    'user_login_required'       => 'The login field is required',
+    'user_password_required'    => 'The password is required.',
+    'insufficient_permissions'  => 'Insufficient Permissions.',
+    'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
+
+
+    'success' => array(
+        'create'    => 'User was successfully created.',
+        'update'    => 'User was successfully updated.',
+        'delete'    => 'User was successfully deleted.',
+        'ban'       => 'User was successfully banned.',
+        'unban'     => 'User was successfully unbanned.',
+        'suspend'   => 'User was successfully suspended.',
+        'unsuspend' => 'User was successfully unsuspended.',
+        'restored'  => 'User was successfully restored.',
+        'import'    => 'Users imported successfully.',
+    ),
+
+    'error' => array(
+        'create' => 'There was an issue creating the user. Please try again.',
+        'update' => 'There was an issue updating the user. Please try again.',
+        'delete' => 'There was an issue deleting the user. Please try again.',
+        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
+        'import'    => 'There was an issue importing users. Please try again.',
+        'asset_already_accepted' => 'This asset has already been accepted.',
+        'accept_or_decline' => 'You must either accept or decline this asset.',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+);
@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'activated'  			=> 'Active',
+    'allow'  				=> 'Allow',
+    'checkedout'  			=> 'Assets',
+    'created_at' 			=> 'Created',
+    'createuser' 			=> 'Create User',
+    'deny'  				=> 'Deny',
+    'email'      			=> 'Email',
+    'employee_num'      	=> 'Employee No.',
+    'first_name' 			=> 'First Name',
+    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Inherit',
+    'job' 					=> 'Job Title',
+    'last_login'  			=> 'Last Login',
+    'last_name'  			=> 'Last Name',
+    'location'  			=> 'Location',
+    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'manager' 				=> 'Manager',
+    'name' 					=> 'Name',
+    'notes'                 => 'Notes',
+    'password_confirm' 		=> 'Confirm Password',
+    'password' 				=> 'Password',
+    'phone'  				=> 'Phone',
+    'show_current'          => 'Show Current Users',
+    'show_deleted'          => 'Show Deleted Users',
+    'title' 				=> 'Title',
+    'updateuser' 			=> 'Update User',
+    'username' 				=> 'Username',
+    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'cloneuser'             => 'Clone User',
+    'viewusers' 			=> 'View Users',
+);
@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'An account with the this email already exists.',
+    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_activated'  => 'This user account is not activated.',
+    'account_suspended'      => 'This user account is suspended.',
+    'account_banned'         => 'This user account is banned.',
+
+    'signin' => array(
+        'error'   => 'There was a problem while trying to log you in, please try again.',
+        'success' => 'You have successfully logged in.',
+    ),
+
+    'signup' => array(
+        'error'   => 'There was a problem while trying to create your account, please try again.',
+        'success' => 'Account sucessfully created.',
+    ),
+
+        'forgot-password' => array(
+            'error'   => 'There was a problem while trying to get a reset password code, please try again.',
+            'success' => 'Password recovery email successfully sent.',
+        ),
+
+        'forgot-password-confirm' => array(
+            'error'   => 'There was a problem while trying to reset your password, please try again.',
+            'success' => 'Your password has been successfully reset.',
+        ),
+
+    'activate' => array(
+        'error'   => 'There was a problem while trying to activate your account, please try again.',
+        'success' => 'Your account has been successfully activated.',
+    ),
+
+);
@@ -0,0 +1,15 @@
+<?php
+
+return array(
+
+    'actions' 	=> 'Действия',
+    'add'    	=> 'Добави нов',
+    'cancel'    => 'Отказ',
+    'delete'  	=> 'Изтриване',
+    'edit'    	=> 'Редакция',
+    'restore' 	=> 'Възстановяване',
+    'request'   => 'Заявка',
+    'submit'  	=> 'Потвърди',
+    'upload'    => 'Качване',
+
+);
@@ -0,0 +1,142 @@
+<?php
+
+    return [
+    'accessories'			=> 'Accessories',
+    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
+    'action'                => 'Action',
+    'activity_report'		=> 'Activity Report',
+    'address'				=> 'Address',
+    'admin'					=> 'Admin',
+    'all_assets'			=> 'All Assets',
+    'all'       			=> 'All',
+    'archived'              => 'Archived',
+    'asset_models'			=> 'Asset Models',
+    'asset'					=> 'Asset',
+    'asset_report'          => 'Asset Report',
+    'asset_tag'				=> 'Asset Tag',
+    'assets_available'		=> 'assets available',
+    'assets'				=> 'Assets',
+    'avatar_delete'         => 'Delete Avatar',
+    'avatar_upload'         => 'Upload Avatar',
+    'back'      			=> 'Back',
+    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'cancel'  				=> 'Cancel',
+    'categories'			=> 'Categories',
+    'category'				=> 'Category',
+    'changeemail'  			=> 'Change Email Address',
+    'changepassword'  		=> 'Change Password',
+    'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
+    'checkout'  			=> 'Checkout',
+    'city'  				=> 'City',
+    'consumable'			=> 'Consumable',
+    'consumables'			=> 'Consumables',
+    'country'  				=> 'Country',
+    'create'				=> 'Create New',
+    'created_asset'			=> 'created asset',
+    'created_at' 			=> 'Created at',
+    'currency'  			=> '$', // this is deprecated
+    'current'  				=> 'Current',
+    'custom_report'         => 'Custom Asset Report',
+    'dashboard'				=> 'Dashboard',
+    'date'					=> 'Date',
+    'delete'  				=> 'Delete',
+    'deleted'  				=> 'Deleted',
+    'deployed'				=> 'Deployed',
+    'depreciation_report'	=> 'Depreciation Report',
+    'download'				=> 'Download',
+    'depreciation'			=> 'Depreciation',
+    'editprofile'  			=> 'Edit Your Profile',
+    'eol'					=> 'EOL',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Generate',
+    'groups'				=> 'Groups',
+    'gravatar_email'        => 'Gravatar Email Address',
+    'history_for'  			=> 'History for',
+    'id'  					=> 'ID',
+    'image_delete'         	=> 'Delete Image',
+    'image_upload'         	=> 'Upload Image',
+    'import'         	    => 'Import',
+    'asset_maintenance'        => 'Asset Maintenance',
+    'asset_maintenance_report' => 'Asset Maintenance Report',
+    'asset_maintenances'       => 'Asset Maintenances',
+    'item'  				=> 'Item',
+    'last'					=> 'Last',
+    'last_name'				=> 'Last Name',
+    'license'				=> 'License',
+    'license_report'        => 'License Report',
+    'licenses_available'	=> 'licenses available',
+    'licenses'				=> 'Licenses',
+    'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
+    'lock_passwords'        => 'This field cannot be edited in this installation.',
+    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'location'              => 'Location',
+    'locations'				=> 'Locations',
+    'logout'				=> 'Logout',
+    'manufacturer'			=> 'Manufacturer',
+    'manufacturers'			=> 'Manufacturers',
+    'model_no'				=> 'Model No.',
+    'months'				=> 'months',
+    'moreinfo'				=> 'More Info',
+    'name'					=> 'Name',
+    'next'					=> 'Next',
+    'no_depreciation'		=> 'No Depreciation',
+    'no_results'			=> 'No Results.',
+    'no'  					=> 'No',
+    'notes'  				=> 'Notes',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'pending'				=> 'Pending',
+    'people'				=> 'People',
+    'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
+    'profile'				=> 'Your profile',
+    'qty'		            => 'QTY',
+    'quanitity'		        => 'Quanitity',
+    'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
+    'reports'				=> 'Reports',
+    'requested'				=> 'Requested',
+    'save'  				=> 'Save',
+    'select'				=> 'Select',
+    'search'				=> 'Search',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date',
+    'select_statuslabel'	=> 'Select Status',
+    'settings'				=> 'Settings',
+    'sign_in'				=> 'Sign in',
+    'site_name'				=> 'Site Name',
+    'state'  				=> 'State',
+    'status_labels'			=> 'Status Labels',
+    'status'    			=> 'Status',
+    'suppliers'  			=> 'Suppliers',
+    'total_assets'			=> 'total assets',
+    'total_licenses'		=> 'total licenses',
+    'type'  				=> 'Type',
+    'undeployable'			=> 'Un-deployable',
+    'unknown_admin'			=> 'Unknown Admin',
+    'update'                => 'Update',
+    'uploaded'              => 'Uploaded',
+    'user'					=> 'User',
+    'accepted'			    => 'accepted',
+    'declined'			    => 'declined',
+    'unaccepted_asset_report' => 'Unaccepted Assets',
+    'users'                 => 'Users',
+    'viewassets'  			=> 'View Assigned Assets',
+    'website'               => 'Website',
+    'welcome'				=> 'Welcome, :name',
+    'years'					=> 'years',
+    'yes' 					=> 'Yes',
+    'zip'  					=> 'Zip',
+    ];
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+
+    'next'     => 'Next &raquo;',
+
+);
@@ -0,0 +1,24 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Passwords must be six characters and match the confirmation.",
+
+    "user"     => "Username or email address is incorrect",
+
+    "token"    => "This password reset token is invalid.",
+
+    "sent" => "If a matching email address was found, a password reminder has been sent!",
+
+);
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+
+    'actions'	 	=> 'Действия',
+    'action' 		=> 'Действие',
+    'by'      		=> 'От',
+    'item' 			=> 'Item',
+
+);
@@ -0,0 +1,95 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    "accepted"         => "The :attribute must be accepted.",
+    "active_url"       => ":attribute не е валиден URL адрес.",
+    "after"            => "The :attribute must be a date after :date.",
+    "alpha"            => "The :attribute may only contain letters.",
+    "alpha_dash"       => ":attribute може да съдържа единствено букви, числа и тире.",
+    "alpha_num"        => "The :attribute may only contain letters and numbers.",
+    "before"           => "The :attribute must be a date before :date.",
+    "between"          => array(
+        "numeric" => "The :attribute must be between :min - :max.",
+        "file"    => "The :attribute must be between :min - :max kilobytes.",
+        "string"  => "The :attribute must be between :min - :max characters.",
+    ),
+    "confirmed"        => "The :attribute confirmation does not match.",
+    "date"             => ":attribute не е валидна дата.",
+    "date_format"      => "The :attribute does not match the format :format.",
+    "different"        => "The :attribute and :other must be different.",
+    "digits"           => "The :attribute must be :digits digits.",
+    "digits_between"   => "The :attribute must be between :min and :max digits.",
+    "email"            => "The :attribute format is invalid.",
+    "exists"           => "The selected :attribute is invalid.",
+    "image"            => "The :attribute must be an image.",
+    "in"               => "The selected :attribute is invalid.",
+    "integer"          => "The :attribute must be an integer.",
+    "ip"               => "The :attribute must be a valid IP address.",
+    "max"              => array(
+        "numeric" => "The :attribute may not be greater than :max.",
+        "file"    => "The :attribute may not be greater than :max kilobytes.",
+        "string"  => "The :attribute may not be greater than :max characters.",
+    ),
+    "mimes"            => "The :attribute must be a file of type: :values.",
+    "min"              => array(
+        "numeric" => "The :attribute must be at least :min.",
+        "file"    => "The :attribute must be at least :min kilobytes.",
+        "string"  => "The :attribute must be at least :min characters.",
+    ),
+    "not_in"           => "The selected :attribute is invalid.",
+    "numeric"          => "The :attribute must be a number.",
+    "regex"            => "The :attribute format is invalid.",
+    "required"         => "The :attribute field is required.",
+    "required_if"      => "The :attribute field is required when :other is :value.",
+    "required_with"    => "The :attribute field is required when :values is present.",
+    "required_without" => "The :attribute field is required when :values is not present.",
+    "same"             => "The :attribute and :other must match.",
+    "size"             => array(
+        "numeric" => ":attribute трябва да бъде с дължина :size.",
+        "file"    => "The :attribute must be :size kilobytes.",
+        "string"  => "The :attribute must be :size characters.",
+    ),
+    "unique"           => "The :attribute has already been taken.",
+    "url"              => "Форматът на :attribute е невалиден.",
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => array(),
+    'alpha_space' => "The :attribute field contains a character that is not allowed.",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => array(),
+
+);
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Přijetí',
    'title'      				=> 'Název příslušenství',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Zálohy',
 	'barcode_type'				=> 'Tyo čárového kódu',
 	'barcode_settings'			=> 'Nastavení čárového kódu',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Výchozí EULA',
 	'default_eula_help_text'	=> 'Můžete také spojit vlastní EULA se specifickými kategoriemi majetku.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Povolené přílohy: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'Historie:',
    'last_login'        => 'Poslední přihlášení',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software vydaný pro :name',
    'view_user'         => 'Zobraz uživatele',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'Slutbrugerlicens',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Accept',
    'title'      				=> 'Tilbehør Navn',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Zustimmung',
    'title'      				=> 'Zubehör Name',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Sicherungen',
 	'barcode_type'				=> 'Barcode Typ',
 	'barcode_settings'			=> 'Barcode Einstellungen',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Standard Währung',
 	'default_eula_text'			=> 'Standard EULA',
 	'default_eula_help_text'	=> 'Sie können ebenfalls eigene EULA\'s mit spezifischen Asset Kategorien verknüpfen.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, und rar.',
    'history_user'      => 'Historie von :name',
    'last_login'        => 'Letzte Anmeldung',
-    'ldap_config_text'  => 'LDAP Einstellungen befinden sich im app/config Ordner in der Datei LDAP.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Mit LDAP verbinden und Benutzer anlegen. Passwörter werden automatisch generiert.',
    'software_user'     => 'Software herausgegeben an :name',
    'view_user'         => 'Benutze :name ansehen',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Acceptance',
    'title'      				=> 'Accessory Name',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Acceptance',
    'title'      				=> 'Accessory Name',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
@@ -2,25 +2,25 @@

 return array(

-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'Accessory does not exist.',
    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',

    'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Accessory was not created, please try again.',
+        'success' => 'Accessory created successfully.'
    ),

    'update' => array(
-        'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Accessory was not updated, please try again',
+        'success' => 'Accessory updated successfully.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this category?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
-        'success' => 'The category was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Accessory?',
+        'error'   => 'There was an issue deleting the Accessory. Please try again.',
+        'success' => 'The Accessory was deleted successfully.'
    ),
-    
+
     'checkout' => array(
        'error'   		=> 'Accessory was not checked out, please try again',
        'success' 		=> 'Accessory checked out successfully.',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Acceptance',
    'title'      				=> 'Accessory Name',

+
 );
@@ -7,6 +7,7 @@ return array(
    'does_not_exist' 	=> 'Asset does not exist.',
    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'already_checked_in' => 'Could not checkin asset because it is not checked out to anyone.',

    'create' => array(
        'error'   		=> 'Asset was not created, please try again. :(',
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Acceptance',
    'title'      				=> 'Accessory Name',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Aceptación',
    'title'      				=> 'Nombre accesorio',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Copias de seguridad',
 	'barcode_type'				=> 'Tipo de código de barras',
 	'barcode_settings'			=> 'Configuración de Código de Barras',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Moneda Predeterminada',
 	'default_eula_text'			=> 'EULA por defecto',
 	'default_eula_help_text'	=> 'También puede asociar EULAs personalizadas para categorías especificas de equipos.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
    'history_user'      => 'Historial de :name',
    'last_login'        => 'Último acceso',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software asignado a :name',
    'view_user'         => 'Ver Usuario :name',
@@ -1,9 +1,11 @@
 <?php

 return array(
+	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
    'id'      					=> 'ID',
    'require_acceptance'      	=> 'Acceptance',
    'title'      				=> 'Accessory Name',

+
 );
@@ -10,6 +10,8 @@ return array(
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Barcode Type',
 	'barcode_settings'			=> 'Barcode Settings',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
 	'default_currency'  		=> 'Default Currency',
 	'default_eula_text'			=> 'Default EULA',
 	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'Historia käyttäjälle :name',
    'last_login'        => 'Viimeisin kirjautuminen',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Käyttäjälle :name luovutetut ohjelmistot',
    'view_user'         => 'Näytä Käyttäjä :name',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	aecc98b8a3	Merge remote-tracking branch 'origin/develop'	2015-09-11 16:14:20 -07:00
snipe	2c54c93859	Fixes #1170 - barcode alternative	2015-09-11 16:13:44 -07:00
snipe	b6b0a5ac58	Merge pull request #1168 from mtucker6784/develop Modified readme.md and install.sh	2015-09-10 16:20:52 -07:00
Michael T	2291dda425	Add info w/install.sh for fresh Ubu/CentOS install	2015-09-10 15:11:16 -07:00
Michael T	b402a68bc2	Install Snipe-It on a clean Ubuntu/CentOS install This script is designed to install Snipe-It on a fresh install of Ubuntu or CentOS. You will receive minimal options regarding setting passwords and the script should take care of the rest. The purpose of this script is to install Snipe-It on a server that will be dedicated to the application. This was tested on Ubuntu 14.04 and CentOS 7, YMMV with different OS versions.	2015-09-10 15:08:07 -07:00
snipe	97ecdba262	Bumped version	2015-09-10 11:49:47 -07:00
snipe	8c2ee9e96c	Fixes #1167 - don't allow double checkin	2015-09-10 11:49:43 -07:00
snipe	e05baf1df4	Fixed language strings for accessories	2015-09-10 11:49:26 -07:00
snipe	141bba490f	Merge remote-tracking branch 'origin/develop'	2015-09-09 16:40:42 -07:00
snipe	416be43061	Added the fideveloper service provider to app.php	2015-09-09 16:36:50 -07:00
snipe	2c89d05156	Smaller font size for labels to prevent them from getting cut off	2015-09-09 14:11:15 -07:00
snipe	680b189709	Fixes #1151 - additional LDAP option	2015-09-09 14:01:17 -07:00
snipe	29d5682956	Updated language strings, added Bulgarian	2015-09-09 13:56:10 -07:00
snipe	32604f0715	Fixes #1154 - DL CVS string	2015-09-09 13:40:14 -07:00
snipe	d1fc48d82e	Disable CSS edits for demo	2015-09-09 13:27:50 -07:00
snipe	650f86406d	Added custom CSS field in settings	2015-09-09 13:17:36 -07:00
snipe	9b353ae0d8	Fixes #1150 - added note about lowercasing	2015-09-09 11:47:18 -07:00
snipe	cbcc43828e	Removed required indicator for serial	2015-09-09 11:19:43 -07:00
snipe	6a08ee1597	Merge remote-tracking branch 'origin/develop'	2015-09-03 19:24:22 -07:00
snipe	7bd5ddc516	Fixes incorrect title for unaccepted assets report	2015-09-01 16:41:47 -07:00
snipe	ed05a32f0b	Merge pull request #1061 from vsposato/feature/setupCodeception DO NOT MERGE - testing codeception	2015-08-31 13:57:37 -07:00
snipe	780226a612	Merge pull request #1127 from madd15/patch-1 Fix #1109 - Asset names are missing when viewing user history	2015-08-31 13:57:12 -07:00
snipe	ca37c63649	Merge pull request #1128 from madd15/patch-2 Fix #1123 - fix new lines in serial not being recognised	2015-08-31 13:57:04 -07:00
Vincent Sposato	c3e4b579d3	Merge branch 'feature/setupCodeception' of github.com:vsposato/snipe-it into feature/setupCodeception	2015-08-28 20:11:29 -04:00
Vincent Sposato	217caf3002	Cleaning up the tweaks to finalize the testing!	2015-08-28 20:11:02 -04:00
Vincent Sposato	c870933125	More tweaks to get environment working	2015-08-28 20:11:02 -04:00
Vincent Sposato	3698b107d6	More tweaks	2015-08-28 20:11:01 -04:00
Vincent Sposato	703fd9ba8f	More tweaks	2015-08-28 20:11:01 -04:00
Vincent Sposato	9107784746	More tweaks	2015-08-28 20:11:01 -04:00
Vincent Sposato	b1776a2816	Another tweak to the config	2015-08-28 20:11:00 -04:00
Vincent Sposato	9f993fa16c	Even more tweaks...	2015-08-28 20:11:00 -04:00
Vincent Sposato	7555b97f80	More tweaks, more prayers...	2015-08-28 20:11:00 -04:00
Vincent Sposato	784238f2de	Made changes to travis.yml to see if I can get codeception tests passing	2015-08-28 20:10:59 -04:00
Vincent Sposato	0d76ea5050	Putting app.php back to production state	2015-08-28 20:10:59 -04:00
Vincent Sposato	3199dfd1d8	Checking testing issue to see if wrong environment is loading	2015-08-28 20:10:58 -04:00
Vincent Sposato	ceac5a59ff	More tweaks to the travis	2015-08-28 20:10:58 -04:00
Vincent Sposato	309ce7d0bd	Another tweak - getting close	2015-08-28 20:10:58 -04:00
Vincent Sposato	129e45c817	Updated travis yaml to add a permissions change for the storage directory	2015-08-28 20:10:57 -04:00
Vincent Sposato	e8f3b27141	Added a sleep statement to make things work possibly	2015-08-28 20:10:57 -04:00
Vincent Sposato	2eb64b3105	Last change for detecting correct environment	2015-08-28 20:10:57 -04:00
Vincent Sposato	c48ae56e2f	Last tweak before I head to begin drinking heavily...	2015-08-28 20:10:56 -04:00
Vincent Sposato	8d5033c4e5	A tweak to make this work with an app environment variable	2015-08-28 20:10:56 -04:00
Vincent Sposato	fd78fd8d24	This is getting old...	2015-08-28 20:10:56 -04:00
Vincent Sposato	1f6874f0af	One last tweak - this may be it	2015-08-28 20:10:55 -04:00
Vincent Sposato	fdde048f11	More tweaks / changes	2015-08-28 20:10:55 -04:00
Vincent Sposato	8fd50e9524	Adding more debug tweaks	2015-08-28 20:10:55 -04:00
Vincent Sposato	f836f88e38	Another tweak getting closer	2015-08-28 20:10:55 -04:00
Vincent Sposato	775239e2ed	Almost there...	2015-08-28 20:10:54 -04:00
Vincent Sposato	16d1875157	A change to my previous tweak for background serving	2015-08-28 20:10:54 -04:00
Vincent Sposato	af6d9b462b	A couple more tweaks to make everything work	2015-08-28 20:10:53 -04:00
Vincent Sposato	bfeb4560ca	Got some more tweaks, and changes to make things work	2015-08-28 20:10:53 -04:00
Vincent Sposato	194e43d206	More tweaks for debugging	2015-08-28 20:10:53 -04:00
Vincent Sposato	13830b5c09	More tweaking of the travis yaml file trying to get more out of the results	2015-08-28 20:10:52 -04:00
Vincent Sposato	855a155178	Tweaking the configuration to work with travis - attempting hostname tweaks	2015-08-28 20:10:52 -04:00
Vincent Sposato	3975555503	One more stupid mistake in travis yaml file -	2015-08-28 20:10:52 -04:00
Vincent Sposato	b1d6d4da37	Fixed stupid mistake in the travis yaml file	2015-08-28 20:10:51 -04:00
Vincent Sposato	be402a9d7d	Fixed issue in travis yaml file	2015-08-28 20:10:51 -04:00
Vincent Sposato	00aba507f7	Fixed acceptance suite yaml to make it work for travis-ci as well as local testing	2015-08-28 20:10:50 -04:00
Vincent Sposato	0cadab8fc6	Initial changes to allow travis-ci to run codeception tests	2015-08-28 20:10:50 -04:00
Vincent Sposato	cc14eee161	Adding setup for Codeception	2015-08-28 20:10:50 -04:00
Vincent Sposato	9d4f7193ae	Cleaning up the tweaks to finalize the testing!	2015-08-28 20:04:42 -04:00
Vincent Sposato	2f62925d85	More tweaks to get environment working	2015-08-28 20:01:29 -04:00
Vincent Sposato	f40d4dfbf4	More tweaks	2015-08-28 19:53:47 -04:00
Vincent Sposato	fd9f6f615f	More tweaks	2015-08-28 19:48:40 -04:00
Vincent Sposato	c7618bd31e	More tweaks	2015-08-28 19:46:37 -04:00
Vincent Sposato	4e831a6396	Another tweak to the config	2015-08-28 19:44:36 -04:00
Vincent Sposato	0492fad3ab	Even more tweaks...	2015-08-28 19:42:45 -04:00
Vincent Sposato	1db2a84dcb	More tweaks, more prayers...	2015-08-28 19:41:05 -04:00
Vincent Sposato	913e7f7803	Made changes to travis.yml to see if I can get codeception tests passing	2015-08-28 19:31:50 -04:00
snipe	da10a9a2aa	Fixes #1130 - don't try to send email if email is not provided with the user	2015-08-28 12:15:07 -07:00
snipe	cf7ef5e8b0	Merge pull request #1131 from irasnyd/docker-fixes Add LDAP support to Docker image	2015-08-28 10:02:18 -07:00
Ira W. Snyder	3f08258bf0	Add LDAP support to Docker image This adds LDAP support to the Docker image. All parameters are specified using environment variables named following the convention in the configuration files themselves.	2015-08-28 09:10:28 -07:00
Ira W. Snyder	f7ce7060eb	Allow Docker users to set the server URL This change allows Docker users to set the server URL by setting the SERVER_URL environment variable. This is done in the same way as the database and mail settings.	2015-08-28 09:03:06 -07:00
madd15	6e13da6293	Fix #1123 - fix new lines in serial not being recognised Hope this is the right way to fix this	2015-08-28 16:28:17 +09:30
madd15	dd2b9e15a6	Fix #1109 - Asset names are missing when viewing user history	2015-08-28 14:44:10 +09:30
Brady Wetherington	49e898fd26	Merge pull request #1122 from irasnyd/docker-fixes Fix broken Docker build	2015-08-26 14:43:10 -07:00
Ira W. Snyder	1927f131aa	Fix broken Docker build The Dockerfile now includes the php5-curl package, which is needed to satisfy a missing dependency. The docker/app_start.patch was updated to match changes to the source code.	2015-08-26 14:09:03 -07:00
snipe	d3bcf727fb	Merge remote-tracking branch 'origin/develop' # Conflicts: # .gitignore # app/commands/LicenseImportCommand.php # app/config/version.php # app/start/artisan.php	2015-08-25 19:48:16 -07:00
Vincent Sposato	1d9bf26194	Putting app.php back to production state	2015-08-22 13:23:43 -04:00
Vincent Sposato	7a813b2a45	Checking testing issue to see if wrong environment is loading	2015-08-22 13:13:33 -04:00
Vincent Sposato	9904f664be	More tweaks to the travis	2015-08-20 18:38:36 -04:00
Vincent Sposato	41c257829e	Another tweak - getting close	2015-08-20 18:36:39 -04:00
Vincent Sposato	cf649fcd12	Updated travis yaml to add a permissions change for the storage directory	2015-08-20 18:21:47 -04:00
Vincent Sposato	4ac79f5e12	Added a sleep statement to make things work possibly	2015-08-20 17:46:59 -04:00
snipe	7b0fd2c8f4	Squashed commit of the following: commit 3dbc9becbc7a5cfe94aae968e52e7c7ed902591b Author: snipe <snipe@snipe.net> Date: Wed Aug 19 17:28:25 2015 -0700 bumped version commit e66e2f1ba226274f4d4af4e0772b46762b400653 Author: snipe <snipe@snipe.net> Date: Wed Aug 19 17:28:17 2015 -0700 Added notes to license search	2015-08-19 17:29:42 -07:00
snipe	a2bd4250cf	Ignore LDAP config	2015-08-19 17:26:08 -07:00
Vincent Sposato	26ede441a4	Last change for detecting correct environment	2015-08-15 20:39:31 -04:00
Vincent Sposato	afac18ea1b	Last tweak before I head to begin drinking heavily...	2015-08-15 20:36:18 -04:00
Vincent Sposato	da187ff07a	A tweak to make this work with an app environment variable	2015-08-15 20:33:47 -04:00
Vincent Sposato	9849bbec70	This is getting old...	2015-08-15 20:29:18 -04:00
Vincent Sposato	3aaed2600e	One last tweak - this may be it	2015-08-15 20:26:42 -04:00
Vincent Sposato	8e316611c0	More tweaks / changes	2015-08-15 20:21:51 -04:00
Vincent Sposato	0a97135578	Adding more debug tweaks	2015-08-15 20:20:46 -04:00
Vincent Sposato	1bed711f0e	Another tweak getting closer	2015-08-15 20:15:55 -04:00
Vincent Sposato	1f1c1cb546	Almost there...	2015-08-15 20:08:20 -04:00
Vincent Sposato	f2e7af498e	A change to my previous tweak for background serving	2015-08-15 20:05:47 -04:00
Vincent Sposato	afdb958955	A couple more tweaks to make everything work	2015-08-15 20:03:41 -04:00
Vincent Sposato	06966d52bf	Got some more tweaks, and changes to make things work	2015-08-15 20:00:48 -04:00
Vincent Sposato	723a6260f5	More tweaks for debugging	2015-08-15 19:40:30 -04:00
Vincent Sposato	a98a0a2f77	More tweaking of the travis yaml file trying to get more out of the results	2015-08-15 19:37:43 -04:00
Vincent Sposato	59e755c5df	Tweaking the configuration to work with travis - attempting hostname tweaks	2015-08-15 19:05:01 -04:00
Vincent Sposato	55b2fce876	One more stupid mistake in travis yaml file -	2015-08-15 19:01:03 -04:00
Vincent Sposato	1fadabaf2f	Fixed stupid mistake in the travis yaml file	2015-08-15 18:59:22 -04:00
Vincent Sposato	33178adeed	Fixed issue in travis yaml file	2015-08-15 18:57:10 -04:00
Vincent Sposato	46fb12f5dc	Fixed acceptance suite yaml to make it work for travis-ci as well as local testing	2015-08-15 18:50:46 -04:00
Vincent Sposato	12e6a721f0	Initial changes to allow travis-ci to run codeception tests	2015-08-15 18:48:20 -04:00
Vincent Sposato	0cbc9d266e	Adding setup for Codeception	2015-08-15 15:10:17 -04:00
snipe	67e0e14a12	License importer, small fixes for asset imporer	2015-08-14 14:18:51 -07:00
snipe	85a64f9dfd	Merge remote-tracking branch 'origin/develop'	2015-08-06 04:00:46 -07:00
snipe	a28481cd8f	Merge remote-tracking branch 'origin/develop'	2015-07-27 23:10:40 -07:00
snipe	a5b2dbfaf0	Merge remote-tracking branch 'origin/develop'	2015-07-23 12:33:26 -07:00
snipe	abb970fe39	Merge remote-tracking branch 'origin/develop'	2015-07-17 16:25:55 -07:00
snipe	9ac093e0be	Merge remote-tracking branch 'origin/develop'	2015-07-17 14:18:20 -07:00
snipe	61e16a4668	Merge remote-tracking branch 'origin/develop'	2015-07-16 16:25:15 -07:00
snipe	dacbdd9aa5	Delete book.json	2015-07-10 19:46:17 -07:00
snipe	e1eb2da5f3	Create book.json	2015-07-09 13:32:26 -07:00