2f4e54c8a6
Merge remote-tracking branch 'origin/develop'
2015-12-30 15:47:00 -08:00
f89176d500
WTF I don't even.
2015-12-29 18:48:06 -08:00
0cb3a9265e
Fix PHPDocs that contained incorrect params tags.
2015-12-24 11:20:05 +00:00
3b7da8f379
Fix consumable count in categories. This adds new methods to Category, consumables consumablesCount and a generic count. It also refactors CatgoriesController to use the count method rather than having it determine the category type.
2015-12-23 20:02:09 -05:00
8dab50edc6
Fixes #1498 - better regex for characters in custom field name
2015-12-17 18:19:35 -05:00
775ea95458
Fix inability to edit models (unique constraint)
2015-12-15 05:35:14 -08:00
5c698d7cfd
Fixes #1469 - don't require currency at model level
2015-12-15 05:17:44 -08:00
cac254ded6
Fixes #1371 - problem saving new models with non-latin characters
2015-12-15 04:15:28 -08:00
be3c8e4515
Fixes #1440 - make employee number searchable/sortable
2015-12-03 02:07:20 -08:00
9316af7ed8
Deletion support for fields and fieldsets
2015-11-30 17:09:57 -08:00
8158c12242
Merge branch 'hotfixes/EOL' into develop
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-11-29 17:11:55 -08:00
36ecf3032f
Fixes #1402 - remoe warranty date from EOL calc
2015-11-29 17:09:02 -08:00
a44c56c937
Merge branch 'hotfixes/fix_1413' into develop
...
# Conflicts:
# app/config/version.php
# app/models/Company.php
2015-11-29 16:49:34 -08:00
078750726f
Set default value for company_id to fix seeder
2015-11-26 14:11:56 -08:00
b925c5766f
Set company_id to null if no logged in user to fix seeder
2015-11-26 14:03:29 -08:00
10086479b7
Better erroring, return previous input on error.
2015-11-25 20:38:22 -08:00
c0e988b6b1
Basic validation on customFieldset
2015-11-25 20:14:26 -08:00
c6f8d3e6f2
A little bit of basic, terrible navigation for Custom Fields.
2015-11-25 15:40:58 -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
99391d0179
Fixes #1332 - added location to accessories
2015-11-24 22:43:13 -08:00
b39c53a5ea
Closes #1375 - More data in consumables detail view
2015-11-24 21:58:30 -08:00
1202ce4a81
Compound search for consumables
2015-11-24 20:34:10 -08:00
406e077c1e
Fixed indenting
2015-11-24 20:34:00 -08:00
4be046a675
Fixes #1387 - adds server-side compound search
2015-11-24 20:33:51 -08:00
29bb6a3c4f
Fixed issue where deleted asset tags could not be re-used
...
This was by-design to start off with, since it would b weird to re-use an asset tag that legitimately belonged to someone else, however sometimes when assets are accidentally deleted and users don't restore them (or if there were weird duplicates), this can be problematic.
2015-11-24 20:20:28 -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
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
snipe