3bbcbf5f47
Merge branch 'hotfixes/ldap_settings' into develop
2015-11-26 13:11:47 -08:00
989ce59a5b
Fixes #1399 - Import LDAP config into database
2015-11-26 13:10:28 -08:00
a212abee1d
Strip out stale comments
2015-11-25 15:30:06 -08:00
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
4ae02c1fb3
Merge pull request #1321 from Ahimta/multiple-companies
...
Add support for multiple companies
2015-11-23 14:40:37 -08:00
318b4b48c6
Fixes null value for LDAP settings
2015-11-23 14:11:55 -08:00
7a07c07e29
removed password insert to database
2015-11-23 16:16:05 -05:00
6ea3bedb9e
set decryption and set pword in migraiton
2015-11-22 23:08:18 -05:00
8e44421788
added Crypt class and set ldap_pword field to longText
2015-11-17 15:20:55 -05:00
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
b202e01205
Add full multiple companies support
...
Added as an option in settings.
When enabled, users (including admins) who are assigned
to companies have access only to their companies' assets.
2015-11-16 06:03:27 +03:00
7f9fab0055
adjusted settings
2015-11-15 21:42:49 -05:00
d8df61bd32
Merge remote-tracking branch 'upstream/develop' into multiple-companies
...
Conflicts:
app/controllers/admin/UsersController.php
app/views/backend/hardware/index.blade.php
2015-11-12 09:30:11 +03: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
6bf2a2875f
Add initial support for multiple companies
...
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0
https://github.com/snipe/snipe-it/issues/23
2015-11-07 15:22:10 +03: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
a67951fbce
Merge branch 'develop' into custom_fields
...
Conflicts:
app/controllers/admin/AssetsController.php
app/views/backend/hardware/index.blade.php
2015-10-22 02:30:30 -07:00
5890d26545
Terribly rough Custom Fields creation
2015-10-22 00:38:07 -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
20c35fd0bb
Okay, most migrations are kinda-sorta working now, but validations aren't
2015-10-20 20:26:18 -07:00
bdc0619016
Merge branch 'develop' into custom_fields
...
Conflicts:
app/helpers.php
2015-10-20 17:11:04 -07:00
273d838a42
Wide swing at custom fields
2015-10-20 17:06:07 -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
snipe