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
31ecd165a3
Merge remote-tracking branch 'upstream/develop' into multiple-companies
2015-11-19 09:24:57 +03:00
fe44846c1b
Fix: only super users can change multiple companies support option
2015-11-19 09:17:50 +03:00
c708a24657
Restrict backups to super users
2015-11-19 09:13:20 +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
2b26fd7e20
Fixed string in gh-changelog
2015-11-18 14:29:29 -08:00
7a0598dfc3
Pulled naughty language from changelog
2015-11-18 13:56:13 -08:00
5ebb267a53
Updated changelog script
2015-11-18 13:52:57 -08: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
8fb7d82bab
Fix no admin/consumables route
2015-11-18 16:46:29 +03:00
ced2a99031
Add Eloquent global scope for companayables
2015-11-18 09:29:35 +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
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
21a280676b
Merge pull request #1356 from merid14/develop
...
Set default to not seed DB
2015-11-17 09:34:38 -08:00
7e8a0af6e5
Set default to not seed DB
2015-11-17 10:12:26 -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
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
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
2afc252549
Link to category listing from accessories
2015-11-11 17:43:24 -08:00
aa05d041bd
Fixes #1324 - missing $inout variable when if/else not met
2015-11-11 17:22:28 -08:00
bbe0189be2
CSS for max image size on asset view
2015-11-11 16:06:17 -08:00
a0599712a6
Show model image if available and no asset image
2015-11-11 16:06:07 -08:00
1a4926ce13
Sort by asset image for PR #1330
2015-11-11 15:57:41 -08:00
3c8959e92d
Bumped version
2015-11-11 15:56:10 -08:00
ab3871f678
Small changes for PR #1330
2015-11-11 15:56:01 -08:00
7297a6031e
Merge pull request #1330 from mtucker6784/develop
...
Images for devices on the Assets datatable page.
2015-11-11 15:51:31 -08:00
75bd29b027
Added cookie expiration for sorting/filtering
2015-11-11 14:50:17 -08:00
b77b9c0434
Merge pull request #1323 from merid14/develop
...
Enhancements for installer
2015-11-10 18:02:47 -08:00
b9c36f8638
Fixes #1335 - editing maintenance
2015-11-10 18:02:06 -08:00
90009db1b5
Image is now recorded upon initial asset creation.
2015-11-09 12:01:31 -07:00
d7f8d0fc04
Changed image save location in AssetsController
2015-11-09 09:35:10 -07:00
effad46cc0
create assets image directory
2015-11-09 09:16:53 -07:00
4509631921
Add image column migration
2015-11-09 08:47:05 -07:00
d1a306cfd8
Yay, asset image progress!
2015-11-09 08:25:29 -07:00
2de4741170
Add password confirmation, hide password and set default database seed to no
2015-11-07 22:21:07 -05:00
fc609ece12
Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop
2015-11-07 22:13:48 -05:00
a8da68d3fd
Fixes #1320 - added name for cookie table
2015-11-07 15:53:39 -08:00
ef7c7da4e5
Merge pull request #1302 from merid14/develop
...
Reworked the Installer
2015-11-07 15:42:06 -08:00
306d8ebaf7
Fixes #1317 - regression issue in bulk delete
2015-11-07 15:40:25 -08:00
250880c6f3
Include default text in status label helper
2015-11-07 15:39:03 -08: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
9f43b6af9f
fixed apache config file
2015-11-06 15:17:54 -05:00
a47a4e83e2
fixed issues with sed command and /
2015-11-06 11:53:07 -05:00
ca1384504a
fixed tzone variable assignment
2015-11-06 10:03:58 -05:00
Abdullah Alansari