120c8394bb
Fixes #1380 - groups pagination
2015-11-23 19:18:00 -08:00
cc17862eae
Back out the encryption constructor for now
2015-11-23 18:18:49 -08:00
c24f1721d7
Bumped version
2015-11-23 17:44:00 -08:00
c80f1789d4
Set default hasher in constructor
2015-11-23 17:43:53 -08:00
4a49e6f471
Added popover code
2015-11-23 17:43:43 -08:00
e9f4be711a
Added required fields
2015-11-23 17:43:35 -08:00
1bccb6127e
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-11-23 15:18:22 -08:00
61107769e8
Add user ID and make company name hidden by default
2015-11-23 15:18:10 -08:00
4e96a5a793
Merge pull request #1374 from vabue/features/ukrainian-currency
...
Add ukrainian and russian currencies for #1373
2015-11-23 15:17:24 -08:00
f87a25bf3f
Moved company down further, since it's not used as often
2015-11-23 14:44:08 -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
318b4b48c6
Fixes null value for LDAP settings
2015-11-23 14:11:55 -08:00
329a2282e4
Merge pull request #1357 from merid14/features/ldap-settings
...
Features/ldap settings
2015-11-23 14:10:44 -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
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
6b26640077
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
2015-11-22 11:01:07 -05:00
964d2bc463
Add ukrainian and russian currencies for #1373
2015-11-22 17:50:08 +02:00
e4a634a8a3
Merge remote-tracking branch 'upstream/develop' into multiple-companies
2015-11-21 11:27:00 +03: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
7a03a56498
Fix: company field required
2015-11-21 03:59:12 +03:00
01b574069a
Fixes #1362 - status labels losing type on edit
2015-11-20 09:20:14 -08:00
cc930fc5b8
Fixed links to getting help and common issues
2015-11-20 09:19:45 -08:00
67a58221eb
Fixes #1368 - typos in installer
2015-11-20 07:30:40 -08: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
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
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
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
73a183677d
Revert "add escaping to ldap fields in blades"
...
This reverts commit 1d24450dcd
2015-11-17 16:12:24 -05:00
snipe