Commit Graph

92 Commits

Author SHA1 Message Date
Abdullah Alansari 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
Abdullah Alansari 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
Abdullah Alansari 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
Abdullah Alansari 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
snipe 0c830fa564 Added hidden ID column 2015-10-21 19:08:30 -07:00
snipe b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration
# Conflicts:
#	.gitignore
#	app/controllers/admin/AccessoriesController.php
#	app/controllers/admin/AssetsController.php
#	app/controllers/admin/LicensesController.php
#	app/models/Accessory.php
#	app/models/Asset.php
#	app/routes.php
#	app/views/backend/accessories/index.blade.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/hardware/index.blade.php
#	app/views/backend/licenses/index.blade.php
2015-10-20 17:52:02 -07:00
snipe 4c662b7136 Fixes #1196 - added licensed to name and email in list view 2015-09-25 16:56:12 -07:00
madd15 a365cdc2cc Switch to new method 2015-08-25 16:34:51 +09:30
snipe d47198086f Added notes search to licenses 2015-08-19 17:23:55 -07:00
snipe 3c730c691b Fixes #1010 - better errors on large file uploads 2015-08-04 12:45:17 -07:00
snipe 9184dd5303 Fix for sad action column with button wrapping 2015-07-27 15:28:41 -07:00
madd15 7aba5f3a84 Request #961 - Clone button on license list view 2015-07-28 07:33:51 +09:30
snipe fdee3ee93e Merge pull request #933 from madd15/patch-4
#916 - Change Userlist identifier from email to username
2015-07-23 16:16:02 -07:00
madd15 abfb5bcd2e Change user list from email to username 2015-07-20 10:19:03 +09:30
madd15 78a45d72d7 Add reassignable to create 2015-07-18 10:53:51 +09:30
madd15 31362f3e07 Change user list to include email address 2015-07-16 10:23:54 +09:30
madd15 8335f10f8c Add Checkout Button 2015-07-07 12:38:53 +09:30
madd15 f363e742e6 Add getFreeLicense
Picks free seat for license and redirects to checkout specific seat
2015-07-07 12:30:55 +09:30
Tom Castleman b161a38e9b Add licenses.reassignable migration
Implement licenses.reassignable

View edit for licenses.reassignable

Add licenses.reassignable to LicensesController

Disable Check In when !license->reassignable

Validate license check-in post
2015-05-22 14:11:36 +01:00
snipe 8207597a58 Slack integration for Licenses 2015-04-30 20:37:23 -07:00
Fei Song 1c2e5ecc0f Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error 2015-04-28 15:19:00 +08:00
madd15 8af799614e Update for dataTables 2015-03-19 16:52:52 +10:30
snipe cb171bcac5 Fixes #645 - adds zip and rar to filetype 2015-03-12 13:25:28 -07:00
snipe 1c333e4a24 Fixes #596 - better routes for checking in multiple items from user 2015-03-04 15:15:38 -08:00
snipe 3ba6e45011 Added Accessories scaffolding 2015-02-25 16:31:22 -08:00
snipe f57c61dd4d Possible fix for #518 - license count issue 2015-02-12 12:25:22 -08:00
snipe 11aa98d389 Removed extra comments 2015-02-11 00:43:38 -08:00
snipe ef696f8207 Update licenses to assigned to null if deleted 2015-02-11 00:29:16 -08:00
snipe 34032c73ce Fixed licenses so null instead of 0 2015-02-10 20:47:11 -08:00
snipe 29f5b7c5e3 Fixed datetime 2015-02-06 21:54:44 -08:00
snipe 3a9cb9ba7a Display uploaded files 2015-02-06 21:31:16 -08:00
snipe 6d0828bfe5 Delete file interface and routes 2015-02-06 20:42:40 -08:00
snipe f5efc368a5 Fixes #487 - maintained and purchase order in strict mode 2015-02-04 08:51:03 -08:00
snipe 95141d49ba Fixes #432 - add model name to checkout 2015-01-22 15:20:16 -08:00
snipe 548de1a1a2 Fixes #468 - updated ordering on license checkout 2015-01-22 13:03:07 -08:00
snipe 5e496672c6 Fixes #469 2015-01-22 12:54:22 -08:00
Svpernova09 3d1795e312 Add process handling of new maintained and termination_date fields to the licenses methods for creating and editing licenses. Also add array for getCreate and getEdit to easily display maintained options in drop down 2014-12-10 07:45:53 -06:00
madd15 7833d10006 Add Fields to Licenses and Update Supplier for Licenses 2014-11-06 09:32:50 +10:30
madd15 6315db7fd8 Allow checkout to user without asset 2014-11-03 15:35:04 +10:30
madd15 636eb29421 Change rule back to asset_id required_without 2014-10-30 09:33:31 +10:30
madd15 16420dafa9 Change paginate to get for Index
Fixes #261 - Pagination appears to work correctly after this change
2014-10-27 12:14:55 +10:30
snipe 4629875bdf Removed ID from listbox debugging 2014-08-15 20:16:19 -04:00
snipe 49c5607e1c Fixes #222 2014-08-15 20:05:48 -04:00
Cordeos Team 8d3d8c86b1 A0.4.3 add asset, license, user, model clone and artisan db migration 2014-08-12 17:25:07 +09:00
Cordeos Team 54c3dfbcce Added licence clone 2014-08-11 17:19:28 +09:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
Cordeos Team 87c2a4c9c0 initial commit 2014-08-10 16:42:40 +09:00
root cb8369e9de Initial QA Patch to fix errors
Add License
Add Asset
Show Deleted Users
License Assign
2014-08-08 00:03:12 +09:00
root d71a02982d Changes:
set new user create to active YES as default
Changed user password validation to 6-12 characters
Licenses controller removed asset_id from the INSERT column list
2014-08-05 13:36:47 +09:00
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00