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
4be046a675
Fixes #1387 - adds server-side compound search
2015-11-24 20:33:51 -08:00
29bb6a3c4f
Fixed issue where deleted asset tags could not be re-used
...
This was by-design to start off with, since it would b weird to re-use an asset tag that legitimately belonged to someone else, however sometimes when assets are accidentally deleted and users don't restore them (or if there were weird duplicates), this can be problematic.
2015-11-24 20:20:28 -08:00
f6e2654609
Added searching on company name, ordering on company name for PR #1321
2015-11-24 11:47:34 -08:00
7a03a56498
Fix: company field required
2015-11-21 03:59:12 +03:00
dbdc2c8e64
Fix some typos (e.g: companayable)
2015-11-19 08:48:43 +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
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
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
a587b72c71
Fixed dumb indenting
2015-11-02 20:11:26 -08:00
8ec6b7e03a
Basic location ordering for #1266
2015-10-23 21:19:22 -07:00
8a1ffb9014
Save de-normed values for last checkout and expected_checkin
2015-10-23 17:55:03 -07:00
f0557f8e1c
Added expected Checkin scope
...
Neither this nor the methd above actually work tho. Need to spend some time on the complex joins and sorting
2015-10-23 15:25:02 -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
60370b9627
Added acceptance methods back in
2015-10-22 03:10:43 -07:00
a3f5dc331d
Fixes #1007 and #1053
2015-10-22 02:11:39 -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
fcec12f3b2
Allow asset-level EOL to override model level if given
2015-09-14 15:48:42 -07:00
a27a98f4b3
Fixes #1081- include asset name on checkout
2015-08-19 11:13:51 -07:00
c5e5930c1b
Make sure lock passwords isn't true before emailing
2015-08-13 00:54:57 -07:00
738e253375
Fixed Slack notifier
2015-08-12 18:37:48 -07:00
f7874ec106
Refactored assets controller and model for cleaner code
2015-08-12 18:19:53 -07:00
3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
b9e3dd10b4
Additional Search and Order
2015-08-07 09:42:49 +09:30
66991ea663
Fixes #1018 - allow name re-use if deleted
2015-08-05 13:57:04 -07:00
41127bf5dd
Added scope to the Asset model to pull all assets that belonged to a list of models
2015-08-01 12:14:21 -04:00
0fcf33ed8c
MOAR SEARCH
2015-07-30 15:22:58 +09:30
78e0af383d
Fix user firstname/lastname search
2015-07-30 14:08:03 +09:30
e66ea4dcd1
Build out search and add Model order scope
2015-07-30 13:45:46 +09:30
22be076504
More experiments
2015-07-27 22:39:47 -07:00
f9c7022bcc
Add checkin_email()
2015-07-24 12:01:21 +09:30
d1d6fe26a6
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
e479575825
Added all of the functionality for the Improvement to be linked to the Asset
2015-07-20 21:11:17 -04:00
1c4190bf22
Added the relation to the improvement to the model, so that we can reference these items
2015-07-20 21:02:21 -04:00
c683c1c57e
Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking"
...
This reverts commit 41b711740a55309bfaef
2015-07-20 17:12:28 -07:00
41b711740a
Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking
...
# Conflicts:
# app/controllers/admin/ReportsController.php
# app/lang/en/general.php
# app/routes.php
# app/views/backend/hardware/view.blade.php
# app/views/backend/layouts/default.blade.php
# composer.lock
2015-07-20 16:12:35 -07:00
4a5066054b
Display bugfixes for #819
2015-07-08 22:38:35 -07:00
84ffc1a728
Migration for location-specific currency, updated views for #819
...
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
74429d9075
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/lang/en/general.php
# app/start/artisan.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
7da7907fbd
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-06 19:29:06 -07:00
f855bfd4ef
Better error checking for eol data
2015-07-06 14:09:48 -07:00
1b423f5b54
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-06 10:36:54 -04:00
7d5810b656
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/config/version.php
# app/controllers/admin/AssetsController.php
2015-07-02 17:23:06 -07:00
552bdfdc2d
Switched defaultLoc to belongsTo relationship
2015-07-02 16:51:52 -07:00
c90ea92a4e
Added all of the functionality for the Improvement to be linked to the Asset
2015-06-27 14:37:40 -04:00
3a86c53b49
Added the relation to the improvement to the model, so that we can reference these items
2015-06-27 12:27:15 -04:00
fc1e8a4e4e
Minor comment tweak
2015-06-23 15:05:21 -07:00
94f8c61720
Fixes #280 , #64 and #860 - added license expiration alert
2015-06-23 01:52:06 -07:00
Brady Wetherington