Squashed commit of the following:

commit 95ae26eb2a Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:21:33 2015 -0800 Updated docs location commit cfebe11755 Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:36 2015 -0800 Updated docs for 4.2 commit d86b5aa613 Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:24 2015 -0800 Bumped version
Merge remote-tracking branch 'origin/develop'
2015-02-08 16:22:12 -08:00 · 2015-02-08 16:18:09 -08:00 · 2015-02-08 16:17:45 -08:00 · 2015-02-08 16:13:25 -08:00 · 2015-02-08 16:13:10 -08:00 · 2015-02-08 16:02:35 -08:00
795 changed files with 12408 additions and 5583 deletions
@@ -15,4 +15,6 @@ public/uploads/avatars/*
 /app/storage/views/*
 /app/storage/logs/*
 /app/storage/debugbar/
-/bin/
+/bin/
+.idea
+crowdin.yaml
@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php

@@ -15,14 +19,16 @@ env:
 before_script:
  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
  - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
-  - composer install --prefer-source --no-interaction --dev
-  - php artisan key:generate
-  - php artisan migrate:install
-  - php artisan migrate --package cartalyst/sentry
-  - php artisan migrate
-  - php artisan db:seed
+  - 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
+  - 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

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
@@ -1,10 +1,46 @@


-###  v0.3.11-alpha - Released Jul 19, 2014 07:16:53
+###  v1.1 - Released Nov 06, 2014 02:16:26
+* <a href="http://github.com/snipe/snipe-it/commit/fafd03f00f49cb9ffe81d50aa9ca3d1f1fa1d043">view</a> &bull; Added DB Prefix to Migrations 
+* <a href="http://github.com/snipe/snipe-it/commit/309772e67d62989f1f60141a4a10d724a44c6baa">view</a> &bull; Fixed operator for setting bool display 
+* <a href="http://github.com/snipe/snipe-it/commit/22f81912e416cfe1227a08b5d8b6323e32e1ef36">view</a> &bull; Fixes #299 
+* <a href="http://github.com/snipe/snipe-it/commit/86b7b6946f1e1bd404127e228c615e4abe0b20fb">view</a> &bull; Fixes #316 - added model name back to view 
+* <a href="http://github.com/snipe/snipe-it/commit/9e85dcb9fcb4cc932ecddd23caa6b51e83110543">view</a> &bull; Fixes #315 - add EOL as display option in settings (run migrations) 
+* <a href="http://github.com/snipe/snipe-it/commit/ee35948980c22f9256241c02d7febd90275f6229">view</a> &bull; fix div issues 
+* <a href="http://github.com/snipe/snipe-it/commit/0022389463e251e73402450cfbc280cb05633bd1">view</a> &bull; Fix dropdown menu position 
+* <a href="http://github.com/snipe/snipe-it/commit/343798d241172707145ef365445062db9bb6b99a">view</a> &bull; Merge pull request #322 from madd15/fix-js-delete-asset 
+* <a href="http://github.com/snipe/snipe-it/commit/1078dbf5c5f6a5bec1a2ef864cebfcc7883d31e6">view</a> &bull; Fixes #324 
+* <a href="http://github.com/snipe/snipe-it/commit/6b2d3efe3e76429c9c2f5de78f04c4f7e2748a3d">view</a> &bull; Fixes #237 - reporting-only group 
+* <a href="http://github.com/snipe/snipe-it/commit/e04cc806d9209b54a1833172ebb66ab55b5f0c06">view</a> &bull; Fixes #327 
+
+
+###  v1.0 - Released Oct 16, 2014 09:46:47
+* <a href="http://github.com/snipe/snipe-it/commit/a4b220d6c31c97f6504023f0b52527825a4cd897">view</a> &bull; Fixed #191 - allow admins to assign a user during asset creation 
+* <a href="http://github.com/snipe/snipe-it/commit/dc1033025a0bc1b2d657e06c89058c3ab95f2c59">view</a> &bull; Fixed #151 - more complete translations 
+* <a href="http://github.com/snipe/snipe-it/commit/56d619b218794b43d8c6b182c89c75f83af9dcd9">view</a> &bull; Fixed missing language string 
+* <a href="http://github.com/snipe/snipe-it/commit/69fca5d1eda0e5f26d2085f7eebc08fafd84a3ae">view</a> &bull; Fixed #58 
+* <a href="http://github.com/snipe/snipe-it/commit/8197e6174e9f12bcfddd94c6bf606ee36e6801bf">view</a> &bull; Fixes #200 
+* <a href="http://github.com/snipe/snipe-it/commit/cb8369e9de96aaf1cf9108e22f4038fa6486b881">view</a> &bull; Initial QA Patch to fix errors Add License Add Asset Show Deleted Users License Assign 
+* <a href="http://github.com/snipe/snipe-it/commit/62a3ed671bbd957075563933f49e8a5445042737">view</a> &bull; DB migration, layout and clone fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/9ccc7d756f9361757eafc1dce9684ee9f5ecc1c3">view</a> &bull; A0.4.2: Added asset, license, user, model cloning and fixed some bugs. 
+* <a href="http://github.com/snipe/snipe-it/commit/652f1c746c4757dce9d33d7bd90a9357822c4656">view</a> &bull; Fixes Travis CI build 
+* <a href="http://github.com/snipe/snipe-it/commit/363d084bd623f778cd72ca7d385a4fb2f67ef474">view</a> &bull; Fixed DB name in travis CI 
+* <a href="http://github.com/snipe/snipe-it/commit/49c5607e1c8a82a3111123ad84b537644546ebb3">view</a> &bull; Fixes #222 
+* <a href="http://github.com/snipe/snipe-it/commit/96e40d72b9ac3f74b94b0e39b6f296f0f0b2a1f4">view</a> &bull; fix typo: artisand -> artisan 
+* <a href="http://github.com/snipe/snipe-it/commit/e978038cc044f60c2eca71b6319063009a57886f">view</a> &bull; Merge pull request #234 from burlito/typo-fix 
+* <a href="http://github.com/snipe/snipe-it/commit/a829fcf52f933d087c3776993b42311ec9a8988e">view</a> &bull; fix: Use the old asset tag when cloning 
+* <a href="http://github.com/snipe/snipe-it/commit/ee7d9bec7082dc2e60a4797dea84a0b7443c8090">view</a> &bull; Fixes #279 - QR checkbox not staying checked 
+* <a href="http://github.com/snipe/snipe-it/commit/bf1e07555160ede517d41f649d6b1d0911f89dd2">view</a> &bull; Fixes #87 - made datatables responsive 
+
+
+###  v0.3.11-alpha - Released Jul 19, 2014 05:16:53
 #### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/ac4c905c42d920d2cf8455d644f4c65332a81d0d">view</a> &bull; Fixed #140 
+* <a href="http://github.com/snipe/snipe-it/commit/4a13cded607415d749151cef495332c48c58cf86">view</a> &bull; Fixed path for Travis composer 
+* <a href="http://github.com/snipe/snipe-it/commit/ddf946ad5eb6dd8480eeaa709f82af75e0c61444">view</a> &bull; Tried to fix failing build caused by travis composer 


-###  v0.3.10-alpha - Released Jul 17, 2014 07:54:10
+###  v0.3.10-alpha - Released Jul 17, 2014 05:54:10
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/89a8f3c277d2482b2cd04c4c5c582c9e507770f8">view</a> &bull; Fixes #183 - added employee number to users 
 * <a href="http://github.com/snipe/snipe-it/commit/a7b809cb91f49fb2c8eaecc67822fa155a0f20ce">view</a> &bull; Updated title/header for users, additional fixes for #151 
@@ -21,14 +57,14 @@
 * <a href="http://github.com/snipe/snipe-it/commit/e203fc516fadf6218f5ce87c070d0cdba9fca188">view</a> &bull; Fixes #194 


-###  v0.3.9-alpha - Released Jul 03, 2014 04:08:38
+###  v0.3.9-alpha - Released Jul 03, 2014 02:08:38
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/2825bcb4310899e89ccbc73dfa8b59ade28018da">view</a> &bull; Fixed #179 - account page to show assets checked out to the logged in user 
 * <a href="http://github.com/snipe/snipe-it/commit/c782f29f5aae752a6246be9778d418df172dd4f6">view</a> &bull; Pulled account sub-nav into top menu to free up UI space. #changelog 
 * <a href="http://github.com/snipe/snipe-it/commit/fad2ec66fa9abe0b34baf16cce453a7e9fc9e4d4">view</a> &bull; More README fixes and refinement 


-###  v0.3.8-alpha - Released Jun 27, 2014 11:28:22
+###  v0.3.8-alpha - Released Jun 27, 2014 09:28:22
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/3e7a9e45d1954531bbc3b73f2ed59dd16d59c657">view</a> &bull; Fixes PR #168 and #167 
 * <a href="http://github.com/snipe/snipe-it/commit/945cb3253f1349e30aafa4e7cb57bb507a2ea0cc">view</a> &bull; Fix #117 
@@ -41,17 +77,17 @@
 * <a href="http://github.com/snipe/snipe-it/commit/ec9eab81bfb3b35bfe7ad06008b26f19009e6638">view</a> &bull; Closes #177 - change log file added, needs refining 


-###  v.0.3.5-alpha - Released Jun 20, 2014 04:23:09
+###  v.0.3.5-alpha - Released Jun 20, 2014 02:23:09
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/d1499deecdff3c7a4235ffdfad5adbddc1a5098f">view</a> &bull; Provisions for strict mode, fixed license deletion bug 


-###  v.0.3.4-alpha - Released Jun 20, 2014 12:27:59
+###  v.0.3.4-alpha - Released Jun 19, 2014 10:27:59
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/08d05b481f6366ad48fcdce72a8df53755f5dee8">view</a> &bull; Fixes #158 


-###  v.0.3.3-alpha - Released Jun 18, 2014 10:04:46
+###  v.0.3.3-alpha - Released Jun 18, 2014 08:04:46
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/3518ab9f55f7992d6d4f886389d67b062a02f2d8">view</a> &bull; Fixes #139 
 * <a href="http://github.com/snipe/snipe-it/commit/ad9b1fc446ab15157502fe7c52ddbda455e3ea8f">view</a> &bull; Fixes #139 
@@ -63,12 +99,12 @@
 * <a href="http://github.com/snipe/snipe-it/commit/610c405aa50118163ad5d26d43e4bf6c2456f624">view</a> &bull; More fixes for #151 


-###  v.0.3.2-alpha - Released May 06, 2014 10:26:21
+###  v.0.3.2-alpha - Released May 06, 2014 08:26:21
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/f4c5da57d0397877d90aa398267e59fcffee7b47">view</a> &bull; Fixed auth error when user isn't logged in 


-###  v.0.3.1-alpha - Released May 06, 2014 06:48:09
+###  v.0.3.1-alpha - Released May 06, 2014 04:48:09
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/efad5db082d1461ea26556fad2f1671a49dc1480">view</a> &bull; Fix for broken datatables in upgrading to v2.2 
 * <a href="http://github.com/snipe/snipe-it/commit/5690e9ce1f178486179ce6cdfb00ca417acd87dd">view</a> &bull; Fixed code indentation for Apache virtualhost example 
@@ -76,7 +112,7 @@
 * <a href="http://github.com/snipe/snipe-it/commit/06067fc19c0127fdcbb78541e7cdc8e77f5444ac">view</a> &bull; Fixed CSV rexport 


-###  v0.3.0-alpha - Released Jan 29, 2014 02:28:31
+###  v0.3.0-alpha - Released Jan 29, 2014 01:28:31
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/d91d75abe4df19dd6cd54705ba9967295973ced0">view</a> &bull; Fixing JSON parse errors from #97 
 * <a href="http://github.com/snipe/snipe-it/commit/baab758377e117a86c3273dd1d6e03e66b02dc8b">view</a> &bull; Fixed language support 
@@ -103,7 +139,7 @@
 * <a href="http://github.com/snipe/snipe-it/commit/580590b4c0b4a2f76ef8edfe02de986267fc7395">view</a> &bull; Fixed  === to  == (PHP is loosely typed) 


-###  v0.2.0-alpha - Released Nov 29, 2013 11:09:07
+###  v0.2.0-alpha - Released Nov 29, 2013 10:09:07
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/06cbd0723e415d81ea12aa48f2c37188741b2dbc">view</a> &bull; Fixes #93 
 * <a href="http://github.com/snipe/snipe-it/commit/e305099b45401c871f16fec23c200080830fcd5d">view</a> &bull; Fixed model view 
@@ -113,7 +149,7 @@
 * <a href="http://github.com/snipe/snipe-it/commit/11c657ffa4c3bdd01cd04b81d01980b2d795107c">view</a> &bull; Fixes #36 


-###  v0.1.2-alpha - Released Nov 29, 2013 02:59:05
+###  v0.1.2-alpha - Released Nov 29, 2013 01:59:05
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/b1aa67ddb72158513f0a706996c8c1f5b3609aa5">view</a> &bull; Fixes #69 
 * <a href="http://github.com/snipe/snipe-it/commit/aa38d83ba6369215451d905e599492214e9f4b8b">view</a> &bull; Fixes #63 and #70 
@@ -126,12 +162,75 @@
 * <a href="http://github.com/snipe/snipe-it/commit/d9a37f38228d55bb6265efc626e3ab7919013362">view</a> &bull; Fixes #88 
 * <a href="http://github.com/snipe/snipe-it/commit/5858bfb99b2144fbc805ec62cc90e6aaaf019f77">view</a> &bull; Fixed language file paths caused by #88 
 * <a href="http://github.com/snipe/snipe-it/commit/9f7cbc8a4f01ddf2596e831f658c9a8c321b2f46">view</a> &bull; Another fix related to #88, also accounts for users with invalid location_ids 
+* <a href="http://github.com/snipe/snipe-it/commit/1b56c31a22afd39a875677714b9c07e96876b8df">view</a> &bull; Fixed relationship between users/locations because fuck you ORM 
 * <a href="http://github.com/snipe/snipe-it/commit/f0f07b578b2439a627e5e946df0849d88d8526cf">view</a> &bull; Fixing pivot for users 
 * <a href="http://github.com/snipe/snipe-it/commit/9fa826b2e77ce22d25a8b3094bc825802d25be85">view</a> &bull; Fixed assigned to id 
+* <a href="http://github.com/snipe/snipe-it/commit/839d01a3af08d780be4152bc02b33bff1a7d7f20">view</a> &bull; Fixed relationship method because fuck you ORM 


-###  v0.1.1-alpha - Released Nov 27, 2013 12:11:00
+###  v0.1.1-alpha - Released Nov 26, 2013 11:11:00
 #### This is a pre-release 
 * <a href="http://github.com/snipe/snipe-it/commit/1527b88fd671a20c879c9b2061ae95f3b386ba27">view</a> &bull; Fixes #61 
 * <a href="http://github.com/snipe/snipe-it/commit/4c0af1eae1031c2630f6e29cc73f8a9dfac1081c">view</a> &bull; Fixed typo causing failure with mysql strict 
 * <a href="http://github.com/snipe/snipe-it/commit/0e3bcfecd05a39bfea6fc7ba11cb24d9d49e6d86">view</a> &bull; Should be final fixes for mysql strict mode 
+
+
+###  Initial alpha - Released Nov 26, 2013 09:01:13
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/14972f894bb0e761e2d0170a2c93c9aac4edfca6">view</a> &bull; fixed typo 
+* <a href="http://github.com/snipe/snipe-it/commit/79da13dff767d57f6f4fbb12f195e25f409ee5ec">view</a> &bull; Fixed layout for category view 
+* <a href="http://github.com/snipe/snipe-it/commit/0e4e26206bdcc164e5df586368ed45edd45b9a74">view</a> &bull; fixed broken redirect route 
+* <a href="http://github.com/snipe/snipe-it/commit/9364c46c2df79c0de07dc5dbb724a3c44485b739">view</a> &bull; Fixed licensed link 
+* <a href="http://github.com/snipe/snipe-it/commit/4f0a1789db01f12ebc4bd47e7e0594bf67b64daf">view</a> &bull; Fixed license blades 
+* <a href="http://github.com/snipe/snipe-it/commit/27514f85c3ba9056c4609774a482a58605f4d8cf">view</a> &bull; Fixed typo in variable name 
+* <a href="http://github.com/snipe/snipe-it/commit/ffe786f659e3e8c5b91c27cd33cb77b6d24d3545">view</a> &bull; Fixed routes. 
+* <a href="http://github.com/snipe/snipe-it/commit/cf59ec8c67e142c0612fb7797448057b19af5cfa">view</a> &bull; Fixed pagination bug 
+* <a href="http://github.com/snipe/snipe-it/commit/76ac39115347dabac8ada21d981494a3edf7a29c">view</a> &bull; Fixed edit bug where new Category was invoked twice 
+* <a href="http://github.com/snipe/snipe-it/commit/940281dd4dd0a69b900a052c0bb84e24dde89666">view</a> &bull; Fixed bug on validation display 
+* <a href="http://github.com/snipe/snipe-it/commit/31d323fb71fcbe94f17f0a2b38183709e8c77151">view</a> &bull; Cosmetic fix on form 
+* <a href="http://github.com/snipe/snipe-it/commit/8f86ec9dae58cef27387b028f70c8116d649b425">view</a> &bull; Change depreciation to be by month; formatting fixes. 
+* <a href="http://github.com/snipe/snipe-it/commit/4da2bccbf78a0b630267c6ed75f3a1bd8100e20d">view</a> &bull; Merge pull request #27 from snipe/depreciation_fix 
+* <a href="http://github.com/snipe/snipe-it/commit/7bc7ffb72813cd176658d536bbdd6be0faa9a45c">view</a> &bull; Fixed some error reporting/required fields around checkout/checkin 
+* <a href="http://github.com/snipe/snipe-it/commit/48e180c6910d30732559b0cc077fce679344f56e">view</a> &bull; Fixed asset bug caused by unique validation in assets model 
+* <a href="http://github.com/snipe/snipe-it/commit/57107dceeee81e8618198da33af79fe66bde0d9e">view</a> &bull; Fixed checkin text 
+* <a href="http://github.com/snipe/snipe-it/commit/7b59f42fb03ee5017c11cf32abc8a23c3f5d2141">view</a> &bull; Fixed pagination bug, styled buttons 
+* <a href="http://github.com/snipe/snipe-it/commit/ffdb4b1aa8dde9942f7c3b110e9a68006779998b">view</a> &bull; Fixed wonky layout issue 
+* <a href="http://github.com/snipe/snipe-it/commit/3401fee672d796f4aca8dafced6917c7caf87866">view</a> &bull; Another table fix 
+* <a href="http://github.com/snipe/snipe-it/commit/ddfd69e5100b19bb05d6b76cb9fad3dbadad1921">view</a> &bull; More table fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/5c43caf0579a26c1604fc81f5cbdf8f0d43c157d">view</a> &bull; More table fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/44ba90f9f0a968999a743c35dd2bf153c2edbf1d">view</a> &bull; Fixed icon set to white in main nav 
+* <a href="http://github.com/snipe/snipe-it/commit/719c36d482cc67f1513351672eda057519f7f735">view</a> &bull; migration to fix a few fields in the log table 
+* <a href="http://github.com/snipe/snipe-it/commit/5b27a34f050646467a178ff780efc80036aadf1b">view</a> &bull; Fixed fieldname in userlog 
+* <a href="http://github.com/snipe/snipe-it/commit/76da83cbe1c4334380bb996a40cc374ab4ec12e9">view</a> &bull; Fixed links to edit/checkout 
+* <a href="http://github.com/snipe/snipe-it/commit/d6a718e99766829e700760c2266b62ad37cdb66b">view</a> &bull; Fixed bug in views for created_at date 
+* <a href="http://github.com/snipe/snipe-it/commit/0ee08e47e9f2b144084703142ae5eb099090476d">view</a> &bull; Fixed fatal error if admin who created the asset was deleted. (This should never happen, but...) 
+* <a href="http://github.com/snipe/snipe-it/commit/61cceb5f0b44e7f2a82ccca44be2bc42e8825156">view</a> &bull; Fixed open tag in CSS 
+* <a href="http://github.com/snipe/snipe-it/commit/c93469c465c0ce8a291d595ac8ccbafbfc68c71a">view</a> &bull; Fixed query for asset/license header boxes 
+* <a href="http://github.com/snipe/snipe-it/commit/d46556a83d5335913b8b7fe8558f416540290343">view</a> &bull; Fixed phone display if no value set 
+* <a href="http://github.com/snipe/snipe-it/commit/fc8c3c086ca70a513cd3fff39275fcf035cead5a">view</a> &bull; fixed #37 
+* <a href="http://github.com/snipe/snipe-it/commit/52020d09f034c9de78b798725c0f3700d0253beb">view</a> &bull; Fixed bomb when asset is unassigned 
+* <a href="http://github.com/snipe/snipe-it/commit/1b1efec858e8e0cfc5cfafc63bfb537e45191cd1">view</a> &bull; Fixed foreign key in assets 
+* <a href="http://github.com/snipe/snipe-it/commit/b7251d9992401c04a5da1771af0fcddad2754362">view</a> &bull; Fixed potential bug in blade 
+* <a href="http://github.com/snipe/snipe-it/commit/9249786a25bc166bf5341f59a11d644cf4f6425c">view</a> &bull; Fixed status display 
+* <a href="http://github.com/snipe/snipe-it/commit/c32d45e90142b41b567a350af6d399af67994a02">view</a> &bull; Fixed ID 
+* <a href="http://github.com/snipe/snipe-it/commit/2203789f4c5310599a94799bb3ead9ff9c1ce802">view</a> &bull; Fixes #41 
+* <a href="http://github.com/snipe/snipe-it/commit/03edbc008c671c868fced94a7761683309d9ab8b">view</a> &bull; Fixes #43 
+* <a href="http://github.com/snipe/snipe-it/commit/2b088a3fb2ea7711f66e4a887882b17f401ba4bc">view</a> &bull; Fixes #17 
+* <a href="http://github.com/snipe/snipe-it/commit/ad680a337e50638b4b9865e42e4ea7e453c4151b">view</a> &bull; Fixed column name spelling in DB 
+* <a href="http://github.com/snipe/snipe-it/commit/718236b2d4bedeaaad80cc601e3e91a3229e81fa">view</a> &bull; Fixed #9 
+* <a href="http://github.com/snipe/snipe-it/commit/3cc0ed87438b632679ce8b61a7ea0fae48999438">view</a> &bull; Fixed sorting weirdness 
+* <a href="http://github.com/snipe/snipe-it/commit/57d0f3643518190f0b4a6fe33ac6d83eda647119">view</a> &bull; Fixes #4 
+* <a href="http://github.com/snipe/snipe-it/commit/3ea0ad87c8733ce1bac0e9c10c2cdaf3254743d5">view</a> &bull; Fixes #22 
+* <a href="http://github.com/snipe/snipe-it/commit/e87e5b9cae19bfd06b815cf01be309d665409828">view</a> &bull; Fixes #46 
+* <a href="http://github.com/snipe/snipe-it/commit/7a5b133c5875959c5d7bebf16ea82bac7ceb3989">view</a> &bull; Fixed bug linking to assets when they should be pointing to licenses 
+* <a href="http://github.com/snipe/snipe-it/commit/e13578d97d6b1ef1990f171beda9b35868fda47c">view</a> &bull; Fixed error when no category is given 
+* <a href="http://github.com/snipe/snipe-it/commit/45c04b1cdebc0b19243a519d2580af921c82b47b">view</a> &bull; Fixed display bug 
+* <a href="http://github.com/snipe/snipe-it/commit/4d1dd1c446f76e5530d6fb7f932a77a8da2d0b73">view</a> &bull; Fixed #50 - MOAR VALIDATION! 
+* <a href="http://github.com/snipe/snipe-it/commit/12958553022d4b7b2184ebf837d4113b23f5cf27">view</a> &bull; Fixes #51 
+* <a href="http://github.com/snipe/snipe-it/commit/d0cbb9f3a7e4a1fc05ddcabd19e201434c14370b">view</a> &bull; Fixes #52 
+* <a href="http://github.com/snipe/snipe-it/commit/5bf38b1d02e743af22a51393f1e477100b1f76b7">view</a> &bull; Fixes #50 
+* <a href="http://github.com/snipe/snipe-it/commit/e6fc1956fc93132d04bf5ac4c0d108c1ae9eee0b">view</a> &bull; Fixes #55 
+* <a href="http://github.com/snipe/snipe-it/commit/ee3fb2785e719c938b6036f6ea74527c1217aba8">view</a> &bull; Fixed XSS on modal 
+* <a href="http://github.com/snipe/snipe-it/commit/dc5ad876863a1e17babce06adfb365f38c30ca59">view</a> &bull; Fixes #59 
+* <a href="http://github.com/snipe/snipe-it/commit/d7a8cac1dc6158983673688c2e48e9a48217b6f2">view</a> &bull; Fixed validation 
+* <a href="http://github.com/snipe/snipe-it/commit/196710dac807d48f6c73b02c2444a5b8d301b8a6">view</a> &bull; Fixed bug in error validation display 
@@ -8,18 +8,13 @@ If you don't have a feature in mind, but would like to contribute back to the pr

 -----

+[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
+
+The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
+
+
 ## Translations!

-If you're not great at PHP and you still want to help, consider contributing some translation files (assuming, of course, that you are fluent in another language.)
-
-To do so:
-
-* fork the develop branch
-* create a new branch on your new fork (something like `translations/french`)
-* copy the `en` directory and name it according to the [two-letter ISO 639-1 code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
-* translate the strings
-* submit a pull request!
-
-**If you've translated Snipe IT into another language already for your own usage, please consider contributing those translation files back to the project so that everyone can benefit.**
+If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.

 Thanks!
@@ -3,9 +3,11 @@

 ## Snipe-IT - Asset Management For the Rest of Us

+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

-It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
+It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.

 This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo.php).)

@@ -14,7 +16,7 @@ __This is web-based software__. This means there there is no executable file (ak
 -----
 ### Documentation & Installation

-__Installation and configuration documentation for this project has been moved to http://docs.snipeitapp.com.__ This provides a more easily navigated, organized view of the documentation, and is based off of the [documentation branch](https://github.com/snipe/snipe-it/tree/documentation) in this repo. Contributions and bugfixes to the documentation are always welcome!
+__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__

 We'll be adding a long-overdue user's manual soon as well.

@@ -39,7 +41,7 @@ To be notified of important news (such as new releases, security advisories, etc

 If you're not a coder but want to give back to the project and you're fluent in other languages, consider helping out with the translations. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations to the project without messing with code. Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/).

-We currently have English and Spanish completed, and are looking for lots more!
+We currently have English, Chinese, Finnish, Malay, Romanian and Spanish completed, and are looking for lots more!

 -----
 ## Requirements
@@ -63,3 +65,7 @@ Whenever you pull down a new version from master or develop, when you grab the [
 	php artisan migrate

 Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/snipe/snipe-it/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
@@ -27,6 +27,23 @@ return array(

    'locale' => 'en',

+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | This setting may be used to control the default cipher used by the Laravel
+    | encryption facilities.
+    |
+    | Note: In Laravel 4.2, the default cipher is MCRYPT_RIJNDAEL_128 (AES),
+    | which is considered to be the most secure cipher. Changing the cipher
+    | back to MCRYPT_RIJNDAEL_256 is required to decrypt cookies/values that
+    | were encrypted in Laravel <= 4.1
+    |
+    */
+
+    'cipher' => MCRYPT_RIJNDAEL_256,
+
    /*
    |--------------------------------------------------------------------------
    | Autoloaded Service Providers
@@ -99,46 +116,47 @@ return array(

    'aliases' => array(

-            'App'             => 'Illuminate\Support\Facades\App',
-            'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-            'Auth'            => 'Illuminate\Support\Facades\Auth',
-            'Blade'           => 'Illuminate\Support\Facades\Blade',
-            'Cache'           => 'Illuminate\Support\Facades\Cache',
-            'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-            'Config'          => 'Illuminate\Support\Facades\Config',
-            'Controller'      => 'Illuminate\Routing\Controller',
-            'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-            'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-            'DB'              => 'Illuminate\Support\Facades\DB',
-            'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-            'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-            'Event'           => 'Illuminate\Support\Facades\Event',
-            'File'            => 'Illuminate\Support\Facades\File',
-            'Form'            => 'Illuminate\Support\Facades\Form',
-            'Hash'            => 'Illuminate\Support\Facades\Hash',
-            'HTML'            => 'Illuminate\Support\Facades\HTML',
-			'Image'           => 'Intervention\Image\ImageManagerStatic',
-            'Input'           => 'Illuminate\Support\Facades\Input',
-            'Lang'            => 'Illuminate\Support\Facades\Lang',
-            'Log'             => 'Illuminate\Support\Facades\Log',
-            'Mail'            => 'Illuminate\Support\Facades\Mail',
-            'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-            'Password'        => 'Illuminate\Support\Facades\Password',
-            'Queue'           => 'Illuminate\Support\Facades\Queue',
-            'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-            'Redis'           => 'Illuminate\Support\Facades\Redis',
-            'Request'         => 'Illuminate\Support\Facades\Request',
-            'Response'        => 'Illuminate\Support\Facades\Response',
-            'Route'           => 'Illuminate\Support\Facades\Route',
-            'Schema'          => 'Illuminate\Support\Facades\Schema',
-            'Seeder'          => 'Illuminate\Database\Seeder',
-            'Sentry'          => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
-            'Session'         => 'Illuminate\Support\Facades\Session',
-            'SSH'             => 'Illuminate\Support\Facades\SSH',
-            'Str'             => 'Illuminate\Support\Str',
-            'URL'             => 'Illuminate\Support\Facades\URL',
-            'Validator'       => 'Illuminate\Support\Facades\Validator',
-            'View'            => 'Illuminate\Support\Facades\View'
+            'App'             		=> 'Illuminate\Support\Facades\App',
+            'Artisan'         		=> 'Illuminate\Support\Facades\Artisan',
+            'Auth'            		=> 'Illuminate\Support\Facades\Auth',
+            'Blade'           		=> 'Illuminate\Support\Facades\Blade',
+            'Cache'           		=> 'Illuminate\Support\Facades\Cache',
+            'ClassLoader'     		=> 'Illuminate\Support\ClassLoader',
+            'Config'          		=> 'Illuminate\Support\Facades\Config',
+            'Controller'      		=> 'Illuminate\Routing\Controller',
+            'Cookie'          		=> 'Illuminate\Support\Facades\Cookie',
+            'Crypt'           		=> 'Illuminate\Support\Facades\Crypt',
+            'DB'              		=> 'Illuminate\Support\Facades\DB',
+            'Datatable' 			=> 'Chumper\Datatable\Facades\DatatableFacade',
+            'Eloquent'        		=> 'Illuminate\Database\Eloquent\Model',
+            'Event'           		=> 'Illuminate\Support\Facades\Event',
+            'File'            		=> 'Illuminate\Support\Facades\File',
+            'Form'            		=> 'Illuminate\Support\Facades\Form',
+            'Hash'            		=> 'Illuminate\Support\Facades\Hash',
+            'HTML'            		=> 'Illuminate\Support\Facades\HTML',
+			'Image'           		=> 'Intervention\Image\ImageManagerStatic',
+            'Input'           		=> 'Illuminate\Support\Facades\Input',
+            'Lang'            		=> 'Illuminate\Support\Facades\Lang',
+            'Log'             		=> 'Illuminate\Support\Facades\Log',
+            'Mail'            		=> 'Illuminate\Support\Facades\Mail',
+            'Paginator'       		=> 'Illuminate\Support\Facades\Paginator',
+            'Password'        		=> 'Illuminate\Support\Facades\Password',
+            'Queue'           		=> 'Illuminate\Support\Facades\Queue',
+            'Redirect'        		=> 'Illuminate\Support\Facades\Redirect',
+            'Redis'           		=> 'Illuminate\Support\Facades\Redis',
+            'Request'         		=> 'Illuminate\Support\Facades\Request',
+            'Response'        		=> 'Illuminate\Support\Facades\Response',
+            'Route'           		=> 'Illuminate\Support\Facades\Route',
+            'Schema'          		=> 'Illuminate\Support\Facades\Schema',
+            'Seeder'          		=> 'Illuminate\Database\Seeder',
+            'Sentry'          		=> 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            'Session'         		=> 'Illuminate\Support\Facades\Session',
+            'SoftDeletingTrait'     => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
+            'SSH'             		=> 'Illuminate\Support\Facades\SSH',
+            'Str'             		=> 'Illuminate\Support\Str',
+            'URL'             		=> 'Illuminate\Support\Facades\URL',
+            'Validator'       		=> 'Illuminate\Support\Facades\Validator',
+            'View'            		=> 'Illuminate\Support\Facades\View'

    ),

@@ -37,7 +37,7 @@ return array(
    | 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
+    | Run a php artisan key:generate to create a random one
    */

    'key' => 'Change_this_key_or_snipe_will_get_ya',
@@ -61,6 +61,7 @@ return array(
            'charset'   => 'utf8',
            'collation' => 'utf8_unicode_ci',
            'prefix'    => '',
+            'strict'    => false,
        ),

        'pgsql' => array(
@@ -26,7 +26,7 @@ return array(
    |
    */

-    'default' => 'sqlite',
+    'default' => 'mysql',

    /*
    |--------------------------------------------------------------------------
@@ -50,6 +50,18 @@ return array(
            'database' => ':memory:',
            'prefix'   => ''
        ),
+
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),
+
    ),

    /*
@@ -119,6 +119,6 @@ return array(
    |
    */

-    'pretend' => false,
+    'pretend' => true,

 );
@@ -38,39 +38,21 @@ class AssetsController extends AdminController
    {
        // Grab all the assets

+		$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->Hardware();
        // Filter results
        if (Input::get('Pending')) {
-            $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-            ->whereNull('status_id','and')
-        	->where('assigned_to','=','0')
-        	->where('physical', '=', 1)
-        	->get();
+        	$assets->Pending();
        } elseif (Input::get('RTD')) {
-        	$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-        	->where('status_id', '=', 0)
-        	->where('physical', '=', 1)
-        	->orderBy('asset_tag', 'ASC')
-        	->get();
+        	$assets->RTD();
        } elseif (Input::get('Undeployable')) {
-           $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-           ->where('physical', '=', 1)
-           ->where('assigned_to','>','1')
-           ->orderBy('asset_tag', 'ASC')
-           ->get();
+        	$assets->Undeployable();
        } elseif (Input::get('Deployed')) {
-            $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
-            ->where('physical', '=', 1)
-            ->where('assigned_to','>','0')
-            ->orderBy('asset_tag', 'ASC')
-            ->get();
-        } else {
-			$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
-			->where('physical', '=', 1)
-			->orderBy('asset_tag', 'ASC')
-			->get();
-
+        	$assets->Deployed();
        }

+        $assets = $assets->orderBy('asset_tag', 'ASC')->get();
+
+
        // Paginate the users
        /**$assets = $assets->paginate(Setting::getSettings()->per_page)
            ->appends(array(
@@ -84,104 +66,51 @@ class AssetsController extends AdminController
        return View::make('backend/hardware/index', compact('assets'));
    }

-    public function getReports()
-    {
-        // Grab all the assets
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
-        return View::make('backend/reports/index', compact('assets'));
-    }

-    public function exportReports()
-    {
-        // @todo - It may be worthwhile creating a separate controller for reporting
-
-        // Grab all the assets
-        $assets = Asset::orderBy('created_at', 'DESC')->get();
-
-        $rows = array();
-
-        // Create the header row
-        $header = array(
-            Lang::get('admin/hardware/table.asset_tag'),
-            Lang::get('admin/hardware/table.title'),
-            Lang::get('admin/hardware/table.serial'),
-            Lang::get('admin/hardware/table.checkoutto'),
-            Lang::get('admin/hardware/table.location'),
-            Lang::get('admin/hardware/table.purchase_date'),
-            Lang::get('admin/hardware/table.purchase_cost'),
-            Lang::get('admin/hardware/table.book_value'),
-            Lang::get('admin/hardware/table.diff')
-        );
-        $header = array_map('trim', $header);
-        $rows[] = implode($header, ',');
-
-        // Create a row per asset
-        foreach ($assets as $asset) {
-            $row = array();
-            $row[] = $asset->asset_tag;
-            $row[] = $asset->name;
-            $row[] = $asset->serial;
-
-
-            if ($asset->assigned_to > 0) {
-              $user = User::find($asset->assigned_to);
-              $row[] = $user->fullName();
-              } else {
-                $row[] = ''; // Empty string if unassigned
-            }
-
-            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
-                $location = Location::find($asset->assigneduser->location_id);
-                if ($location->city) {
-                    $row[] = '"'.$location->city . ', ' . $location->state.'"';
-                } elseif ($location->name) {
-                    $row[] = $location->name;
-                } else {
-                    $row[] = '';
-                }
-            } else {
-                $row[] = '';  // Empty string if location is not set
-            }
-
-            $depreciation = $asset->depreciate();
-
-            $row[] = $asset->purchase_date;
-            $row[] = '"'.number_format($asset->purchase_cost).'"';
-            $row[] = '"'.number_format($depreciation).'"';
-            $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
-            $rows[] = implode($row, ',');
-        }
-
-        // spit out a csv
-        $csv = implode($rows, "\n");
-        $response = Response::make($csv, 200);
-        $response->header('Content-Type', 'text/csv');
-        $response->header('Content-disposition', 'attachment;filename=report.csv');
-
-        return $response;
-    }

    /**
     * Asset create.
     *
+     * @param null $model_id
+     *
     * @return View
     */
-    public function getCreate()
+    public function getCreate($model_id = null)
    {
+
        // Grab the dropdown list of models
-        $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id');
+        //$model_list = array('' => 'Select a Model') + Model::orderBy('name', 'asc')->lists('name'.' '. 'modelno', 'id');
+
+        $model_list = array('' => 'Select a Model') + DB::table('models')
+        ->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc')
+        ->orderBy('modelno', 'asc')
+        ->lists('name', 'id');
+
+
        $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
        $assigned_to = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
        $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');

+
        // Grab the dropdown list of status
        $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');

-        return View::make('backend/hardware/edit')->with('supplier_list',$supplier_list)->with('model_list',$model_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to)->with('location_list',$location_list)->with('asset',new Asset);
+        $view = View::make('backend/hardware/edit');
+        $view->with('supplier_list',$supplier_list);
+        $view->with('model_list',$model_list);
+        $view->with('statuslabel_list',$statuslabel_list);
+        $view->with('assigned_to',$assigned_to);
+        $view->with('location_list',$location_list);
+        $view->with('asset',new Asset);

+        if (!is_null($model_id)) {
+            $selected_model = Model::find($model_id);
+            $view->with('selected_model',$selected_model);
+        }
+
+        return $view;
    }

-
    /**
     * Asset create form processing.
     *
@@ -228,7 +157,7 @@ class AssetsController extends AdminController
            }

            if (e(Input::get('assigned_to')) == '') {
-                $asset->assigned_to =  0;
+                $asset->assigned_to =  NULL;
            } else {
                $asset->assigned_to        = e(Input::get('assigned_to'));
            }
@@ -246,7 +175,7 @@ class AssetsController extends AdminController
            }

            if (e(Input::get('rtd_location_id')) == '') {
-                $asset->rtd_location_id = 0;
+                $asset->rtd_location_id = NULL;
            } else {
                $asset->rtd_location_id     = e(Input::get('rtd_location_id'));
            }
@@ -266,6 +195,17 @@ class AssetsController extends AdminController

            // Was the asset created?
            if($asset->save()) {
+
+            	if (Input::get('assigned_to')!='') {
+					$logaction = new Actionlog();
+					$logaction->asset_id = $asset->id;
+					$logaction->checkedout_to = $asset->assigned_to;
+					$logaction->asset_type = 'hardware';
+					$logaction->user_id = Sentry::getUser()->id;
+					$logaction->note = e(Input::get('note'));
+					$log = $logaction->logaction('checkout');
+				}
+
                // Redirect to the asset listing page
                return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
            }
@@ -439,7 +379,7 @@ class AssetsController extends AdminController
        }

        // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');

        return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);

@@ -18,7 +18,7 @@ use Str;
 use Supplier;
 use Validator;
 use View;
-
+use Response;

 class LicensesController extends AdminController
 {
@@ -53,7 +53,13 @@ class LicensesController extends AdminController
        // Show the page
        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',new License);
+        $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        return View::make('backend/licenses/edit')
+            ->with('license_options',$license_options)
+            ->with('depreciation_list',$depreciation_list)
+            ->with('supplier_list',$supplier_list)
+            ->with('maintained_list',$maintained_list)
+            ->with('license',new License);
    }


@@ -88,6 +94,18 @@ class LicensesController extends AdminController
                $license->supplier_id = e(Input::get('supplier_id'));
            }

+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+
            // Save the license data
            $license->name              = e(Input::get('name'));
            $license->serial            = e(Input::get('serial'));
@@ -170,7 +188,12 @@ class LicensesController extends AdminController
        $license_options = array('' => 'Top Level') + DB::table('assets')->where('id', '!=', $licenseId)->lists('name', 'id');
        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        return View::make('backend/licenses/edit', compact('license'))->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list);
+        $maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
+        return View::make('backend/licenses/edit', compact('license'))
+            ->with('license_options',$license_options)
+            ->with('depreciation_list',$depreciation_list)
+            ->with('supplier_list',$supplier_list)
+            ->with('maintained_list',$maintained_list);
    }


@@ -206,6 +229,7 @@ class LicensesController extends AdminController
            $license->order_number      = e(Input::get('order_number'));
            $license->depreciation_id   = e(Input::get('depreciation_id'));
            $license->purchase_order    = e(Input::get('purchase_order'));
+            $license->maintained        = e(Input::get('maintained'));

            if ( e(Input::get('supplier_id')) == '') {
                $license->supplier_id = NULL;
@@ -226,6 +250,13 @@ class LicensesController extends AdminController
                $license->expiration_date = e(Input::get('expiration_date'));
            }

+            // Update the asset data
+            if ( e(Input::get('termination_date')) == '') {
+                $license->termination_date =  NULL;
+            } else {
+                $license->termination_date = e(Input::get('termination_date'));
+            }
+
            if ( e(Input::get('purchase_cost')) == '') {
                    $license->purchase_cost =  NULL;
            } else {
@@ -233,6 +264,18 @@ class LicensesController extends AdminController
                    //$license->purchase_cost = e(Input::get('purchase_cost'));
            }

+            if ( e(Input::get('maintained')) == '') {
+                $license->maintained = 0;
+            } else {
+                $license->maintained = e(Input::get('maintained'));
+            }
+
+            if ( e(Input::get('purchase_order')) == '') {
+                $license->purchase_order = '';
+            } else {
+                $license->purchase_order = e(Input::get('purchase_order'));
+            }
+

            //Are we changing the total number of seats?
            if( $license->seats != e(Input::get('seats'))) {
@@ -352,13 +395,15 @@ class LicensesController extends AdminController
        }

        // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
+         $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+

        // Left join to get a list of assets and some other helpful info
        $asset = DB::table('assets')
            ->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
-            ->select('assets.id', 'name', 'first_name', 'last_name','asset_tag',
-            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id'))
+            ->leftJoin('models', 'assets.model_id', '=', 'models.id')
+            ->select('assets.id', 'assets.name', 'first_name', 'last_name','asset_tag',
+            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id, models.name as modelname'))
            ->whereNull('assets.deleted_at')
            ->get();

@@ -369,9 +414,9 @@ class LicensesController extends AdminController
            for ($x=0; $x<count($asset_array); $x++) {

                if ($asset_array[$x]['full_name']!='') {
-                    $full_name = ' ('.$asset_array[$x]['full_name'].')';
+                    $full_name = ' ('.$asset_array[$x]['full_name'].') '.$asset_array[$x]['modelname'];
                } else {
-                    $full_name = ' (Unassigned)';
+                    $full_name = ' (Unassigned) '.$asset_array[$x]['modelname'];
                }
                $asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;

@@ -438,7 +483,7 @@ class LicensesController extends AdminController
            // Redirect to the asset management page with error
            return Redirect::to('admin/licenses')->with('error', Lang::get('admin/licenses/message.not_found'));
        }
-    
+
    if ( e(Input::get('asset_id')) == '') {
            $licenseseat->asset_id = NULL;
        } else {
@@ -580,7 +625,7 @@ class LicensesController extends AdminController

          // Show the page
        $license_options = array('0' => 'Top Level') + License::lists('name', 'id');
-
+		$maintained_list = array('' => 'Maintained', '1' => 'Yes', '0' => 'No');
        //clone the orig
        $license = clone $license_to_clone;
        $license->id = null;
@@ -589,7 +634,138 @@ class LicensesController extends AdminController
        // Show the page
        $depreciation_list = array('0' => Lang::get('admin/licenses/form.no_depreciation')) + Depreciation::lists('name', 'id');
        $supplier_list = array('' => 'Select Supplier') + Supplier::orderBy('name', 'asc')->lists('name', 'id');
-        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license);
+        return View::make('backend/licenses/edit')->with('license_options',$license_options)->with('depreciation_list',$depreciation_list)->with('supplier_list',$supplier_list)->with('license',$license)->with('maintained_list',$maintained_list);

    }
+
+
+    /**
+    *  Upload the file to the server
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function postUpload($licenseId = null)
+    {
+        $license = License::find($licenseId);
+
+		// the license is valid
+		$destinationPath = app_path().'/private_uploads';
+
+        if (isset($license->id)) {
+
+        	if (Input::hasFile('licensefile')) {
+
+				foreach(Input::file('licensefile') as $file) {
+
+				$rules = array(
+				   'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt|max:2000'
+				);
+				$validator = Validator::make(array('licensefile'=> $file), $rules);
+
+					if($validator->passes()){
+
+						$extension = $file->getClientOriginalExtension();
+						$filename = 'license-'.$license->id.'-'.str_random(8);
+						$filename .= '-'.Str::slug($file->getClientOriginalName()).'.'.$extension;
+						$upload_success = $file->move($destinationPath, $filename);
+
+						//Log the deletion of seats to the log
+						$logaction = new Actionlog();
+						$logaction->asset_id = $license->id;
+						$logaction->asset_type = 'software';
+						$logaction->user_id = Sentry::getUser()->id;
+						$logaction->note = e(Input::get('notes'));
+						$logaction->checkedout_to =  NULL;
+						$logaction->created_at =  date("Y-m-d h:i:s");
+						$logaction->filename =  $filename;
+						$log = $logaction->logaction('uploaded');
+					} else {
+						 return Redirect::back()->with('error', Lang::get('admin/licenses/message.upload.invalidfiles'));
+					}
+
+
+				}
+
+				if ($upload_success) {
+				  	return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.success'));
+				} else {
+				   return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.error'));
+				}
+
+			} else {
+				 return Redirect::back()->with('success', Lang::get('admin/licenses/message.upload.nofiles'));
+			}
+
+
+
+
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+    /**
+    *  Delete the associated file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getDeleteFile($licenseId = null, $fileId = null)
+    {
+        $license = License::find($licenseId);
+        $destinationPath = app_path().'/private_uploads';
+
+		// the license is valid
+        if (isset($license->id)) {
+
+			$log = Actionlog::find($fileId);
+			$full_filename = $destinationPath.'/'.$log->filename;
+			if (file_exists($full_filename)) {
+				unlink($destinationPath.'/'.$log->filename);
+			}
+			$log->delete();
+			return Redirect::back()->with('success', Lang::get('admin/licenses/message.deletefile.success'));
+
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
+
+
+
+    /**
+    *  Display/download the uploaded file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function displayFile($licenseId = null, $fileId = null)
+    {
+
+        $license = License::find($licenseId);
+
+		// the license is valid
+        if (isset($license->id)) {
+				$log = Actionlog::find($fileId);
+				$file = $log->get_src();
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/licenses/message.does_not_exist', compact('id'));
+
+            // Redirect to the licence management page
+            return Redirect::route('licenses')->with('error', $error);
+        }
+    }
 }
@@ -0,0 +1,458 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use License;
+use Asset;
+use User;
+use View;
+use Location;
+use Redirect;
+use Response;
+
+class ReportsController extends AdminController
+{
+    /**
+     * Show Asset Report
+     *
+     * @return View
+     */
+    public function getAssetsReport()
+    {
+        // Grab all the assets
+        $assets = Asset::with('model','assigneduser.userLoc','assetstatus','defaultLoc','assetlog','supplier','model.manufacturer')->orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/asset', compact('assets'));
+    }
+
+    /**
+     * Export Asset Report as CSV
+     *
+     * @return file download
+     */
+    public function exportAssetReport()
+    {
+        // Grab all the assets
+        $assets = Asset::orderBy('created_at', 'DESC')->get();
+
+        $rows = array();
+
+        // Create the header row
+        $header = array(
+            Lang::get('admin/hardware/table.asset_tag'),
+            Lang::get('admin/hardware/form.manufacturer'),
+            Lang::get('admin/hardware/form.model'),
+            Lang::get('general.model_no'),
+            Lang::get('general.name'),
+            Lang::get('admin/hardware/table.serial'),
+            Lang::get('admin/hardware/table.purchase_date'),
+            Lang::get('admin/hardware/table.purchase_cost'),
+            Lang::get('admin/hardware/form.order'),
+            Lang::get('admin/hardware/form.supplier'),
+            Lang::get('admin/hardware/table.checkoutto'),
+            Lang::get('admin/hardware/table.location'),
+            Lang::get('general.status')
+        );
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row = array();
+            $row[] = $asset->asset_tag;
+            if ($asset->model->manufacturer) {
+                $row[] = $asset->model->manufacturer->name;
+            } else {
+                $row[] = '';
+            }
+            $row[] = '"'.$asset->model->name.'"';
+            $row[] = '"'.$asset->model->modelno.'"';
+            $row[] = $asset->name;
+            $row[] = $asset->serial;
+            $row[] = $asset->purchase_date;
+            $row[] = '"'.number_format($asset->purchase_cost).'"';
+            if ($asset->order_number) {
+                $row[] = $asset->order_number;
+            } else {
+                $row[] = '';
+            }
+            if ($asset->supplier_id) {
+                $row[] = $asset->supplier->name;
+            } else {
+                $row[] = '';
+            }
+
+            if ($asset->assigned_to > 0) {
+                $user = User::find($asset->assigned_to);
+                $row[] = $user->fullName();
+            } else {
+                $row[] = ''; // Empty string if unassigned
+            }
+
+            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
+                $location = Location::find($asset->assigneduser->location_id);
+                if ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } elseif ($asset->rtd_location_id) {
+                $location = Location::find($asset->rtd_location_id);
+                if ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+            if (($asset->status_id == '0') && ($asset->assigned_to == '0')) {
+                $row[] = Lang::get('general.ready_to_deploy');
+            } elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) {
+                $row[] = Lang::get('general.pending');
+            } elseif ($asset->assetstatus) {
+                $row[] = $asset->assetstatus->name;
+            } else {
+                $row[] = '';
+            }
+
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    /**
+     * Show Depreciation Report for Assets
+     *
+     * @return View
+     */
+    public function getDeprecationReport()
+    {
+        // Grab all the assets
+        $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/depreciation', compact('assets'));
+    }
+
+    /**
+     * Export Depreciation Report as CSV
+     *
+     * @return file download
+     */
+    public function exportDeprecationReport()
+    {
+        // @todo - It may be worthwhile creating a separate controller for reporting
+
+        // Grab all the assets
+        $assets = Asset::orderBy('created_at', 'DESC')->get();
+
+        $rows = array();
+
+        // Create the header row
+        $header = array(
+            Lang::get('admin/hardware/table.asset_tag'),
+            Lang::get('admin/hardware/table.title'),
+            Lang::get('admin/hardware/table.serial'),
+            Lang::get('admin/hardware/table.checkoutto'),
+            Lang::get('admin/hardware/table.location'),
+            Lang::get('admin/hardware/table.purchase_date'),
+            Lang::get('admin/hardware/table.purchase_cost'),
+            Lang::get('admin/hardware/table.book_value'),
+            Lang::get('admin/hardware/table.diff')
+        );
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row = array();
+            $row[] = $asset->asset_tag;
+            $row[] = $asset->name;
+            $row[] = $asset->serial;
+
+
+            if ($asset->assigned_to > 0) {
+              $user = User::find($asset->assigned_to);
+              $row[] = $user->fullName();
+              } else {
+                $row[] = ''; // Empty string if unassigned
+            }
+
+            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
+                $location = Location::find($asset->assigneduser->location_id);
+                if ($location->city) {
+                    $row[] = '"'.$location->city . ', ' . $location->state.'"';
+                } elseif ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+            $depreciation = $asset->depreciate();
+
+            $row[] = $asset->purchase_date;
+            $row[] = '"'.number_format($asset->purchase_cost).'"';
+            $row[] = '"'.number_format($depreciation).'"';
+            $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    /**
+     * Show Report for Licenses
+     *
+     * @return View
+     */
+    public function getLicenseReport()
+    {
+        $licenses = License::orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/licenses', compact('licenses'));
+    }
+
+    /**
+     * Export License Report as CSV
+     *
+     * @return file download
+     */
+    public function exportLicenseReport()
+    {
+        $licenses = License::orderBy('created_at', 'DESC')->get();
+        $rows = array();
+        $header = array(
+            Lang::get('admin/licenses/table.title'),
+            Lang::get('admin/licenses/table.serial'),
+            Lang::get('admin/licenses/form.seats'),
+            Lang::get('admin/licenses/form.remaining_seats'),
+            Lang::get('admin/licenses/form.expiration'),
+            Lang::get('admin/licenses/form.date'),
+            Lang::get('admin/licenses/form.cost')
+        );
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ', ');
+
+        // Row per license
+        foreach ($licenses as $license) {
+            $row = array();
+            $row[] = $license->name;
+            $row[] = $license->serial;
+            $row[] = $license->seats;
+            $row[] = $license->remaincount();
+            $row[] = $license->expiration_date;
+            $row[] = $license->purchase_date;
+            $row[] = '"'.number_format($license->purchase_cost).'"';
+
+            $rows[] = implode($row, ',');
+        }
+
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    public function getCustomReport()
+    {
+        return View::make('backend/reports/custom');
+    }
+
+    public function postCustom()
+    {
+        $assets = Asset::orderBy('created_at', 'DESC')->get();
+        $rows = array();
+        $header = array();
+
+        if (e(Input::get('asset_name')) == '1')
+        {
+            $header[] = 'Asset Name';
+        }
+        if (e(Input::get('asset_tag')) == '1')
+        {
+            $header[] = 'Asset Tag';
+        }
+        if (e(Input::get('manufacturer')) == '1')
+        {
+            $header[] = 'Manufacturer';
+        }
+        if (e(Input::get('model')) == '1')
+        {
+            $header[] = 'Model';
+            $header[] = 'Model Number';
+        }
+        if (e(Input::get('serial')) == '1')
+        {
+            $header[] = 'Serial';
+        }
+        if (e(Input::get('purchase_date')) == '1')
+        {
+            $header[] = 'Purchase Date';
+        }
+        if ((e(Input::get('purchase_cost')) == '1') && (e(Input::get('depreciation')) == '0'))
+        {
+            $header[] = 'Purchase Cost';
+        }
+        if (e(Input::get('order')) == '1')
+        {
+            $header[] = 'Order Number';
+        }
+        if (e(Input::get('supplier')) == '1')
+        {
+            $header[] = 'Supplier';
+        }
+        if (e(Input::get('location')) == '1')
+        {
+            $header[] = 'Location';
+        }
+        if (e(Input::get('assigned_to')) == '1')
+        {
+            $header[] = 'Assigned To';
+        }
+        if (e(Input::get('status')) == '1')
+        {
+            $header[] = 'Status';
+        }
+        if (e(Input::get('warranty')) == '1')
+        {
+            $header[] = 'Warranty';
+            $header[] = 'Warranty Expires';
+        }
+        if (e(Input::get('depreciation')) == '1')
+        {
+            $header[] = 'Purchase Cost';
+            $header[] = 'Value';
+            $header[] = 'Diff';
+        }
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        foreach($assets as $asset) {
+            $row = array();
+            if (e(Input::get('asset_name')) == '1') {
+                $row[] = $asset->name;
+            }
+            if (e(Input::get('asset_tag')) == '1') {
+                $row[] = $asset->asset_tag;
+            }
+            if (e(Input::get('manufacturer')) == '1') {
+                if ($asset->model->manufacturer) {
+                    $row[] = $asset->model->manufacturer->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('model')) == '1') {
+                $row[] = '"'.$asset->model->name.'"';
+                $row[] = '"'.$asset->model->modelno.'"';
+            }
+            if (e(Input::get('serial')) == '1') {
+                $row[] = $asset->serial;
+            }
+            if (e(Input::get('purchase_date')) == '1') {
+                $row[] = $asset->purchase_date;
+            }
+            if ((e(Input::get('purchase_cost')) == '1') && (e(Input::get('depreciation')) == '0')) {
+                $row[] = '"'.number_format($asset->purchase_cost).'"';
+            }
+            if (e(Input::get('order')) == '1') {
+                if ($asset->order_number) {
+                    $row[] = $asset->order_number;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('supplier')) == '1') {
+                if ($asset->supplier_id) {
+                    $row[] = $asset->supplier->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('location')) == '1') {
+                if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
+                    $location = Location::find($asset->assigneduser->location_id);
+                    if ($location->name) {
+                        $row[] = $location->name;
+                    } else {
+                        $row[] = '';
+                    }
+                } elseif ($asset->rtd_location_id) {
+                    $location = Location::find($asset->rtd_location_id);
+                    if ($location->name) {
+                        $row[] = $location->name;
+                    } else {
+                        $row[] = '';
+                    }
+                } else {
+                    $row[] = '';  // Empty string if location is not set
+                }
+            }
+            if (e(Input::get('assigned_to')) == '1') {
+                if ($asset->assigned_to > 0) {
+                    $user = User::find($asset->assigned_to);
+                    $row[] = $user->fullName();
+                } else {
+                    $row[] = ''; // Empty string if unassigned
+                }
+            }
+            if (e(Input::get('status')) == '1') {
+                if (($asset->status_id == '0') && ($asset->assigned_to == '0')) {
+                    $row[] = Lang::get('general.ready_to_deploy');
+                } elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) {
+                    $row[] = Lang::get('general.pending');
+                } elseif ($asset->assetstatus) {
+                    $row[] = $asset->assetstatus->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('warranty')) == '1') {
+                if ($asset->warranty_months) {
+                    $row[] = $asset->warranty_months;
+                    $row[] = $asset->warrantee_expires();
+                } else {
+                    $row[] = '';
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('depreciation')) == '1') {
+                $depreciation = $asset->depreciate();
+                $row[] = '"'.number_format($asset->purchase_cost).'"';
+                $row[] = '"'.number_format($depreciation).'"';
+                $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
+            }
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        if (array_filter($rows)) {
+            $csv = implode($rows, "\n");
+            $response = Response::make($csv, 200);
+            $response->header('Content-Type', 'text/csv');
+            $response->header('Content-disposition', 'attachment;filename=report.csv');
+            return $response;
+        } else {
+            return Redirect::to("reports/custom")->with('error', Lang::get('admin/reports/message.error'));
+        }
+    }
+}
@@ -87,6 +87,8 @@ class SettingsController extends AdminController
            $setting->qr_code = e(Input::get('qr_code', '0'));
            $setting->display_eol = e(Input::get('display_eol', '0'));
            $setting->qr_text = e(Input::get('qr_text'));
+            $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
+            $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));

            // Was the asset updated?
            if($setting->save()) {
@@ -1,6 +1,7 @@
 <?php namespace Controllers\Admin;

 use AdminController;
+use Image;
 use Input;
 use Lang;
 use Supplier;
@@ -57,20 +58,31 @@ class SuppliersController extends AdminController
        if ($supplier->validate($new)) {

            // Save the location data
-            $supplier->name            		= e(Input::get('name'));
-            $supplier->address          	= e(Input::get('address'));
-            $supplier->address2          	= e(Input::get('address2'));
-            $supplier->city          		= e(Input::get('city'));
-            $supplier->state          		= e(Input::get('state'));
-            $supplier->country          	= e(Input::get('country'));
-            $supplier->zip          		= e(Input::get('zip'));
-            $supplier->contact          	= e(Input::get('contact'));
-            $supplier->phone          		= e(Input::get('phone'));
-            $supplier->fax         	 		= e(Input::get('fax'));
-            $supplier->email          		= e(Input::get('email'));
-            $supplier->notes          		= e(Input::get('notes'));
-            $supplier->url          		= $supplier->addhttp(e(Input::get('url')));
-            $supplier->user_id          	= Sentry::getId();
+            $supplier->name                 = e(Input::get('name'));
+            $supplier->address              = e(Input::get('address'));
+            $supplier->address2             = e(Input::get('address2'));
+            $supplier->city                 = e(Input::get('city'));
+            $supplier->state                = e(Input::get('state'));
+            $supplier->country              = e(Input::get('country'));
+            $supplier->zip                  = e(Input::get('zip'));
+            $supplier->contact              = e(Input::get('contact'));
+            $supplier->phone                = e(Input::get('phone'));
+            $supplier->fax                  = e(Input::get('fax'));
+            $supplier->email                = e(Input::get('email'));
+            $supplier->notes                = e(Input::get('notes'));
+            $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
+            $supplier->user_id              = Sentry::getId();
+
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/suppliers/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $supplier->image = $file_name;
+            }

            // Was it created?
            if($supplier->save()) {
@@ -134,20 +146,34 @@ class SuppliersController extends AdminController
        else {

            // Save the  data
-            $supplier->name            		= e(Input::get('name'));
-            $supplier->address          	= e(Input::get('address'));
-            $supplier->address2          	= e(Input::get('address2'));
-            $supplier->city          		= e(Input::get('city'));
-            $supplier->state          		= e(Input::get('state'));
-            $supplier->country          	= e(Input::get('country'));
-            $supplier->zip          		= e(Input::get('zip'));
-            $supplier->contact          	= e(Input::get('contact'));
-            $supplier->phone          		= e(Input::get('phone'));
-            $supplier->fax          		= e(Input::get('fax'));
-            $supplier->email          		= e(Input::get('email'));
-            $supplier->url          		= $supplier->addhttp(e(Input::get('url')));
-            $supplier->notes          		= e(Input::get('notes'));
+            $supplier->name                 = e(Input::get('name'));
+            $supplier->address              = e(Input::get('address'));
+            $supplier->address2             = e(Input::get('address2'));
+            $supplier->city                 = e(Input::get('city'));
+            $supplier->state                = e(Input::get('state'));
+            $supplier->country              = e(Input::get('country'));
+            $supplier->zip                  = e(Input::get('zip'));
+            $supplier->contact              = e(Input::get('contact'));
+            $supplier->phone                = e(Input::get('phone'));
+            $supplier->fax                  = e(Input::get('fax'));
+            $supplier->email                = e(Input::get('email'));
+            $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
+            $supplier->notes                = e(Input::get('notes'));

+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/suppliers/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $supplier->image = $file_name;
+            }
+
+            if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+                $supplier->image = NULL;
+            }

            // Was it created?
            if($supplier->save()) {
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddImageToSupplier extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{	
+		Schema::table('suppliers', function(Blueprint $table) {		
+			
+			$table->string('image')->nullable();
+
+		});
+
+	}
+
+	/**
+	 * Revert the changes to the table.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('suppliers', function(Blueprint $table) {
+
+			$table->dropColumn('image');
+
+		});
+	}
+
+}
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUsernameToUser extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('users', function(Blueprint $table) {
+
+			$table->string('username')->nullable()->default(NULL);
+
+		});
+
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('users', function(Blueprint $table) {
+
+			$table->dropColumn('username');
+
+		});
+	}
+
+}
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAutoToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->integer('auto_increment_assets')->default(0);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->dropColumn('auto_increment_assets');
+
+		});
+	}
+
+}
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPrefixToSettings extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->string('auto_increment_prefix')->default(0);
+
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		Schema::table('settings', function(Blueprint $table) {
+
+			$table->dropColumn('auto_increment_prefix');
+
+		});
+	}
+
+}
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeLicenceType extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		$prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN serial TEXT');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		 $prefix = DB::getTablePrefix();
+		 DB::statement('ALTER TABLE '.$prefix.'licenses MODIFY COLUMN serial VARCHAR(255)');
+	}
+
+}
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddFieldsMaintainedTermToLicenses extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('licenses', function ($table) {
+			$table->date('termination_date')->nullable();
+			$table->boolean('maintained');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('licenses', function ($table) {
+			$table->dropColumn('termination_date');
+			$table->dropColumn('maintained');
+		});
+	}
+
+}
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IncreaseUserFieldLengths extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(100) null');
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'users MODIFY column jobtitle varchar(50) null');
+	}
+
+}
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSoftDeletedToLog extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column asset_type varchar(100) null');
+		DB::statement('ALTER TABLE ' . DB::getTablePrefix() . 'asset_logs MODIFY column added_on timestamp default "0000-00-00 00:00:00"');
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('added_on', 'created_at');
+			$table->timestamp('updated_at');
+            $table->softDeletes();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('asset_logs', function ($table) {
+			$table->renameColumn('created_at', 'added_on');
+			$table->dropColumn('updated_at');
+			$table->dropSoftDeletes();
+		});
+	}
+
+}
@@ -17,7 +17,7 @@ class ActionlogSeeder extends Seeder
            'asset_id' 			=> '1',
            'checkedout_to' 	=> '2',
            'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
            'asset_type' 		=> 'hardware',
            'note'				=> NULL,
            'filename'			=> NULL,
@@ -30,7 +30,7 @@ class ActionlogSeeder extends Seeder
            'asset_id' 			=> '1',
            'checkedout_to' 	=> '2',
            'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
            'asset_type' 		=> 'hardware',
            'note'				=> NULL,
            'filename'			=> NULL,
@@ -43,7 +43,7 @@ class ActionlogSeeder extends Seeder
            'asset_id' 			=> '1',
            'checkedout_to' 	=> '1',
            'location_id'  		=> '3',
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
            'asset_type' 		=> 'software',
            'note'				=> NULL,
            'filename'			=> NULL,
@@ -56,7 +56,7 @@ class ActionlogSeeder extends Seeder
            'asset_id' 			=> '1',
            'checkedout_to' 	=> '2',
            'location_id'  		=> NULL,
-            'added_on' 			=> $date->modify('-10 day'),
+            'created_at' 			=> $date->modify('-10 day'),
            'asset_type' 		=> 'software',
            'note'				=> NULL,
            'filename'			=> NULL,
@@ -16,6 +16,8 @@ class LicensesSeeder extends Seeder
            'serial'      		=> 'ZOMG-WtF-BBQ-SRSLY',
            'purchase_date' 	=> '2013-10-02',
            'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 		=> '0',
            'order_number'  	=> '987698576946',
            'created_at' 		=> $date->modify('-10 day'),
            'updated_at' 		=> $date->modify('-3 day'),
@@ -35,6 +37,8 @@ class LicensesSeeder extends Seeder
            'serial'      		=> '98049890394-340485934',
            'purchase_date' 	=> '2013-10-02',
            'purchase_cost' 	=> '2435.99',
+            'purchase_order' 	=> '1',
+            'maintained' 	=> '1',
            'order_number'  	=> '987698576946',
            'created_at' 		=> $date->modify('-10 day'),
            'updated_at' 		=> $date->modify('-3 day'),
@@ -85,7 +85,7 @@ Route::filter('admin-auth', function () {
    // Check if the user has access to the admin pages
    if ( ! Sentry::getUser()->hasAccess('admin')) {
        // Show the insufficient permissions page
-        return Redirect::route('profile');
+        return Redirect::route('view-assets');
    }
 });

@@ -2,10 +2,10 @@

 return array(
    'about_asset_depreciations'  			=> 'عن استهلاك الأصول',
-    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'about_depreciations'  					=> 'يمكنك ضبط قيمة إستهلاك الأصول لخفض الأصول على أساس القسط الثابت للاستهلاك.',
    'asset_depreciations'  					=> 'استهلاك الأصول',
-    'create_depreciation'  					=> 'Create Depreciation',
-    'depreciation_name'  					=> 'Depreciation Name',
+    'create_depreciation'  					=> 'إنشاء الاستهلاك',
+    'depreciation_name'  					=> 'اسم الاستهلاك',
    'number_of_months'  					=> 'عدد الأشهر',
    'update_depreciation'  					=> 'تحديث الاستهلاك',

@@ -2,8 +2,7 @@

 return array(

-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
+    '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.',
    '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. ',

@@ -2,23 +2,26 @@

 return array(

-    'asset'				=> 'Asset',
-    'checkin'			=> 'Checkin',
-    'checkin'			=> 'Checkin',
-    'cost'				=> 'Purchase Cost',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create License',
-    'date'				=> 'Purchase Date',
-    'date'				=> 'Purchase Date',
-    'depreciation'		=> 'Depreciation',
-    'name'				=> 'Software Name',
-    'no_depreciation'	=> 'Do Not Depreciate',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order No.',
-    'seats'				=> 'Seats',
-    'serial'			=> 'Serial',
-    '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.'
+    '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',
+    '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.'
 );
@@ -14,6 +14,18 @@ return array(
        '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',
+        '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.'
@@ -2,23 +2,23 @@

 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. ',
+    'does_not_exist' => 'لا وجود للشركة المصنعة.',
+    'assoc_users'	 => 'هذا المُصَنِّع مرتبط حاليا مع نموذج واحد على الأقل وبالتالي لا يمكن حذفه . يرجى تحديث النماذج الخاصة بك بحيث لا تكون مرجع لهذا المُصَنِّع وحاول مرة أخرى.',

    'create' => array(
-        'error'   => 'Manufacturer was not created, please try again.',
-        'success' => 'Manufacturer created successfully.'
+        'error'   => 'هذا المُصَنِّع لم يتم إنشائه ، يرجى المحاولة مرة أخرى .',
+        'success' => 'تم إنشاء المُصَنِّع بنجاح .'
    ),

    'update' => array(
-        'error'   => 'Manufacturer was not updated, please try again',
-        'success' => 'Manufacturer updated successfully.'
+        'error'   => 'لم يتم تحديث المُصَنِّع ، يرجى المحاولة مرة أخرى',
+        'success' => 'تم تحديث المُصَنِّع بنجاح .'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
-        'error'   => 'There was an issue deleting the blog post. Please try again.',
-        'success' => 'The Manufacturer was deleted successfully.'
+        'confirm'   => 'هل أنت متأكد من أنك ترغب في حذف هذا المُصَنِّع ؟',
+        'error'   => 'هناك مشكلة في حذف هذا المُصَنِّع . يرجى المحاولة مرة أخرى .',
+        'success' => 'تم حذف المُصَنِّع بنجاح .'
    )

 );
@@ -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.'
+);
@@ -1,6 +1,9 @@
 <?php

 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
@@ -1,24 +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',
-    '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',
+    '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',

 );
@@ -3,6 +3,12 @@

 return array(

-    'edit'  			=> 'Edit User',
+    'assets_user'  		=> 'Assets assigned to :name',
    'clone'  			=> 'Clone User',
+    'contact_user'  	=> 'Contact :name',
+    'edit'  			=> 'Edit User',
+    'history_user'  	=> 'History for :name',
+    'last_login'  		=> 'Last Login',
+    'software_user'  	=> 'Software Checked out to :name',
+    'view_user'  		=> 'View User :name',
    );
@@ -2,11 +2,13 @@

 return array(

-    '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_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.',
+

    'success' => array(
        'create'    => 'User was successfully created.',
@@ -25,6 +25,8 @@ return array(
    'phone'  				=> 'Phone',
    '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',
 );
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'تعديل',
-    'delete'  => 'حذف',
-    'restore' => 'إستعادة',
-    'actions' => 'الإجراءات',
-    'submit'  => 'إرسال',
+    'actions' 	=> 'الإجراءات',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'حذف',
+    'edit'    	=> 'تعديل',
+    'restore' 	=> 'إستعادة',
+    'submit'  	=> 'إرسال',
+    'upload'    => 'Upload',

 );
@@ -2,12 +2,14 @@

 return array(

+
    'address'				=> 'العنوان',
    'admin'					=> 'الإدارة',
    'all_assets'			=> 'كل الأصول',
    'all'       			=> 'الكل',
    'asset_models'			=> 'نماذج الأصول',
    'asset'					=> 'الأصول',
+    'asset_report'          => 'Asset Report',
    'asset_tag'				=> 'وسم الأصول',
    'assets_available'		=> 'الأصول المتاحة',
    'assets'				=> 'الأصول',
@@ -28,6 +30,7 @@ return array(
    'created_at' 			=> 'أنشئت في',
    'currency'  			=> '$',
    'current'  				=> 'الحالي',
+    'custom_report'         => 'Custom Asset Report',
    'date'					=> 'التاريخ',
    'delete'  				=> 'حذف',
    'deleted'  				=> 'تم حذفها',
@@ -37,6 +40,9 @@ return array(
    'editprofile'  			=> 'تعديل الملف الشخصي',
    'eol'					=> 'الحياة',
    'first_name'			=> 'الإسم الأول',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Generate',
    'groups'				=> 'المجموعات',
    'gravatar_email'        => 'البريد الإلكتروني لخدمة Gravatar',
    'history_for'  			=> 'السجل لـ',
@@ -45,6 +51,7 @@ return array(
    'image_upload'         => 'رفع صورة',
    'last_name'				=> 'الإسم الأخير',
    'license'				=> 'الرخص',
+    'license_report'        => 'License Report',
    'licenses_available'	=> 'الرخص المتاحة',
    'licenses'				=> 'الرخص',
    'list_all'				=> 'عرض الكل',
@@ -71,7 +78,7 @@ return array(
    'settings'				=> 'الإعدادات',
    'sign_in'				=> 'تسجيل الدخول',
    'site_name'				=> 'إسم الموقع',
-    'state'  				=> 'State',
+    'state'  				=> 'المنطقة / الولاية',
    'status_labels'			=> 'بطاقات الحالة',
    'status'    			=> 'الحالة',
    'suppliers'  			=> 'الموردون',
@@ -2,6 +2,8 @@

 return array(

-    'actions' => 'الإجراءات'
+    'actions'	 	=> 'الإجراءات',
+    'action' 		=> 'Action',
+    'by'      		=> 'By',

 );
@@ -1,11 +1,11 @@
 <?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'  					=> 'Category Name',
-    'create'  							=> 'Create Category',
-    'update'  							=> 'Update Category',
+    'about_asset_categories' 			=> 'O kategoriích majetku',
+    'about_categories'  				=> 'Kategorie pomáhají organizovat majetek. Takovou kategorii může být např. &quot;Desktopy&quot;, &quot;Notebooky&quot;, &quot;Mobilní telefony&quot;, &quot;Tablety&quot;, apod., kategorie můžete ale používat jakkoliv Vám to bude dávat smysl. ',
+    'asset_categories' 					=> 'Kategorie majetku',
+    'category_name'  					=> 'Jméno kategorie',
+    'create'  							=> 'Vytvořit kategorii',
+    'update'  							=> 'Upravit kategorii',

 );
@@ -2,7 +2,7 @@

 return array(

-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'Kategorie neexistuje.',
    '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(
@@ -3,7 +3,7 @@
 return array(

    'id'      => 'ID',
-    'parent'   => 'Parent',
-    'title'      => 'Asset Category Name',
+    'parent'   => 'Nadřazená složka',
+    'title'      => 'Jméno kategorie majetku',

 );
@@ -1,12 +1,12 @@
 <?php

 return array(
-    'about_asset_depreciations'  			=> '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',
+    'about_asset_depreciations'  			=> 'O amortizaci majetku',
+    'about_depreciations'  					=> 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.',
+    'asset_depreciations'  					=> 'Amortizace majetku',
+    'create_depreciation'  					=> 'Vytvořit amortizaci',
+    'depreciation_name'  					=> 'Jméno amortizace',
+    'number_of_months'  					=> 'Počet měsíců',
+    'update_depreciation'  					=> 'Upravit amortizaci',

 );
@@ -2,7 +2,7 @@

 return array(

-    'does_not_exist' => 'Depreciation class does not exist.',
+    'does_not_exist' => 'Amortizační skupina neexistuje.',
    '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. ',


@@ -3,8 +3,8 @@
 return array(

    'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
-    'title'      => 'Name ',
+    'months'   => 'Měsíců',
+    'term'   => 'Podmínka',
+    'title'      => 'Název ',

 );
@@ -2,18 +2,18 @@

 return array(

-    'group_exists'        => 'Group already exists!',
-    'group_not_found'     => 'Group [:id] does not exist.',
-    'group_name_required' => 'The name field is required',
+    'group_exists'        => 'Skupina již existuje!',
+    'group_not_found'     => 'Skupina [:id] neexistuje.',
+    'group_name_required' => 'Název je vyžadován',

    'success' => array(
-        'create' => 'Group was successfully created.',
-        'update' => 'Group was successfully updated.',
-        'delete' => 'Group was successfully deleted.',
+        'create' => 'Skupina byla úspěšně vytvořena.',
+        'update' => 'Skupina byla úspěšně upravena.',
+        'delete' => 'Skupina byla úspěšně odstraněna.',
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this group?',
+        'confirm'   => 'Určitě chcete odstranit tuto skupinu?',
        '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.',
@@ -2,8 +2,8 @@

 return array(

-    'id'         => 'Id',
-    'name'       => 'Name',
-    'users'      => '# of Users',
+    'id'         => 'ID',
+    'name'       => 'Název',
+    'users'      => '# z uživatelů',

 );
@@ -2,12 +2,12 @@

 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',
+    'group_management' 	 	=> 'Správa skupin',
+    'create_group' 	 		=> 'Vytvořit novou skupinu',
+    'edit_group' 	 		=> 'Upravit skupinu',
+    'group_name' 	 		=> 'Název skupiny',
+    'group_admin' 	 		=> 'Správce skupiny',
+    'allow' 	 			=> 'Povolit',
+    'deny' 	 				=> 'Zakázat',

 );
@@ -2,33 +2,33 @@

 return array(

-    'checkedout_to'		=> 'Checked Out To',
-    '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',
-    'expires'			=> 'Expires',
-    'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
-    'manufacturer'		=> 'Manufacturer',
+    'checkedout_to'		=> 'Vydané komu',
+    'checkout_to'		=> 'Vydat někomu',
+    'cost'				=> 'Pořizovací cena',
+    'create'			=> 'Vytvořit záznam majetku',
+    'date'				=> 'Datum pořízení',
+    'depreciates_on'	=> 'Odepisuje se',
+    'depreciation'		=> 'Amortizace',
+    'default_location'	=> 'Výchozí umístění',
+    'eol_date'			=> 'Konec životnosti',
+    'eol_rate'			=> 'Míra ukončení životnosti',
+    'expires'			=> 'Expiruje',
+    'fully_depreciated'	=> 'Plně odepsané',
+    'help_checkout'		=> 'Pokud si přejete přiřadit majetek okamžitě, měli by jste ze seznamu stavů zvolit "Připraveno k přiděleni", nebo se může něco pokazit. ',
+    'manufacturer'		=> 'Výrobce',
    'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
-    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'months'			=> 'měsíce',
+    'name'				=> 'Název majetku',
+    'notes'				=> 'Poznámky',
+    'order'				=> 'Č. objednávky',
+    'qr'				=> 'QR kód',
+    'requestable'		=> 'Uživatelé můžou požádat o tento majetek',
+    'serial'			=> 'Sériové číslo',
+    'status'			=> 'Stav',
+    'supplier'			=> 'Dodavatel',
+    'tag'				=> 'Označení majetku',
+    'update'			=> 'Úprava majetku',
+    'warranty'			=> 'Záruka',
+    'years'				=> 'roky',
 )
 ;
@@ -1,11 +1,11 @@
 <?php

 return array(
-    'asset'  					=> 'Asset',
-    'checkin'  					=> 'Checkin Asset',
-    'checkout'  				=> 'Checkout Asset to User',
-    'clone'  					=> 'Clone Asset',
-    'edit'  					=> 'Edit Asset',
-    'pending'  					=> 'Pending Asset',
-    'view'  					=> 'View Asset',
+    'asset'  					=> 'Majetek',
+    'checkin'  					=> 'Převzít majetek',
+    'checkout'  				=> 'Předat majetek uživateli',
+    'clone'  					=> 'Klonovat majetek',
+    'edit'  					=> 'Upravit majetek',
+    'pending'  					=> 'Nevyřízený majetek',
+    'view'  					=> 'Zobrazit majetek',
 );
@@ -2,8 +2,7 @@

 return array(

-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
+    '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.',
    '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. ',

@@ -2,21 +2,21 @@

 return array(

-    'asset_tag'   	=> 'Asset Tag',
+    'asset_tag'   	=> 'Označení majetku',
    'asset_model'       => 'Model',
-    'book_value'  	=> 'Value',
-    'change' 		=> 'In/Out',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checked Out',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Download CSV',
-    'eol' 			=> 'EOL',
+    'book_value'  	=> 'Hodnota',
+    'change' 		=> 'Příjem/Výdej',
+    'checkout_date' => 'Datum vydání',
+    'checkoutto' 	=> 'Vydané',
+    'diff' 			=> 'Rozdíl',
+    'dl_csv' 		=> 'Stáhnout CSV',
+    'eol' 			=> 'Konec životnosti',
    'id'      		=> 'ID',
-    'location' 		=> 'Location',
-    'purchase_cost'	=> 'Cost',
-    'purchase_date'	=> 'Purchased',
-    'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
-    'title'      	=> 'Asset ',
+    'location' 		=> 'Umístění',
+    'purchase_cost'	=> 'Cena',
+    'purchase_date'	=> 'Zakoupeno',
+    'serial'   		=> 'Sériové číslo',
+    'status'   		=> 'Stav',
+    'title'      	=> 'Majetek ',

 );
@@ -2,23 +2,26 @@

 return array(

-    'asset'				=> 'Asset',
-    'checkin'			=> 'Checkin',
-    'checkin'			=> 'Checkin',
-    'cost'				=> 'Purchase Cost',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create License',
-    'date'				=> 'Purchase Date',
-    'date'				=> 'Purchase Date',
-    'depreciation'		=> 'Depreciation',
-    'name'				=> 'Software Name',
-    'no_depreciation'	=> 'Do Not Depreciate',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order No.',
-    'seats'				=> 'Seats',
-    'serial'			=> 'Serial',
-    '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.'
+    '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',
+    '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.'
 );
@@ -14,6 +14,18 @@ return array(
        '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',
+        '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.'
@@ -3,13 +3,13 @@
 return array(

    'id'      		=> 'ID',
-    'city'   		=> 'City',
-    'state'   		=> 'State',
-    'country'   	=> 'Country',
-    'create'		=> 'Create Location',
-    'update'		=> 'Update Location',
-    'name'			=> 'Location Name',
-    'address'		=> 'Address',
-    'zip'			=> 'Postal Code',
-    'locations'		=> 'Locations',
+    'city'   		=> 'Město',
+    'state'   		=> 'Stát',
+    'country'   	=> 'Země',
+    'create'		=> 'Vytvořit umístění',
+    'update'		=> 'Upravit umístění',
+    'name'			=> 'Název umístění',
+    'address'		=> 'Adresa',
+    'zip'			=> 'PSČ',
+    'locations'		=> 'Umístění',
 );
@@ -17,7 +17,7 @@ return array(

    'delete' => array(
        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
-        'error'   => 'There was an issue deleting the blog post. Please try again.',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
        'success' => 'The Manufacturer was deleted successfully.'
    )

@@ -2,10 +2,10 @@

 return array(

-    'asset_manufacturers'	=> 'Asset Manufacturers',
-    'create'				=> 'Create Manufacturer',
+    'asset_manufacturers'	=> 'Výrobci',
+    'create'				=> 'Vytvořit výrobce',
    'id'   					=> 'ID',
-    'name'      			=> 'Manufacturer Name',
-    'update'				=> 'Update Manufacturer',
+    'name'      			=> 'Název Výrobce',
+    'update'				=> 'Upravit Výrobce',

 );
@@ -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.'
+);
@@ -1,6 +1,9 @@
 <?php

 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
@@ -1,10 +1,10 @@
 <?php

 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
-    'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'name'      	=> 'Název stavu',
+    'title'      	=> 'Označení stavu',
+    'update'      	=> 'Upravit označení stavu',
+    'create'      	=> 'Vytvořit označení stavu',
+    'about'      	=> 'O označení stavu',
+    'info'      	=> 'Označení stavu se používá k popisu různých důvodů proč majetek <strong><em>nemůže</em></strong> být přidělen. Může být pokažený, pryč na opravě, na diagnostice, ztracený nebo ukradený, apod. Označení stavu umožňuje členům týmu zobrazovat postup.',
 );
@@ -1,24 +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',
-    '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',
+    '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',

 );
@@ -3,6 +3,12 @@

 return array(

-    'edit'  			=> 'Edit User',
+    'assets_user'  		=> 'Assets assigned to :name',
    'clone'  			=> 'Clone User',
+    'contact_user'  	=> 'Contact :name',
+    'edit'  			=> 'Edit User',
+    'history_user'  	=> 'History for :name',
+    'last_login'  		=> 'Last Login',
+    'software_user'  	=> 'Software Checked out to :name',
+    'view_user'  		=> 'View User :name',
    );
@@ -2,11 +2,13 @@

 return array(

-    '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_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.',
+

    'success' => array(
        'create'    => 'User was successfully created.',
@@ -25,6 +25,8 @@ return array(
    'phone'  				=> 'Phone',
    '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',
 );
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Akce',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Smazat',
+    'edit'    	=> 'Upravit',
+    'restore' 	=> 'Obnovit',
+    'submit'  	=> 'Odeslat',
+    'upload'    => 'Upload',

 );
@@ -2,89 +2,96 @@

 return array(

-    'address'				=> 'Address',
+
+    'address'				=> 'Adresa',
    'admin'					=> 'Admin',
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
-    'asset_models'			=> 'Asset Models',
-    'asset'					=> 'Asset',
-    'asset_tag'				=> 'Asset Tag',
-    'assets_available'		=> 'assets available',
-    'assets'				=> 'Assets',
-    'avatar_delete'         => 'Delete Avatar',
-    'avatar_upload'         => 'Upload Avatar',
-    'back'      			=> 'Back',
-    'cancel'  				=> 'Cancel',
-    'categories'			=> 'Asset Categories',
-    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
-    'checkin'  				=> 'Checkin',
-    'checkout'  			=> 'Checkout',
-    'city'  				=> 'City',
-    'country'  				=> 'Country',
-    'create'				=> 'Create New',
-    'created_asset'			=> 'created asset',
-    'created_at' 			=> 'Created at',
-    'currency'  			=> '$',
-    'current'  				=> 'Current',
-    'date'					=> 'Date',
-    'delete'  				=> 'Delete',
-    'deleted'  				=> 'Deleted',
-    'deployed'				=> 'Deployed',
-    'depreciation_report'	=> 'Depreciation Report',
-    'depreciation'			=> 'Depreciation',
-    'editprofile'  			=> 'Edit Your Profile',
-    'eol'					=> 'EOL',
-    'first_name'			=> 'First Name',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
-    'history_for'  			=> 'History for',
+    'all_assets'			=> 'Všechna zařízení',
+    'all'       			=> 'Vše',
+    'asset_models'			=> 'Modely majetku',
+    'asset'					=> 'Zařízeni',
+    'asset_report'          => 'Report majetku',
+    'asset_tag'				=> 'Označení majetku',
+    'assets_available'		=> 'dostupných zařízení',
+    'assets'				=> 'Zařízení',
+    'avatar_delete'         => 'Smazat avatara',
+    'avatar_upload'         => 'Nahrát avatara',
+    'back'      			=> 'Zpět',
+    'cancel'  				=> 'Storno',
+    'categories'			=> 'Kategorie majetku',
+    'category'				=> 'Kategorie majetku',
+    'changeemail'  			=> 'Změnit e-mailovou adresu',
+    'changepassword'  		=> 'Změnit heslo',
+    'checkin'  				=> 'Příjem',
+    'checkout'  			=> 'Výdej',
+    'city'  				=> 'Město',
+    'country'  				=> 'Země',
+    'create'				=> 'Vytvořit nové',
+    'created_asset'			=> 'vytvořit majetek',
+    'created_at' 			=> 'Vytvořeno',
+    'currency'  			=> 'Kč',
+    'current'  				=> 'Aktuální',
+    'custom_report'         => 'Vlastní report majetku',
+    'date'					=> 'Datum',
+    'delete'  				=> 'Odstranit',
+    'deleted'  				=> 'Odstraněno',
+    'deployed'				=> 'Vydané',
+    'depreciation_report'	=> 'Report zastarání',
+    'depreciation'			=> 'Amortizace',
+    'editprofile'  			=> 'Upravit profil',
+    'eol'					=> 'Konec životnosti',
+    'first_name'			=> 'Jméno',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Vytvořit',
+    'groups'				=> 'Skupiny',
+    'gravatar_email'        => 'Emailová adresa Gravatar',
+    'history_for'  			=> 'Historie uživatele',
    'id'  					=> 'ID',
-    'image_delete'         => 'Delete Image',
-    'image_upload'         => 'Upload Image',
-    'last_name'				=> 'Last Name',
-    'license'				=> 'License',
-    'licenses_available'	=> 'licenses available',
-    'licenses'				=> 'Licenses',
-    'list_all'				=> 'List All',
-    'location'              => 'Location',
-    'locations'				=> 'Locations',
-    'logout'				=> 'Logout',
-    'manufacturer'			=> 'Manufacturer',
-    'manufacturers'			=> 'Manufacturers',
-    'model_no'				=> 'Model No.',
-    'months'				=> 'months',
-    'moreinfo'				=> 'More Info',
-    'name'					=> 'Name',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
-    'no'  					=> 'No',
-    'notes'  				=> 'Notes',
-    'pending'				=> 'Pending',
-    'people'				=> 'People',
-    'per_page'				=> 'Results Per Page',
-    'profile'				=> 'Your profile',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'reports'				=> 'Reports',
-    'save'  				=> 'Save',
-    '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',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'user'					=> 'User',
-    'viewassets'  			=> 'View Assigned Assets',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'image_delete'         => 'Smazat obrázek',
+    'image_upload'         => 'Nahrát obrázek',
+    'last_name'				=> 'Příjmení',
+    'license'				=> 'Licence',
+    'license_report'        => 'Report licencí',
+    'licenses_available'	=> 'dostupných licencí',
+    'licenses'				=> 'Licence',
+    'list_all'				=> 'Vypsat vše',
+    'location'              => 'Lokalita',
+    'locations'				=> 'Umístění',
+    'logout'				=> 'Odhlásit',
+    'manufacturer'			=> 'Výrobce',
+    'manufacturers'			=> 'Výrobci',
+    'model_no'				=> 'Modelové č.',
+    'months'				=> 'měsíce',
+    'moreinfo'				=> 'Další informace',
+    'name'					=> 'Název',
+    'no_depreciation'		=> 'Žádná amortizace',
+    'no_results'			=> 'Žádné výsledky.',
+    'no'  					=> 'Ne',
+    'notes'  				=> 'Poznámky',
+    'pending'				=> 'Čeká na vyřízení',
+    'people'				=> 'Lidé',
+    'per_page'				=> 'Výsledků na stránku',
+    'profile'				=> 'Váš profil',
+    'ready_to_deploy'		=> 'Připraveno k přidělení',
+    'reports'				=> 'Reporty',
+    'save'  				=> 'Uložit',
+    'settings'				=> 'Nastavení',
+    'sign_in'				=> 'Přihlásit se',
+    'site_name'				=> 'Název lokality',
+    'state'  				=> 'Stát',
+    'status_labels'			=> 'Označení stavu',
+    'status'    			=> 'Stav',
+    'suppliers'  			=> 'Dodavatelé',
+    'total_assets'			=> 'celkem zařízení',
+    'total_licenses'		=> 'celkem licencí',
+    'undeployable'			=> 'Ne-přiřaditelné',
+    'unknown_admin'			=> 'Neznámy správce',
+    'user'					=> 'Uživatel',
+    'viewassets'  			=> 'Zobrazit přiřazený majetek',
+    'website'               => 'Webová stránka',
+    'welcome'				=> 'Vítej, :name',
+    'years'					=> 'roky',
+    'yes' 					=> 'Ano',
+    'zip'  					=> 'PSČ',

 );
@@ -13,8 +13,8 @@ return array(
    |
    */

-    'previous' => '&laquo; Previous',
+    'previous' => '&laquo; Předchozí',

-    'next'     => 'Next &raquo;',
+    'next'     => 'Další &raquo;',

 );
@@ -2,6 +2,8 @@

 return array(

-    'actions' => 'Actions'
+    'actions'	 	=> 'Akce',
+    'action' 		=> 'Akce',
+    'by'      		=> 'Vytvořil',

 );
@@ -13,20 +13,20 @@ return array(
    |
    */

-    "accepted"         => "The :attribute must be accepted.",
-    "active_url"       => "The :attribute is not a valid URL.",
-    "after"            => "The :attribute must be a date after :date.",
-    "alpha"            => "The :attribute may only contain letters.",
-    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num"        => "The :attribute may only contain letters and numbers.",
-    "before"           => "The :attribute must be a date before :date.",
+    "accepted"         => "Je potřeba potvrdit :attribute.",
+    "active_url"       => ":attribute není platnou URL.",
+    "after"            => ":attribute nemůže být dříve než :date.",
+    "alpha"            => ":attribute může obsahovat pouze písmena.",
+    "alpha_dash"       => ":attribute může obsahovat pouze písmena, čísla, a pomlčky.",
+    "alpha_num"        => ":attribute může obsahovat pouze písmena čísla.",
+    "before"           => ":attribute nemůže být později než :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.",
+        "numeric" => ":attribute musí být mezi :min - :max.",
+        "file"    => ":attribute musí být mezi :min - :max kilobajtů.",
+        "string"  => ":attribute smí obsahovat pouze :min - :max znaků.",
    ),
-    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
+    "confirmed"        => "Potvrzení :attribute se neshoduje.",
+    "date"             => ":attribute není platným datem.",
    "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.",
@@ -4,8 +4,8 @@ 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'  					=> 'Category Name',
-    'create'  							=> 'Create Category',
-    'update'  							=> 'Update Category',
+    'category_name'  					=> 'Kategorinavn',
+    'create'  							=> 'Opret kategori',
+    'update'  							=> 'Opdater kategori',

 );
@@ -2,23 +2,23 @@

 return array(

-    'does_not_exist' => 'Category 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. ',
+    'does_not_exist' => 'Kategorien eksisterer ikke.',
+    'assoc_users'	 => 'Denne kategori er i øjeblikket associeret med mindst en model og kan ikke slettes. Opdater venligst dine modeller, så de ikke længere refererer til denne kategori og prøv igen. ',

    'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'Kategorien blev ikke oprettet, prøv igen.',
+        'success' => 'Kategorien blev oprettet.'
    ),

    'update' => array(
-        'error'   => 'Category was not updated, please try again',
-        'success' => 'Category updated successfully.'
+        'error'   => 'Kategorien blev ikke opdateret, prøv igen',
+        'success' => 'Kategorien blev opdateret.'
    ),

    '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'   => 'Er du sikker på at du vil slette denne kategori?',
+        'error'   => 'Der opstod et problem under sletning af kategorien. Prøv igen.',
+        'success' => 'Kategorien blev slettet.'
    )

 );
@@ -3,7 +3,7 @@
 return array(

    'id'      => 'ID',
-    'parent'   => 'Parent',
+    'parent'   => 'Forælder',
    'title'      => 'Asset Category Name',

 );
@@ -6,7 +6,7 @@ return array(
    'asset_depreciations'  					=> 'Asset Depreciations',
    'create_depreciation'  					=> 'Create Depreciation',
    'depreciation_name'  					=> 'Depreciation Name',
-    'number_of_months'  					=> 'Number of Months',
+    'number_of_months'  					=> 'Antal måneder',
    'update_depreciation'  					=> 'Update Depreciation',

 );
@@ -12,23 +12,23 @@ return array(
    'default_location'	=> 'Default Location',
    'eol_date'			=> 'EOL Date',
    'eol_rate'			=> 'EOL Rate',
-    'expires'			=> 'Expires',
+    'expires'			=> 'Udløber',
    'fully_depreciated'	=> 'Fully Depreciated',
    'help_checkout'		=> 'If you wish to assign this asset immediately, you should select "Ready to Deploy" from the status list above, or unexpected things may happen. ',
-    'manufacturer'		=> 'Manufacturer',
+    'manufacturer'		=> 'Producent',
    'model'				=> 'Model',
-    'months'			=> 'months',
+    'months'			=> 'måneder',
    'name'				=> 'Asset Name',
    'notes'				=> 'Notes',
    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
+    'qr'				=> 'QR kode',
    'requestable'		=> 'Users may request this asset',
-    'serial'			=> 'Serial',
+    'serial'			=> 'Serienummer',
    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
+    'supplier'			=> 'Leverandør',
    'tag'				=> 'Asset Tag',
    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+    'warranty'			=> 'Garanti',
+    'years'				=> 'år',
 )
 ;
@@ -2,8 +2,7 @@

 return array(

-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
+    '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.',
    '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. ',

@@ -2,23 +2,26 @@

 return array(

-    'asset'				=> 'Asset',
-    'checkin'			=> 'Checkin',
-    'checkin'			=> 'Checkin',
-    'cost'				=> 'Purchase Cost',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create License',
-    'date'				=> 'Purchase Date',
-    'date'				=> 'Purchase Date',
-    'depreciation'		=> 'Depreciation',
-    'name'				=> 'Software Name',
-    'no_depreciation'	=> 'Do Not Depreciate',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order No.',
-    'seats'				=> 'Seats',
-    'serial'			=> 'Serial',
-    '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.'
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'cost'              => 'Indkøbspris',
+    'create'            => 'Opret licens',
+    'date'              => 'Købsdato',
+    'depreciation'      => 'Depreciation',
+    'expiration'        => 'Udløbsdato',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software navn',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'notes'             => 'Noter',
+    'order'             => 'Order No.',
+    'purchase_order'    => 'Purchase Order Number',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'serial'            => 'Serienummer',
+    'supplier'          => 'Leverandør',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Opdater licens',
+    'checkout_help'     => 'Du skal tjekke en licens ud til et hardware aktiv eller en person. Du kan vælge begge dele, men ejeren af aktivet skal svare til den person, du tjekker aktivet ud til.'
 );
@@ -14,6 +14,18 @@ return array(
        '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',
+        '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.'
@@ -17,7 +17,7 @@ return array(

    'delete' => array(
        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
-        'error'   => 'There was an issue deleting the blog post. Please try again.',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
        'success' => 'The Manufacturer was deleted successfully.'
    )

@@ -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.'
+);
@@ -1,6 +1,9 @@
 <?php

 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
    'display_asset_name'        => 'Display Asset Name',
    'display_checkout_date'     => 'Display Checkout Date',
    'display_eol'               => 'Display EOL in table view',
@@ -1,10 +1,10 @@
 <?php

 return array(
-    'name'      	=> 'Status Name',
-    'title'      	=> 'Status Labels',
-    'update'      	=> 'Update Status Label',
-    'create'      	=> 'Create Status Label',
-    'about'      	=> 'About Status Labels',
-    'info'      	=> 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
+    'name'      	=> 'Status navn',
+    'title'      	=> 'Status labels',
+    'update'      	=> 'Opdater status label',
+    'create'      	=> 'Opret status label',
+    'about'      	=> 'Om status labels',
+    'info'      	=> 'Status labels bruges til at beskrive de forskellige grunde til, hvorfor et aktiv <strong><em>ikke</em></strong> kan blive anvendt. Det kan være i stykker, sendt til diagnose, sendt til reparation, mistet eller stjålet, osv. Status labels gør det muligt for dit team at vise udviklingen.',
 );
@@ -1,24 +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',
-    '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',
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'By',
+    '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',

 );
@@ -3,6 +3,12 @@

 return array(

-    'edit'  			=> 'Edit User',
+    'assets_user'  		=> 'Assets assigned to :name',
    'clone'  			=> 'Clone User',
+    'contact_user'  	=> 'Contact :name',
+    'edit'  			=> 'Edit User',
+    'history_user'  	=> 'History for :name',
+    'last_login'  		=> 'Last Login',
+    'software_user'  	=> 'Software Checked out to :name',
+    'view_user'  		=> 'View User :name',
    );
@@ -2,11 +2,13 @@

 return array(

-    '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_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.',
+

    'success' => array(
        'create'    => 'User was successfully created.',
@@ -25,6 +25,8 @@ return array(
    'phone'  				=> 'Phone',
    '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',
 );
@@ -2,35 +2,35 @@

 return array(

-    'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The email account 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.',
+    'account_already_exists' => 'En konto med denne e-mail eksisterer allerede.',
+    'account_not_found'      => 'E-mail konto eller adgangskode er forkert.',
+    'account_not_activated'  => 'Denne brugerkonto er ikke aktiveret.',
+    'account_suspended'      => 'Denne brugerkonto er suspenderet.',
+    'account_banned'         => 'Denne brugerkonto er blokeret.',

    'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
-        'success' => 'You have successfully logged in.',
+        'error'   => 'Der opstod et problem, ved forsøg på at logge dig ind, prøv igen.',
+        'success' => 'Du er blevet logget ind.',
    ),

    'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
-        'success' => 'Account sucessfully created.',
+        'error'   => 'Der opstod et problem, ved forsøg på at oprette din konto, prøv igen.',
+        'success' => 'Konto oprettet med succes.',
    ),

        '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.',
+            'error'   => 'Der opstod et problem, ved forsøg på at nulstille din adgangkode, prøv igen.',
+            'success' => 'En e-mail til gendannelse af adgangskoden er afsendt.',
        ),

        '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.',
+            'error'   => 'Der opstod et problem, ved forsøg på at nulstille din adgangskode, prøv venligst igen.',
+            'success' => 'Din adgangskode er blevet nulstillet.',
        ),

    'activate' => array(
-        'error'   => 'There was a problem while trying to activate your account, please try again.',
-        'success' => 'Your account has been successfully activated.',
+        'error'   => 'Der opstod et problem, ved forsøg på at aktivere din konto, prøv igen.',
+        'success' => 'Din konto er blevet aktiveret.',
    ),

 );
@@ -2,10 +2,13 @@

 return array(

-    'edit'    => 'Edit',
-    'delete'  => 'Delete',
-    'restore' => 'Restore',
-    'actions' => 'Actions',
-    'submit'  => 'Submit',
+    'actions' 	=> 'Handlinger',
+    'add'    	=> 'Add New',
+    'cancel'    => 'Cancel',
+    'delete'  	=> 'Slet',
+    'edit'    	=> 'Rediger',
+    'restore' 	=> 'Gendan',
+    'submit'  	=> 'Send',
+    'upload'    => 'Upload',

 );
@@ -2,51 +2,58 @@

 return array(

-    'address'				=> 'Address',
+
+    'address'				=> 'Addresse',
    'admin'					=> 'Admin',
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
+    'all_assets'			=> 'Alle aktiver',
+    'all'       			=> 'Alle',
    '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',
-    'cancel'  				=> 'Cancel',
+    'back'      			=> 'Tilbage',
+    'cancel'  				=> 'Annuller',
    'categories'			=> 'Asset Categories',
    'category'				=> 'Asset Category',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
+    'changeemail'  			=> 'Skift email adresse',
+    'changepassword'  		=> 'Skift adgangskode',
    'checkin'  				=> 'Checkin',
    'checkout'  			=> 'Checkout',
-    'city'  				=> 'City',
-    'country'  				=> 'Country',
-    'create'				=> 'Create New',
+    'city'  				=> 'By',
+    'country'  				=> 'Land',
+    'create'				=> 'Opret ny',
    'created_asset'			=> 'created asset',
    'created_at' 			=> 'Created at',
    'currency'  			=> '$',
    'current'  				=> 'Current',
-    'date'					=> 'Date',
-    'delete'  				=> 'Delete',
-    'deleted'  				=> 'Deleted',
+    'custom_report'         => 'Custom Asset Report',
+    'date'					=> 'Dato',
+    'delete'  				=> 'Slet',
+    'deleted'  				=> 'Slettet',
    'deployed'				=> 'Deployed',
    'depreciation_report'	=> 'Depreciation Report',
    'depreciation'			=> 'Depreciation',
    'editprofile'  			=> 'Edit Your Profile',
    'eol'					=> 'EOL',
-    'first_name'			=> 'First Name',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
+    'first_name'			=> 'Fornavn',
+    'file_name'				=> 'File',
+    'file_uploads'			=> 'File Uploads',
+    'generate'				=> 'Generate',
+    'groups'				=> 'Grupper',
+    'gravatar_email'        => 'Gravatar email addresse',
    'history_for'  			=> 'History for',
    'id'  					=> 'ID',
-    'image_delete'         => 'Delete Image',
-    'image_upload'         => 'Upload Image',
-    'last_name'				=> 'Last Name',
-    'license'				=> 'License',
+    'image_delete'         => 'Slet billede',
+    'image_upload'         => 'Upload billede',
+    'last_name'				=> 'Efternavn',
+    'license'				=> 'Licens',
+    'license_report'        => 'License Report',
    'licenses_available'	=> 'licenses available',
-    'licenses'				=> 'Licenses',
+    'licenses'				=> 'Licenser',
    'list_all'				=> 'List All',
    'location'              => 'Location',
    'locations'				=> 'Locations',
@@ -72,19 +79,19 @@ return array(
    'sign_in'				=> 'Sign in',
    'site_name'				=> 'Site Name',
    'state'  				=> 'State',
-    'status_labels'			=> 'Status Labels',
+    'status_labels'			=> 'Status labels',
    'status'    			=> 'Status',
-    'suppliers'  			=> 'Suppliers',
+    'suppliers'  			=> 'Leverandører',
    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
+    'total_licenses'		=> 'totale licenser',
    'undeployable'			=> 'Un-deployable',
    'unknown_admin'			=> 'Unknown Admin',
-    'user'					=> 'User',
+    'user'					=> 'Bruger',
    'viewassets'  			=> 'View Assigned Assets',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
-    'years'					=> 'years',
-    'yes' 					=> 'Yes',
-    'zip'  					=> 'Zip',
+    'website'               => 'Hjemmeside',
+    'welcome'				=> 'Velkommen, :name',
+    'years'					=> 'år',
+    'yes' 					=> 'Ja',
+    'zip'  					=> 'Postnummer',

 );
@@ -13,8 +13,8 @@ return array(
    |
    */

-    'previous' => '&laquo; Previous',
+    'previous' => '&laquo; Forrige',

-    'next'     => 'Next &raquo;',
+    'next'     => 'Næste &raquo;',

 );
@@ -13,12 +13,12 @@ return array(
    |
    */

-    "password" => "Passwords must be six characters and match the confirmation.",
+    "password" => "Adgangskoder skal være seks tegn og svare til bekræftelsen.",

-    "user"     => "Username or email address is incorrect",
+    "user"     => "Brugernavn eller email adresse er forkert",

    "token"    => "This password reset token is invalid.",

-    "sent" => "If a matching email address was found, a password reminder has been sent!",
+    "sent" => "Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!",

 );
@@ -2,6 +2,8 @@

 return array(

-    'actions' => 'Actions'
+    'actions'	 	=> 'Handlinger',
+    'action' 		=> 'Handling',
+    'by'      		=> 'Af',

 );
@@ -13,56 +13,56 @@ return array(
    |
    */

-    "accepted"         => "The :attribute must be accepted.",
-    "active_url"       => "The :attribute is not a valid URL.",
-    "after"            => "The :attribute must be a date after :date.",
-    "alpha"            => "The :attribute may only contain letters.",
-    "alpha_dash"       => "The :attribute may only contain letters, numbers, and dashes.",
-    "alpha_num"        => "The :attribute may only contain letters and numbers.",
-    "before"           => "The :attribute must be a date before :date.",
+    "accepted"         => ":attribute skal være accepteret.",
+    "active_url"       => ":attribute er ikke en gyldig URL.",
+    "after"            => ":attribute skal være en dato efter :date.",
+    "alpha"            => ":attribute må kun indeholde bogstaver.",
+    "alpha_dash"       => ":attribute må kun indeholde bogstaver, tal eller bindestreger.",
+    "alpha_num"        => ":attribute må kun indeholde bogstaver eller tal.",
+    "before"           => ":attribute skal være en dato før :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.",
+        "numeric" => ":attribute skal være imellem :min - :max.",
+        "file"    => ":attribute skal være imellem :min - :max kilobytes.",
+        "string"  => ":attribute skal være imellem :min - :max tegn.",
    ),
    "confirmed"        => "The :attribute confirmation does not match.",
-    "date"             => "The :attribute is not a valid date.",
-    "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.",
+    "date"             => ":attribute er ikke en gyldig dato.",
+    "date_format"      => ":attribute svarer ikke til formatet :format.",
+    "different"        => ":attribute og :other skal være forskellige.",
+    "digits"           => ":attribute skal være :digits cifre.",
+    "digits_between"   => ":attribute skal være imellem :min og :max cifre.",
+    "email"            => ":attribute formatet er ugylidgt.",
    "exists"           => "The selected :attribute is invalid.",
-    "image"            => "The :attribute must be an image.",
-    "in"               => "The selected :attribute is invalid.",
+    "image"            => ":attribute skal være et billede.",
+    "in"               => "Det valgte :attribute er ugyldigt.",
    "integer"          => "The :attribute must be an integer.",
-    "ip"               => "The :attribute must be a valid IP address.",
+    "ip"               => ":attribute skal være en gyldig IP adresse.",
    "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.",
+        "numeric" => ":attribute må ikke overstige :max.",
+        "file"    => ":attribute må ikke overstige :max. kilobytes.",
+        "string"  => ":attribute må ikke overstige :max. tegn.",
    ),
-    "mimes"            => "The :attribute must be a file of type: :values.",
+    "mimes"            => ":attribute skal være en fil af typen: :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.",
+        "numeric" => ":attribute skal mindst være :min.",
+        "file"    => ":attribute skal mindst være :min kilobytes.",
+        "string"  => ":attribute skal mindst være :min tegn.",
    ),
    "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.",
+    "regex"            => ":attribute formatet er ugyldigt.",
+    "required"         => ":attribute feltet er krævet.",
+    "required_if"      => ":attribute feltet er krævet når :other er :value.",
+    "required_with"    => ":attribute er krævet når :values forekommer.",
+    "required_without" => ":attribute er krævet når :values ikke forekommer.",
+    "same"             => ":attribute og :other skal være ens.",
    "size"             => array(
-        "numeric" => "The :attribute must be :size.",
-        "file"    => "The :attribute must be :size kilobytes.",
-        "string"  => "The :attribute must be :size characters.",
+        "numeric" => ":attribute skal være :size.",
+        "file"    => ":attribute skal være :size kilobytes.",
+        "string"  => ":attribute skal være :size tegn.",
    ),
    "unique"           => "The :attribute has already been taken.",
-    "url"              => "The :attribute format is invalid.",
+    "url"              => ":attribute formatet er ugyldigt.",


    /*
@@ -77,7 +77,7 @@ return array(
    */

    'custom' => array(),
-    'alpha_space' => "The :attribute field may only contain letters, commas, spaces and dashes.",
+    'alpha_space' => ":attribute feltet må kun indeholde bogstaver, kommaer, mellemrum eller bindestreger.",

    /*
    |--------------------------------------------------------------------------
@@ -3,7 +3,7 @@
 return array(

    'id'      => 'ID',
-    'parent'   => 'Parent',
-    'title'      => 'Asset Category Name',
+    'parent'   => 'Übergeordneten',
+    'title'      => 'Posten Kategorie Name',

 );
@@ -2,24 +2,24 @@

 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. ',
+    'does_not_exist' => 'Die Abschreibungsklasse existiert nicht.',
+    'assoc_users'	 => 'Diese Abschreibung ist derzeit einem oder mehreren Modellen zugeordnet und kann nicht gelöscht werden. Bitte löschen Sie erst die Modelle und versuchen es dann erneut. ',


    'create' => array(
-        'error'   => 'Depreciation class was not created, please try again. :(',
-        'success' => 'Depreciation class created successfully. :)'
+        'error'   => 'Abschreibungsklasse wurde nicht erstellt, bitte versuchen Sie es erneut. :(',
+        'success' => 'Abschreibungsklasse wurde erfolgreich erstellt. :)'
    ),

    'update' => array(
-        'error'   => 'Depreciation class was not updated, please try again',
-        'success' => 'Depreciation class updated successfully.'
+        'error'   => 'Abschreibungsklasse wurde nicht aktualisiert, bitte versuchen Sie es erneut',
+        'success' => 'Abschreibungsklasse wurde erfolgreich aktualisiert.'
    ),

    '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.'
+        'confirm'   => 'Sind Sie sicher, dass Sie diese Abschreibungsklasse löschen wollen?',
+        'error'   => 'Beim Löschen der Abschreibungsklasse ist ein Problem aufgetreten. Bitte versuchen Sie es erneut.',
+        'success' => 'Die Abschreibungsklasse wurde erfolgreich gelöscht.'
    )

 );
@@ -3,8 +3,8 @@
 return array(

    'id'      => 'ID',
-    'months'   => 'Months',
-    'term'   => 'Term',
+    'months'   => 'Monate',
+    'term'   => 'Laufzeit',
    'title'      => 'Name ',

 );
@@ -4,6 +4,6 @@ return array(

    'id'         => 'Id',
    'name'       => 'Name',
-    'users'      => '# of Users',
+    'users'      => '# von Benutzern',

 );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	a61e913824	Squashed commit of the following: commit `95ae26eb2a` Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:21:33 2015 -0800 Updated docs location commit `cfebe11755` Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:36 2015 -0800 Updated docs for 4.2 commit `d86b5aa613` Author: snipe <snipe@snipe.net> Date: Sun Feb 8 16:20:24 2015 -0800 Bumped version	2015-02-08 16:22:12 -08:00
snipe	c255de7fc0	Merge remote-tracking branch 'origin/develop'	2015-02-08 16:18:09 -08:00
snipe	42d5d8db80	Updated language files	2015-02-08 16:17:45 -08:00
snipe	91bf9763d2	Merge remote-tracking branch 'origin/develop'	2015-02-08 16:13:25 -08:00
snipe	9c66dd5431	Added gitignore	2015-02-08 16:13:10 -08:00
snipe	614396a15b	Utilize query scopes for cleaner controllers	2015-02-08 16:02:35 -08:00
snipe	cfe0472ea2	New language strings for file uploads	2015-02-06 22:18:57 -08:00
snipe	d20b5136b8	Nicer display if no files have been uploaded	2015-02-06 22:02:52 -08:00
snipe	29f5b7c5e3	Fixed datetime	2015-02-06 21:54:44 -08:00
snipe	140bd137a4	Minor display fixes	2015-02-06 21:54:36 -08:00
snipe	3a9cb9ba7a	Display uploaded files	2015-02-06 21:31:16 -08:00
snipe	6d0828bfe5	Delete file interface and routes	2015-02-06 20:42:40 -08:00
snipe	51a7752771	Moved cancel text to buttons language file	2015-02-06 18:52:09 -08:00
snipe	a8681225f5	Added language for add button	2015-02-06 18:46:20 -08:00
snipe	26a59afa44	Basic upload display and form	2015-02-06 18:43:15 -08:00
snipe	e22ce0d377	Changes added_on to created_at	2015-02-06 18:43:04 -08:00
snipe	2fbef7f561	Updated field name for asset log	2015-02-06 18:42:48 -08:00
snipe	2678611c79	Included doctrine for field renaming	2015-02-06 18:42:36 -08:00
snipe	416cd236d2	Updated to new fieldname	2015-02-06 18:42:24 -08:00
snipe	4936a5914f	Folder for private uploads	2015-02-06 18:41:56 -08:00
snipe	36fce27297	Added uploads methods	2015-02-06 18:41:47 -08:00
snipe	4b2e45c5f2	Added uploads methods	2015-02-06 18:41:35 -08:00
snipe	11f46474ab	New file upload language	2015-02-06 18:41:24 -08:00
snipe	b0d52a4158	Updated field name	2015-02-06 18:41:16 -08:00
snipe	7b4845c255	Added soft delete to asset log	2015-02-06 18:40:58 -08:00
snipe	223ba349ea	Minor change to comment for clarify	2015-02-06 16:57:15 -08:00
snipe	feeef4b66c	Fix for asset log incorrectly using soft deletes	2015-02-06 14:54:13 -08:00
snipe	42f8a35078	Additional translation files	2015-02-05 17:08:20 -08:00
snipe	0128505213	Overwriting Smfony YAML deps	2015-02-05 15:50:32 -08:00
snipe	06bee68cd2	Testing config for travis	2015-02-05 15:34:26 -08:00
snipe	c255edaf61	More travis fixes	2015-02-05 15:30:51 -08:00
snipe	7f0e21d50c	Changes to make travis build pass	2015-02-05 15:02:57 -08:00
snipe	1aeb4de0fa	Possible fix for #491 - solving for giticide on package dep	2015-02-05 14:43:01 -08:00
snipe	bff33cb7f5	removed old package dep	2015-02-05 14:10:25 -08:00
snipe	5695815360	Missed one --force	2015-02-04 16:22:45 -08:00
snipe	e67ba8a743	Fix reporting error on depreciation	2015-02-04 16:13:11 -08:00
snipe	3669ab2ae8	Updated travis for forced migration in production	2015-02-04 16:07:41 -08:00
snipe	e2ee954592	Updated composer and composer.lock for 4.2	2015-02-04 15:50:54 -08:00
snipe	b4750f016d	Added new 4.2 SoftDeletingTrait	2015-02-04 15:50:40 -08:00
snipe	7069d9c6b1	Added new cipher to config	2015-02-04 15:50:07 -08:00
snipe	8e0d774023	Added strict option in database config	2015-02-04 15:49:50 -08:00
snipe	394836821c	Added catehory nav item in sidebar	2015-02-04 15:01:36 -08:00
snipe	a1ac7f8676	Removed cruft	2015-02-04 15:01:08 -08:00
snipe	cd338d2a70	Fixes #483 - line breaks in notes on view	2015-02-04 10:21:02 -08:00
snipe	4dc81ce65f	Resolves #478 - redirects non-reporting users to view assets page	2015-02-04 09:31:01 -08:00
snipe	f5efc368a5	Fixes #487 - maintained and purchase order in strict mode	2015-02-04 08:51:03 -08:00
snipe	1db806f8b2	Fixes #488 - longer user jobtitle	2015-02-04 07:59:45 -08:00
snipe	b3af102d22	Fixed safe mode issue with license seeder	2015-02-04 07:49:28 -08:00
snipe	2b86f14e30	Possible fix for #484 - fullname issue	2015-02-01 14:33:58 -08:00
snipe	3f0e494276	Updated contributing info	2015-01-23 15:39:03 -08:00
snipe	a4bac03692	Increment version number	2015-01-23 15:38:48 -08:00
snipe	950567e9d6	Fixes issue related to #471 - assigning to user ID 0 causes erro	2015-01-23 15:38:39 -08:00
snipe	dede09e9c5	Merge remote-tracking branch 'origin/develop'	2015-01-22 15:41:36 -08:00
snipe	3787a3f4ba	Fixed language strings for incrementing IDs	2015-01-22 15:34:19 -08:00
snipe	95141d49ba	Fixes #432 - add model name to checkout	2015-01-22 15:20:16 -08:00
snipe	d85e524680	Fixes #451 - allows spaces in state name	2015-01-22 14:29:53 -08:00
snipe	4a77dee79c	Fixes #447 - added asset log entry on save	2015-01-22 14:16:09 -08:00
snipe	6fba41e026	Updated gitignore to ignore crowdin	2015-01-22 13:42:32 -08:00
snipe	f39922f51f	Merge remote-tracking branch 'origin/develop' Conflicts: CONTRIBUTING.md	2015-01-22 13:31:19 -08:00
snipe	53085983f8	Added UK English language file	2015-01-22 13:24:01 -08:00
snipe	4a2ac03ace	New Spanish strings	2015-01-22 13:23:29 -08:00
snipe	548de1a1a2	Fixes #468 - updated ordering on license checkout	2015-01-22 13:03:07 -08:00
snipe	82560b1098	Updated language files with new strings	2015-01-22 13:00:38 -08:00
snipe	3c141e8f50	Fixes #467	2015-01-22 12:56:13 -08:00
snipe	5e496672c6	Fixes #469	2015-01-22 12:54:22 -08:00
snipe	4887c53f25	Merge pull request #452 from gitter-badger/gitter-badge Add a Gitter chat badge to README.md	2015-01-12 15:16:57 -08:00
The Gitter Badger	2b79a61d65	Added Gitter badge	2015-01-12 23:15:02 +00:00
snipe	5268c579e2	Update CONTRIBUTING.md	2015-01-08 17:34:23 -08:00
snipe	21448ea8e6	Update CONTRIBUTING.md	2015-01-08 17:33:49 -08:00
snipe	778a7bb18c	Additional translations	2015-01-08 17:24:13 -08:00
snipe	685881cf27	Too many thanks (too many thanks)	2015-01-08 17:19:02 -08:00
snipe	cf4b80bbd5	Updated contributing guidelines	2015-01-08 17:18:19 -08:00
snipe	5c98dae57d	Merge branch 'develop'	2015-01-08 11:34:19 -08:00
snipe	e434616db8	Merge pull request #436 from rashivkp/fix-435 fixed #435. using namespace with route groups to increase the readability	2015-01-04 21:50:07 -06:00
snipe	8a7b7418db	Merge pull request #433 from thehereward/tidy-up-models Tidy up models	2015-01-04 21:49:57 -06:00
Mohamed Rashid	533be7f942	fixed #435 . using namespace with route groups to increase the readability	2015-01-05 01:24:16 +05:30
Hereward Mills	094ec50a68	TidyUp: Commonise the depreciate method of Asset and License.	2014-12-24 23:03:06 +00:00
Hereward Mills	98a29e460d	TidyUp: Remove excess whitespace.	2014-12-24 22:34:16 +00:00
snipe	27fabfd110	Updated readme	2014-12-23 14:50:34 -05:00
snipe	dce1d47228	Updated language files	2014-12-23 14:48:43 -05:00
snipe	9bbec53635	Added --no-dev to composer for CI	2014-12-23 14:19:46 -05:00
snipe	82232a34ee	Merge pull request #415 from svpernova09/feature/software-maintenance-additions Feature/software maintenance additions Working on #232	2014-12-23 14:11:20 -05:00
Svpernova09	3d1795e312	Add process handling of new maintained and termination_date fields to the licenses methods for creating and editing licenses. Also add array for getCreate and getEdit to easily display maintained options in drop down	2014-12-10 07:45:53 -06:00
Svpernova09	d858861d0f	Add termination_date and maintained fields to the License edit form. Add field labels to language file.	2014-12-10 07:44:47 -06:00
Svpernova09	eec36cb13a	Add migration to add maintained and termination_date fields to licenses table	2014-12-10 07:43:57 -06:00
snipe	cee966e76e	Merge pull request #408 from svpernova09/feature/add-asset-from-model-view Feature/add asset from model view for #365	2014-12-03 15:25:56 -05:00
Svpernova09	dcf2b428da	If we are passing along an id of a previously selected model, use that as the default selection. Otherwise we should fall back to Input::old()	2014-12-03 14:06:33 -06:00
Svpernova09	80d8432c35	Check the optional parameter and if there is a value, grab that model and pass along to the view. Refactored the view return to be easier to read and able to interject if our parameter was set.	2014-12-03 14:05:42 -06:00
Svpernova09	8ec5934af5	Add menu option in dropdown to create new hardware. Add optional parameter in create/hardware route to handle the parameter in the incoming link	2014-12-03 14:04:02 -06:00
snipe	31f77dcb4b	Merge pull request #407 from svpernova09/bug/500-error-when-viewing-asset Check if ->adminuser->id isset before trying to print the fullName so we...	2014-12-03 14:08:09 -05:00
Svpernova09	0663ccb99f	Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349	2014-12-03 07:46:29 -06:00
snipe	19189f688f	Merge pull request #405 from svpernova09/enhancement/make-notes-field-textarea Enhancement/make notes field textarea	2014-12-02 11:21:36 -05:00
Svpernova09	7849320db0	Convert note fields to text areas for licenses views	2014-12-02 06:59:16 -06:00
Svpernova09	cc8ca54b3f	Convert note fields to text areas for hardware views	2014-12-02 06:59:01 -06:00
Svpernova09	ecb4d0d948	Add jetbrains IDE's config folders to gitignore	2014-12-02 06:51:50 -06:00
snipe	f20566f222	Merge pull request #393 from madd15/patch-1 Fix #388 - License not showing checked out in view	2014-11-23 19:36:28 -05:00
madd15	73dd339772	Fix #388 - License not showing checked out in view	2014-11-24 11:05:24 +10:30
snipe	5a6139fb64	Merge pull request #391 from bitdeli-chef/master Add a Bitdeli Badge to README	2014-11-22 22:57:29 -05:00
Bitdeli Chef	0fb2728e3f	Add a Bitdeli badge to README	2014-11-23 04:06:26 +00:00
snipe	5e6c4a250a	Updated composer lock	2014-11-21 07:34:06 -05:00
snipe	bf96aae9d9	Truncate license in report	2014-11-21 07:32:12 -05:00
snipe	daefc86e58	Formattig fixes for #386	2014-11-21 06:10:30 -05:00
snipe	64c16a0bac	Fixes #386 and #273 - altered column type to text	2014-11-21 05:47:49 -05:00
snipe	89a2b87e42	Fixes #367 - added model number to dropdown	2014-11-21 05:20:08 -05:00
snipe	1b41c974cf	Fixes #348 - remove constraints on license keys	2014-11-20 18:43:33 -05:00
snipe	d6a0249c60	Fixed #373 - added ability to auto-increment asset tags	2014-11-20 18:28:45 -05:00
snipe	6a6676b1e7	Merge pull request #383 from madd15/patch-1 Fix half #377 - Checkout users last_name, first_name	2014-11-20 17:19:44 -05:00
madd15	1024816313	Fix #377 - Checkout users last_name, first_name	2014-11-21 08:47:19 +10:30
snipe	6905d82fc4	Fixes #374 to keep the requirement to PHP 5.4	2014-11-20 16:38:50 -05:00
snipe	22746db8b7	Newest translations	2014-11-20 16:28:38 -05:00
snipe	b826673d0d	Added username field for #377	2014-11-20 16:17:48 -05:00
snipe	637009054c	Fixed typo in english	2014-11-20 16:09:30 -05:00
snipe	5f5be6aa2a	Removed line break	2014-11-20 16:09:21 -05:00
snipe	a863cf1615	Merge pull request #364 from madd15/patch-1 Remove Double </label>	2014-11-13 18:30:40 -05:00
madd15	05d8ff0252	Remove Double </label>	2014-11-14 09:57:02 +10:30
snipe	b73ae3147a	Fixes #362 , reduced asset name to 2 char min	2014-11-13 16:26:39 -05:00
snipe	81b2ce33c2	Polish, german and spanish translation strings	2014-11-12 21:13:46 -05:00
snipe	501e1749b3	Updated localization strings	2014-11-12 17:38:56 -05:00
snipe	53f279f55f	Language string for "generate"	2014-11-12 17:34:22 -05:00
snipe	f5fb2525de	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2014-11-12 17:32:58 -05:00
snipe	53951c8bbc	Nicer custom reports form layout	2014-11-12 17:32:48 -05:00
snipe	00755eadf0	Merge pull request #359 from madd15/patch-1 Fix Lang for Reports	2014-11-12 17:17:07 -05:00
madd15	13b173409f	Fix License form langs	2014-11-13 08:44:47 +10:30
madd15	7ddc6d497a	Fix Report Langs	2014-11-13 08:43:42 +10:30
snipe	2829eeca7c	New reports language files	2014-11-12 17:05:46 -05:00
snipe	e39227633f	Merge pull request #358 from madd15/feature-reports Add error on empty options and Update to Lang for error and info	2014-11-12 17:01:31 -05:00
Madd15	89c7159c56	Fix array check for empty rows	2014-11-13 08:29:15 +10:30
snipe	6854453bc5	English is hard :(	2014-11-12 16:38:31 -05:00
snipe	ce9c616843	Updated language strings	2014-11-12 16:33:11 -05:00
Madd15	40b0ced8da	Update Lang for error and info	2014-11-13 08:02:39 +10:30
Madd15	57ec8aa3c2	Add error for no options selected	2014-11-13 08:02:25 +10:30
snipe	02feb69d5d	Localization on user's view page, new strings	2014-11-12 16:22:30 -05:00
snipe	fc2d472ed3	Fixed english language string	2014-11-12 15:52:08 -05:00
snipe	b622d977d9	Merge pull request #355 from madd15/feature-reports Added Customizable Asset Report	2014-11-12 01:35:44 -05:00
Madd15	6d2a073d04	Custom Asset Report	2014-11-12 16:05:59 +10:30
snipe	564cf90e58	Merge pull request #354 from madd15/feature-reports Feature Extended Reports	2014-11-12 00:32:51 -05:00
Madd15	c60e40096a	Replace static titles with lang	2014-11-12 13:38:31 +10:30
Madd15	74ae2fceea	Fix class on th	2014-11-12 13:34:53 +10:30
Madd15	02605bdf69	Add Asset Report with Reduced Load Time	2014-11-12 12:03:33 +10:30
Madd15	432e348e56	Add Report Controller and License Report	2014-11-12 12:02:55 +10:30
snipe	d91a7c7aa8	Merge pull request #351 from diwanicki/patch-1 Update view.blade.php	2014-11-07 16:57:39 -05:00
diwanicki	f2ae05786b	Update view.blade.php closing parens was missing from Depreciation, EOL was not configured for translations	2014-11-07 16:56:28 -05:00
snipe	3d3e2dc985	Merge pull request #346 from madd15/feature-supplier-image Add image to supplier	2014-11-06 22:24:37 -05:00
madd15	3c3617d641	Add image to supplier	2014-11-07 13:46:14 +10:30
snipe	b518162c50	Merge pull request #345 from madd15/patch-1 Fix #342	2014-11-06 16:23:50 -05:00
madd15	b2d5dc9ec5	Fix #342	2014-11-07 07:52:44 +10:30
snipe	cff24309a1	Possibly fixes #343	2014-11-06 15:21:54 -05:00
snipe	b25c94e429	Purchase cost is not required	2014-11-06 15:21:32 -05:00
snipe	53a47743e8	Language string udpates	2014-11-05 23:06:06 -05:00
snipe	8a10386737	Merge pull request #338 from madd15/patch-license-lang Lang changes for new licenses functions	2014-11-05 22:49:00 -05:00
madd15	7e95d36245	Lang changes for new licenses functions	2014-11-06 14:15:09 +10:30
snipe	f90327ee9c	Merge pull request #337 from madd15/patch-1 Update to v1.1	2014-11-05 22:21:10 -05:00
madd15	3b5670965c	Update to v1.1	2014-11-06 13:50:13 +10:30
snipe	8699a90093	Fixed changelog	2014-11-05 22:05:32 -05:00
snipe	562e5cd700	Changelog generator	2014-11-05 22:03:01 -05:00
snipe	3f7486e1a9	Updated changelog	2014-11-05 22:02:51 -05:00