Brady Wetherington d653126a2a Merge branch 'develop' into custom_fields ...

Conflicts:
	app/controllers/admin/AssetsController.php
	app/views/backend/hardware/index.blade.php
	app/views/backend/hardware/view.blade.php

2015-11-25 14:22:22 -08:00

..

.gitkeep

Initial laravel import

2013-11-13 01:59:39 -05:00

2013_03_23_193214_update_users_table.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

2013_11_13_075318_create_models_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_13_075335_create_categories_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_13_075347_create_manufacturers_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_15_015858_add_user_id_to_categories.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_15_112701_add_user_id_to_manufacturers.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_15_190327_create_assets_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_15_190357_create_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_15_201848_add_license_name_to_licenses.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_040323_create_depreciations_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_042851_add_depreciation_id_to_models.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_084923_add_user_id_to_models.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_103258_create_locations_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_103336_add_location_id_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_103407_add_checkedout_to_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_16_103425_create_history_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_17_054359_drop_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_17_054526_add_physical_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_17_055126_create_settings_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_17_062634_add_license_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_18_134332_add_contacts_to_users.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_18_142847_add_info_to_locations.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_18_152942_remove_location_id_from_asset.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_18_164423_set_nullvalues_for_user.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2013_11_19_013337_create_asset_logs_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_19_061409_edit_added_on_asset_logs_table.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2013_11_19_062250_edit_location_id_asset_logs_table.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2013_11_20_055822_add_soft_delete_on_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_121404_add_soft_delete_on_locations.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_123137_add_soft_delete_on_manufacturers.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_123725_add_soft_delete_on_categories.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_130248_create_status_labels.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_130830_add_status_id_on_assets_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_131544_add_status_type_on_status_labels.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_20_134103_add_archived_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_21_002321_add_uploads_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_21_024531_remove_deployable_boolean_from_status_labels.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_22_075308_add_option_label_to_settings_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_22_213400_edits_to_settings_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_013244_create_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_031458_create_license_seats_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_032022_add_type_to_actionlog_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_033008_delete_bad_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_033131_create_new_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_033534_add_licensed_to_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_101308_add_warrantee_to_assets_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_104343_alter_warranty_column_on_assets.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2013_11_25_150450_drop_parent_from_categories.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_151920_add_depreciate_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_25_152903_add_depreciate_to_licenses_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_26_211820_drop_license_from_assets_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_11_27_062510_add_note_to_asset_logs_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_12_01_113426_add_filename_to_asset_log.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_12_06_094618_add_nullable_to_licenses_table.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2013_12_10_084038_add_eol_on_models_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2013_12_12_055218_add_manager_to_users_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_01_28_031200_add_qr_code_to_settings_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_02_13_183016_add_qr_text_to_settings_table.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_05_24_093839_alter_default_license_depreciation_id.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_05_27_231658_alter_default_values_licenses.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_06_19_191508_add_asset_name_to_settings.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_06_20_004847_make_asset_log_checkedout_to_nullable.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_06_20_005050_make_asset_log_purchasedate_to_nullable.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_06_24_003011_add_suppliers.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_06_24_010742_add_supplier_id_to_asset.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_06_24_012839_add_zip_to_supplier.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_06_24_033908_add_url_to_supplier.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_07_08_054116_add_employee_id_to_users.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_07_09_134316_add_requestable_to_assets.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_07_17_085822_add_asset_to_software.php

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

2014_07_17_161625_make_asset_id_in_logs_nullable.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_08_12_053504_alpha_0_4_2_release.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_08_17_083523_make_location_id_nullable.php

Added DB Prefix to Migrations

2014-10-23 11:47:46 +10:30

2014_10_16_200626_add_rtd_location_to_assets.php

Added default location to physical hardware

2014-10-16 17:41:56 -04:00

2014_10_24_000417_alter_supplier_state_to_32.php

Alter State to varchar(32) in Suppliers Table

2014-10-24 10:40:14 +10:30

2014_10_24_015641_add_display_checkout_date.php

Add display_checkout_date to settings table

2014-10-24 12:48:04 +10:30

2014_10_28_222654_add_avatar_field_to_users_table.php

Feature Avatars

2014-10-29 14:18:54 +10:30

2014_10_29_045924_add_image_field_to_models_table.php

Add images to models

2014-10-29 15:54:55 +10:30

2014_11_01_214955_add_eol_display_to_settings.php

Fixes #315 - add EOL as display option in settings (run migrations)

2014-11-01 18:38:24 -04:00

2014_11_04_231416_update_group_field_for_reporting.php

Fixes #237 - reporting-only group

2014-11-04 18:21:10 -05:00

2014_11_05_212408_add_fields_to_licenses.php

Add Fields to Licenses and Update Supplier for Licenses

2014-11-06 09:32:50 +10:30

2014_11_07_021042_add_image_to_supplier.php

Add image to supplier

2014-11-07 13:46:14 +10:30

2014_11_20_203007_add_username_to_user.php

Added username field for #377

2014-11-20 16:17:48 -05:00

2014_11_20_223947_add_auto_to_settings.php

Fixed #373 - added ability to auto-increment asset tags

2014-11-20 18:28:45 -05:00

2014_11_20_224421_add_prefix_to_settings.php

Fixed #373 - added ability to auto-increment asset tags

2014-11-20 18:28:45 -05:00

2014_11_21_104401_change_licence_type.php

Formattig fixes for #386

2014-11-21 06:10:30 -05:00

2014_12_09_082500_add_fields_maintained_term_to_licenses.php

Add migration to add maintained and termination_date fields to licenses table

2014-12-10 07:43:57 -06:00

2015_02_04_155757_increase_user_field_lengths.php

Fixes #488 - longer user jobtitle

2015-02-04 07:59:45 -08:00

2015_02_07_013537_add_soft_deleted_to_log.php

Added soft delete to asset log

2015-02-06 18:40:58 -08:00

2015_02_10_040958_fix_bad_assigned_to_ids.php

Fixed migration for to set assigned_to to null per #506

2015-02-10 18:41:45 -08:00

2015_02_10_053310_migrate_data_to_new_statuses.php

Fixes #502 - normalized statuses

2015-02-10 15:57:19 -08:00

2015_02_11_044104_migrate_make_license_assigned_null.php

Fix licenses so null instead of 0

2015-02-10 20:46:58 -08:00

2015_02_11_104406_migrate_create_requests_table.php

Requests table

2015-02-11 03:49:13 -08:00

2015_02_12_001312_add_mac_address_to_asset.php

Fixes #509 - added MAC address as model option

2015-02-11 16:37:24 -08:00

2015_02_12_024100_change_license_notes_type.php

Fix #475 and styling

2015-02-11 23:38:59 -05:00

2015_02_17_231020_add_localonly_to_settings.php

Fixes #439 - loads javascript and CSS locally

2015-02-17 15:29:57 -08:00

2015_02_19_222322_add_logo_and_colors_to_settings.php

Fixes #476 - added logo upload and header color

2015-02-19 15:14:50 -08:00

2015_02_24_072043_add_alerts_to_settings.php

Added expiring warrantee alerts

2015-02-24 02:07:33 -08:00

2015_02_25_022931_add_eula_fields.php

Fixed DB format for nullable EULA

2015-03-04 18:59:09 -08:00

2015_02_25_204513_add_accessories_table.php

Consumables section

2015-06-09 19:50:34 -07:00

2015_02_26_091228_add_accessories_user_table.php

More accessory relationships

2015-02-26 03:19:45 -08:00

2015_02_26_115128_add_deleted_at_models.php

Fixes #565 - Soft Delete Models and Allow Restore

2015-02-26 22:35:57 +10:30

2015_02_26_233005_add_category_type.php

Added category type

2015-02-26 15:48:44 -08:00

2015_03_01_231912_update_accepted_at_to_acceptance_id.php

Consumables section

2015-06-09 19:50:34 -07:00

2015_03_05_011929_add_qr_type_to_settings.php

Support for DATAMATRIX and PDF417 barcodes

2015-03-04 17:43:53 -08:00

2015_03_18_055327_add_note_to_user.php

Migration to add notes field to users

2015-03-18 16:47:52 +10:30

2015_04_29_234704_add_slack_to_settings.php

Slack integration for asset checkin/checkout

2015-04-29 17:38:22 -07:00

2015_05_04_085151_add_parent_id_to_locations_table.php

Fixes for #759 - location heirarchy

2015-05-04 02:50:42 -07:00

2015_05_22_124421_add_reassignable_to_licenses.php

Add licenses.reassignable migration

2015-05-22 14:11:36 +01:00

2015_06_10_003314_fix_default_for_user_notes.php

Added table prefix for raw queries

2015-06-19 18:03:28 -07:00

2015_06_10_003554_create_consumables.php

Consumables section

2015-06-09 19:50:34 -07:00

2015_06_15_183253_move_email_to_username.php

Added table prefix for raw queries

2015-06-19 18:03:28 -07:00

2015_06_23_070346_make_email_nullable.php

Fix email field so it's nullable, fix app command to add user

2015-06-23 00:11:54 -07:00

2015_06_26_213716_create_asset_maintenances_table.php

Fixed all issues that were reported by @leobg

2015-07-20 21:34:19 -04:00

2015_07_04_212443_create_custom_fields_table.php

Okay, most migrations are kinda-sorta working now, but validations aren't

2015-10-20 20:26:18 -07:00

2015_07_09_014359_add_currency_to_settings_and_locations.php

Migration for location-specific currency, updated views for #819

2015-07-08 20:35:40 -07:00

2015_07_21_122022_add_expected_checkin_date_to_asset_logs.php

Create Expected Checkin Date Column

2015-07-23 11:55:35 +09:30

2015_07_24_093845_add_checkin_email_to_category_table.php

Add Checkin_email to Catergories Table

2015-07-24 10:20:50 +09:30

2015_07_25_055415_remove_email_unique_constraint.php

Remove unique constraint on email

2015-07-24 23:05:11 -07:00

2015_07_29_230054_add_thread_id_to_asset_logs_table.php

Change to #1174 - pull other functions out of if statement

2015-09-14 21:52:51 -07:00

2015_07_31_015430_add_accepted_to_assets.php

First rough pass at asset acceptance report

2015-08-07 18:50:55 -04:00

2015_09_09_195301_add_custom_css_to_settings.php

Added custom CSS field in settings

2015-09-09 13:17:36 -07:00

2015_09_21_235926_create_custom_field_custom_fieldset.php

Terribly rough Custom Fields creation

2015-10-22 00:38:07 -07:00

2015_09_22_000104_create_custom_fieldsets.php

Okay, most migrations are kinda-sorta working now, but validations aren't

2015-10-20 20:26:18 -07:00

2015_09_22_003321_add_fieldset_id_to_assets.php

Okay, most migrations are kinda-sorta working now, but validations aren't

2015-10-20 20:26:18 -07:00

2015_09_22_003413_migrate_mac_address.php

Terribly rough Custom Fields creation

2015-10-22 00:38:07 -07:00

2015_09_28_003314_fix_default_purchase_order.php

Fixed #1205 set default nullable in purchase order for strict mode

2015-09-28 14:08:45 -07:00

2015_10_01_024551_add_accessory_consumable_price_info.php

Created the migration, copied view stuff from asset edit to acc. and consumable.

2015-09-30 22:44:55 -05:00

2015_10_12_192706_add_brand_to_settings.php

Added option to select brand type text or logo or text + logo

2015-10-12 20:34:12 +02:00

2015_10_22_003314_fix_defaults_accessories.php

Fixes default value for strict mode

2015-10-22 00:17:45 -07:00

2015_10_23_182625_add_checkout_time_and_expected_checkout_date_to_assets.php

Migration to add last_checkout and expected_checkin fields to Asset

2015-10-23 17:40:04 -07:00

2015_11_05_061015_create_companies_table.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

2015_11_05_061115_add_company_id_to_consumables_table.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

2015_11_05_183749_image.php

Small changes for PR #1330

2015-11-11 15:56:01 -08:00

2015_11_06_092038_add_company_id_to_accessories_table.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

2015_11_06_100045_add_company_id_to_users_table.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

2015_11_06_134742_add_company_id_to_licenses_table.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

2015_11_08_035832_add_company_id_to_assets_table.php

Add initial support for multiple companies

2015-11-07 15:22:10 +03:00

2015_11_08_222305_add_ldap_fields_to_settings.php

Fixes null value for LDAP settings

2015-11-23 14:11:55 -08:00

2015_11_15_151803_add_full_multiple_companies_support_to_settings_table.php

Add full multiple companies support

2015-11-16 06:03:27 +03:00