1efb1f7038
Remove MAC address fields since they are now custom fields
2015-11-26 13:42:13 -08:00
6708911d5d
Remove mac address (now custom field)
2015-11-26 13:33:01 -08:00
924f61fce9
Cache custom field listing for assets, custom fields are sortable
2015-11-25 16:09:16 -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
2195e27d61
Added company_list to license clone
2015-11-25 03:48:05 -08:00
9624388522
Added company_list to clone asset
2015-11-25 03:19:13 -08:00
dad1ffb355
Specify table name in select to prevent id overwriting
2015-11-25 02:38:13 -08:00
64eecc8df7
Added image to model listing view for #1370
2015-11-24 23:24:20 -08:00
632fa92f92
Fixes #1333 - hide checkout button if asset status is not deployable
2015-11-24 22:49:31 -08:00
99391d0179
Fixes #1332 - added location to accessories
2015-11-24 22:43:13 -08:00
d34e7178b3
Order consumable assignments by most recent
2015-11-24 22:18:28 -08:00
0428d21c5e
Order consumable assignments by most recent
2015-11-24 22:18:16 -08:00
d8b43215b0
Fix for missing admin ID
2015-11-24 22:00:29 -08:00
b39c53a5ea
Closes #1375 - More data in consumables detail view
2015-11-24 21:58:30 -08:00
67e968b032
Fixed attach() timestamps
2015-11-24 21:52:29 -08:00
535263788d
Fixed dumb indenting
2015-11-24 20:20:34 -08:00
c8c755f8c3
Fixed filename renaming
2015-11-24 19:38:13 -08:00
e910b532c7
Account for invalid categories
2015-11-24 13:31:54 -08:00
a777499c0b
Fixes #1376 - added new fields to consumables view
2015-11-24 13:30:05 -08:00
b99c138cb0
Fixes #1369 - fixed searching/sorting on location
2015-11-24 12:48:41 -08:00
cbb2151f1a
Allow re-use of usernames
2015-11-24 12:29:25 -08:00
256f33e6b4
Company/category search on accessories
2015-11-24 12:08:49 -08:00
f6e2654609
Added searching on company name, ordering on company name for PR #1321
2015-11-24 11:47:34 -08:00
120c8394bb
Fixes #1380 - groups pagination
2015-11-23 19:18:00 -08:00
61107769e8
Add user ID and make company name hidden by default
2015-11-23 15:18:10 -08:00
4ae02c1fb3
Merge pull request #1321 from Ahimta/multiple-companies
...
Add support for multiple companies
2015-11-23 14:40:37 -08:00
9ec132acde
Small fixed for LDAP in settings table
2015-11-23 14:33:00 -08:00
840e5b1523
Revert "begin work on idap import button"
...
This reverts commit 3942fd1869
2015-11-22 11:10:36 -05:00
1ee3f29d2e
Revert "working on ldap import button"
...
This reverts commit 113dfc9c24
2015-11-22 11:02:19 -05:00
5445a7d16b
Scope users like other companyables
...
Note that the User model doesn't use global scope,
global models can have unexpected results that
would very likely break many parts of the application
2015-11-21 11:23:42 +03:00
86a174201e
Only users with no company or supers can manage users' companies
2015-11-21 04:30:15 +03:00
fe44846c1b
Fix: only super users can change multiple companies support option
2015-11-19 09:17:50 +03:00
dbdc2c8e64
Fix some typos (e.g: companayable)
2015-11-19 08:48:43 +03:00
e66e2e42d3
Use global scope for companyable children
2015-11-19 08:42:17 +03:00
177fadba8a
Add better scoping for companayable children
2015-11-19 07:41:32 +03:00
638a7773bd
syntax error
2015-11-18 16:36:02 -05:00
113dfc9c24
working on ldap import button
...
add route for button
added button and open/close for form
2015-11-18 16:22:04 -05:00
3942fd1869
begin work on idap import button
2015-11-18 12:11:42 -05:00
d2423b2fc8
Show company name for the remaining entities
2015-11-18 19:15:56 +03:00
08781a561b
Fix: use global scope for companies support
...
Use Eloquent ORM global scope instead of using
Company::scopeCompanayables() all over the place.
In addition, this makes it harder to for a user
that is assigned to a company to access unauthorized
assets through other entities (e.g: license seats)
2015-11-18 16:49:34 +03:00
0a97c626e7
Fix $inout used when undefined
2015-11-18 07:16:53 +03:00
6478425be6
Fix dashboard shows all companies
...
Fix dashboard page shows statistics of all companies
even when the user is assigned to a company
and full multiple companies support is enabled
2015-11-18 06:14:08 +03:00
6f338e573c
set required_if ldap_enabled box has been checked.
2015-11-17 16:00:52 -05:00
8e44421788
added Crypt class and set ldap_pword field to longText
2015-11-17 15:20:55 -05:00
e031239cf0
Removed escaping, add sometimes required, add encrypt ldap password
2015-11-17 13:49:59 -05:00
c8ecddba54
Revert "Set required fields if ldap is enabled"
...
This reverts commit 2f69be03d3
2015-11-17 10:47:59 -05:00
2f69be03d3
Set required fields if ldap is enabled
2015-11-17 10:46:29 -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
2ec5f340e8
update validators and lang
2015-11-16 13:08:51 -05:00
snipe