77632cdfb0
Allow optional status change on checkin
2016-01-13 08:04:52 -08:00
76220b7884
Fixes #1601 - bulk update now honors un-requestable
2016-01-12 20:00:51 -08:00
bb88b85a02
Removed erroneous blade that led to confusing UX
2016-01-11 18:48:49 -08:00
962e7531a6
Fix for changing asset model from model with custom fields to one without
2016-01-06 18:04:55 -08:00
2f4e54c8a6
Merge remote-tracking branch 'origin/develop'
2015-12-30 15:47:00 -08:00
90340a7111
Merge pull request #1535 from dmeltzer/fix-1531-proper
...
Clear checkout and checkin fields when returning an asset.
2015-12-29 11:38:07 -08:00
aeeb273d4c
Merge pull request #1423 from thehereward/develop
...
TidyUp: Remove unreachable code.
2015-12-29 10:15:36 -08:00
5f6ba2a148
Clear the expected checkin and last checkout dates when checking an item back in. Fixes #1531
2015-12-28 12:41:24 -05:00
0cb3a9265e
Fix PHPDocs that contained incorrect params tags.
2015-12-24 11:20:05 +00:00
5967dbae64
Company helper, updated bulk view to show model number
2015-12-22 11:39:42 -08:00
f42a3c8918
Added company to bulk edit
2015-12-22 11:12:26 -08:00
ce1565a545
Re-commented mac address - bad merge :-/
2015-12-18 12:08:08 -05:00
ac5527e7d3
Merge branch 'hotfixes/custom_reports_fix' into develop
2015-12-18 12:06:35 -05:00
b20f4d245e
Fixes #1494 - uncommented mac_address fields
2015-12-17 20:09:47 -05:00
927c368235
Fix for weird location info in asset report
2015-12-17 19:37:20 -05:00
e1837069da
Allow bulk model update for #1462 , fixes #1442
2015-12-09 20:35:24 -08:00
599ea20d65
Fixes #1449 - full link to order number
2015-12-09 01:06:25 -08:00
6aa3e21b4c
TidyUp: Surpress errors on unreachable statements with link to discussion on github.
2015-12-04 08:09:01 +00:00
5bed0bd7ed
Fixes #1437 - set expected checkout correctly
2015-12-03 03:14:29 -08:00
b41461698d
Fix for error on asset create
2015-12-02 19:03:08 -08:00
3417d833ba
Save on create for custom fields
2015-12-02 17:12:17 -08:00
82a3560f27
Merge branch 'hotfixes/image_fix' into develop
2015-11-30 22:02:32 -08:00
e8ca98a37d
Fixes issue with assets without a model (which should never happen, but can occur from imports)
2015-11-30 22:01:42 -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
1efb1f7038
Remove MAC address fields since they are now custom fields
2015-11-26 13:42:13 -08:00
6708911d5d
Remove mac address (now custom field)
2015-11-26 13:33:01 -08:00
924f61fce9
Cache custom field listing for assets, custom fields are sortable
2015-11-25 16:09:16 -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
9624388522
Added company_list to clone asset
2015-11-25 03:19:13 -08:00
dad1ffb355
Specify table name in select to prevent id overwriting
2015-11-25 02:38:13 -08:00
c8c755f8c3
Fixed filename renaming
2015-11-24 19:38:13 -08:00
f6e2654609
Added searching on company name, ordering on company name for PR #1321
2015-11-24 11:47:34 -08: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
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
1a4926ce13
Sort by asset image for PR #1330
2015-11-11 15:57:41 -08:00
ab3871f678
Small changes for PR #1330
2015-11-11 15:56:01 -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
d1a306cfd8
Yay, asset image progress!
2015-11-09 08:25:29 -07: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
11c2fcd094
Remove new window target
2015-11-04 16:10:27 -07:00
b856e7f2c6
Make Model column a hyperlink to access the model page.
2015-11-04 15:55:41 -07:00
0a843fa856
OMFG really?
2015-11-04 00:18:22 -08:00
5a687f280f
One more currency tweak
2015-11-04 00:15:35 -08:00
4b2e7b9b06
Fixes #1013 - show location name on asset view page
2015-11-04 00:13:48 -08:00
6e117efebd
Fixed dumb indenting
2015-11-03 23:58:12 -08:00
2a43491792
Fixes #1291 on the asset view as well
2015-11-03 22:19:58 -08:00
snipe