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
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
cc17862eae
Back out the encryption constructor for now
2015-11-23 18:18:49 -08:00
c80f1789d4
Set default hasher in constructor
2015-11-23 17:43:53 -08:00
86a174201e
Only users with no company or supers can manage users' companies
2015-11-21 04:30:15 +03:00
7a03a56498
Fix: company field required
2015-11-21 03:59:12 +03:00
e82ede5d44
Fix: some Company functions throw when seeding the DB
2015-11-19 09:44:06 +03:00
e91a22fce0
Fix assumeng Setting::getSettings() is not null in Company
...
Breaks the TravisCI build:
> php artisan db:seed --no-interaction -vvv
[ErrorException]
Trying to get property of non-object
2015-11-19 09:32:36 +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
a598fdcb59
Add global scope for companyable children
2015-11-19 08:03:19 +03:00
177fadba8a
Add better scoping for companayable children
2015-11-19 07:41:32 +03: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
ced2a99031
Add Eloquent global scope for companayables
2015-11-18 09:29:35 +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
999910f31f
Fix 'use' used with non-compound
...
Fix "The use statement with non-compound name '{Lang,Sentry,Setting}' has no effect"
2015-11-18 05:35:27 +03: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
23d10a8f7f
Make company field optional
...
Company field is now optional for the user,
although still required in the controllers.
2015-11-13 09:19:18 +03: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
6e117efebd
Fixed dumb indenting
2015-11-03 23:58:12 -08:00
a587b72c71
Fixed dumb indenting
2015-11-02 20:11:26 -08:00
0745ec1502
Fixed scope for users
2015-11-02 19:26:10 -08:00
9731727095
Sorting for #1266
2015-11-02 19:17:20 -08:00
769fb13282
Search on manager name for #1266
2015-11-02 18:37:16 -08:00
a9e1283a17
Added search on location parent for #1266
2015-11-02 18:36:49 -08:00
d0eed67c42
Fixed relationship to return actual assets
2015-11-02 17:41:33 -08:00
8ec6b7e03a
Basic location ordering for #1266
2015-10-23 21:19:22 -07:00
8a1ffb9014
Save de-normed values for last checkout and expected_checkin
2015-10-23 17:55:03 -07:00
f0557f8e1c
Added expected Checkin scope
...
Neither this nor the methd above actually work tho. Need to spend some time on the complex joins and sorting
2015-10-23 15:25:02 -07:00
60370b9627
Added acceptance methods back in
2015-10-22 03:10:43 -07:00
a3f5dc331d
Fixes #1007 and #1053
2015-10-22 02:11:39 -07:00
9d6608c8f1
Asset maintenances for #1266
2015-10-21 22:19:02 -07:00
7a306cd0f0
Depreciations bootstrap tables for #1266
2015-10-21 19:43:09 -07:00
0b87357f3b
Search text method for #1266
2015-10-21 19:10:00 -07:00
f761b2e953
Suppliers for #1266
2015-10-21 19:09:20 -07:00
e03f07bb44
Manufacturers for #1266
2015-10-21 19:09:02 -07:00
d1192095d0
Fix for showing deleted items
2015-10-21 18:05:27 -07:00
b18be5aee8
Fixed relationshop again?
2015-10-21 16:14:15 -07:00
7dc0039c3b
Fixed parent relationship
2015-10-21 16:01:54 -07:00
b5b8865b36
Locations in bootstrap tables for #1266
2015-10-21 15:43:12 -07:00
4e3c196664
Manager search for #1266
2015-10-21 14:49:09 -07:00
27735a8821
Asset model text search for #1266
2015-10-21 14:48:59 -07:00
21982a1d51
Additional fields for text search on licenses
2015-10-21 13:14:56 -07:00
dfca1386ac
Accessories bootstrap tables for #1266
2015-10-21 13:05:14 -07:00
644cfee086
Merge branch 'develop-bootstrap-tables-integration' of github.com:snipe/snipe-it into develop-bootstrap-tables-integration
2015-10-20 21:51:23 -07:00
c346dbaff6
Location search, deleted users for #1266
2015-10-20 21:50:58 -07:00
07f1c5774e
Add scopeTextSearch
2015-10-21 14:31:26 +10:30
snipe