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
0b0b55619b
Fixes #1291 - Use current currency, or sane fallback
2015-11-02 20:06:06 -08:00
09bcb137c4
Ugly fix for preventing errors if there is an invalid model (therefore no category)
2015-10-23 21:22:42 -07:00
8ec6b7e03a
Basic location ordering for #1266
2015-10-23 21:19:22 -07:00
efddda8665
Fixed expected_checkin error on asset view
2015-10-23 18:28:06 -07:00
eb1335405b
Order by last_checkout and expected_checkin for #1266
2015-10-23 17:59:21 -07:00
2953b395f2
Added order number to allowed sort columns
2015-10-23 15:12:06 -07:00
60f403f555
Expected checkin is a date, not a datetime
2015-10-23 14:29:00 -07:00
cf49920564
Fixes #1235 - 24 hour format for log
2015-10-23 12:39:22 -07:00
63eca44789
Custom fields can be shown on the hardware list page. They can also
...
be searched for.
2015-10-22 03:33:27 -07:00
a67951fbce
Merge branch 'develop' into custom_fields
...
Conflicts:
app/controllers/admin/AssetsController.php
app/views/backend/hardware/index.blade.php
2015-10-22 02:30:30 -07:00
a3f5dc331d
Fixes #1007 and #1053
2015-10-22 02:11:39 -07:00
0f6de6a477
Asset editing works.
2015-10-22 01:06:35 -07:00
5890d26545
Terribly rough Custom Fields creation
2015-10-22 00:38:07 -07:00
1bdd5886e6
Select * because reasons
2015-10-21 23:58:07 -07:00
79a69d7633
return getEdit to correct method
2015-10-22 17:10:02 +10:30
4cb19d1aae
More eager loading, pass $statuslabel_types to view
2015-10-21 23:31:28 -07:00
bd418d1422
Eager load some models
2015-10-21 23:17:22 -07:00
0c830fa564
Added hidden ID column
2015-10-21 19:08:30 -07:00
58911cd10e
Use moar_scripts to limit unnecessary loading
2015-10-20 18:51:21 -07:00
9264e7bdc4
Fixed missing limit
2015-10-20 18:08:53 -07:00
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
e7f14f66dc
Fixes #1260 - removed domain from cli list
...
The web upload form is still in beta, and shouldn't be used in production. Still need to add email/username formatting options to the form.
2015-10-19 11:23:02 -07:00
76dc518846
Better output filename
2015-10-06 14:39:58 -07:00
d149fb1a0f
Change output file to text
2015-10-06 14:36:00 -07:00
9ba2779e5f
Simpler results output for now
2015-09-23 20:37:30 -07:00
snipe