63cd0c1ae1
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
2015-11-17 10:11:38 -05:00
8793a04869
add ldap integration to settings page.
2015-11-17 09:59:20 -05:00
d72df21b3b
Update migration and blades
2015-11-16 16:31:43 -05:00
08d0fe5118
change tables from text to string/int
2015-11-16 13:21:00 -05:00
3e1e9b0077
syntax errors
2015-11-16 12:48:41 -05:00
50ea6c66f9
LDAP Settings update
...
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
2015-11-16 11:30:51 -05:00
0910d9cf8c
correct name of migration
2015-11-16 09:44:06 -05:00
7f9fab0055
adjusted settings
2015-11-15 21:42:49 -05:00
12912b3e27
adjusting the migration
2015-11-11 23:43:02 -05:00
ab3871f678
Small changes for PR #1330
2015-11-11 15:56:01 -08:00
464f11c398
setting up bones for ldap settings
...
add migration
add ldap settings to settings controller
add ldap fields edit settings views
2015-11-09 22:09:09 -05:00
4509631921
Add image column migration
2015-11-09 08:47:05 -07:00
750fc84592
Updated seeder with currency
2015-11-03 22:22:10 -08:00
9a5edb3db7
Migration to add last_checkout and expected_checkin fields to Asset
2015-10-23 17:40:04 -07:00
8ea40d4e6d
Fixes default value for strict mode
2015-10-22 00:17:45 -07:00
69c95f1f73
Merge pull request #1225 from ddreier/1088-acc-prices
...
Accessory and Consumable Price info #1088
2015-10-21 22:44:14 -07:00
a6586b5919
Added option to select brand type text or logo or text + logo
2015-10-12 20:34:12 +02:00
3ecfff94ef
Created the migration, copied view stuff from asset edit to acc. and consumable.
2015-09-30 22:44:55 -05:00
d15ef5c79d
Addd user_id to suppliers seeder
2015-09-28 16:32:56 -07:00
10909a21cd
Fixes #1206 - updated seeder with is_warranty value
2015-09-28 16:30:51 -07:00
141c77fed7
Fixed #1205 set default nullable in purchase order for strict mode
2015-09-28 14:08:45 -07:00
3719f9a5a8
Added supplier ID to asset seeder
2015-09-15 03:45:00 -07:00
f9dc5766a7
Suppliers seeder
2015-09-15 03:41:37 -07:00
c6b6ccc814
More seeders
2015-09-15 03:31:20 -07:00
a2f6d8f72e
Change to #1174 - pull other functions out of if statement
2015-09-14 21:52:51 -07:00
39f82e546f
Fixes #1174 - broken migration if asset_logs table has uploads
2015-09-14 21:40:05 -07:00
650f86406d
Added custom CSS field in settings
2015-09-09 13:17:36 -07:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
afbe23c214
Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query
...
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
2015-08-07 18:50:55 -04:00
eb00acddfd
Trying to fix the broken migration
2015-08-04 14:55:10 -07:00
b20fecc2de
Make thread_id default null
2015-08-03 12:35:54 -07:00
c74c89a171
Fixed the migration for adding thread_id to correct the table name and make thread_id nullable
2015-07-30 21:02:57 -04:00
87c493bf12
Added the migration for the thread_id on the asset_logs table
...
Added the relationships for the self-referential links on thread_id
2015-07-29 19:10:59 -04:00
ac5dd0dbf9
Remove unique constraint on email
2015-07-24 23:05:11 -07:00
f154692dad
Add Checkin_email to Catergories Table
2015-07-24 10:20:50 +09:30
0de1d45492
Merge pull request #944 from madd15/Feature/Additional-Email-Info
...
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
2015-07-23 16:16:19 -07:00
878a163d11
Create Expected Checkin Date Column
2015-07-23 11:55:35 +09:30
d1d6fe26a6
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
5ee4eb5871
Update the migration to fix an issue with the improvement_time so it would be an integer
...
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-07-20 21:15:46 -04:00
0f5b8b5a90
Needed to fix nullable issues
2015-07-20 21:03:22 -04:00
69a5c99396
Fixed the datetime fields to be date fields only
2015-07-20 21:03:12 -04:00
3a3c021a6a
One last fix to the migration to add the supplier relationship
2015-07-20 21:02:41 -04:00
3e2bd02ce5
Fixed issue with migration that left off the deleted_at field
2015-07-20 21:02:04 -04:00
2f83f2aa52
Updated migration to reflect relation to the asset
2015-07-20 21:01:48 -04:00
914b1cb628
Added the improvements table migration to create the improvements table
2015-07-20 21:01:33 -04:00
c683c1c57e
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
...
This reverts commit 41b711740a55309bfaef
2015-07-20 17:12:28 -07:00
41b711740a
Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
...
# Conflicts:
# app/controllers/admin/ReportsController.php
# app/lang/en/general.php
# app/routes.php
# app/views/backend/hardware/view.blade.php
# app/views/backend/layouts/default.blade.php
# composer.lock
2015-07-20 16:12:35 -07:00
84ffc1a728
Migration for location-specific currency, updated views for #819
...
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
1b423f5b54
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-06 10:36:54 -04:00
b7f050aa3b
Update the migration to fix an issue with the improvement_time so it would be an integer
...
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-06-27 17:15:23 -04:00
Wahlstedt, Walter