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
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
a0fce2e0fb
Fixes #766
...
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
7d9c90f8dd
Only pull eula if set to use default in category
2015-04-01 08:51:40 +10:30
5d946b19cb
Fixed checkmodel at route level
2015-03-27 17:44:49 -07:00
605d0ed8e1
Moved checkModel into model from controller
2015-03-27 13:45:37 -07:00
35bbea3052
Fixes #688 - show model if no asset name
2015-03-24 17:08:15 -07:00
4243710378
Added location to new assets view
2015-03-14 01:30:12 -07:00
2244c60499
Added category to output
2015-03-13 20:32:47 -07:00
b2af86230a
Added fields
2015-03-12 19:52:03 -07:00
f27fb90457
Allow override of checkin/checkout date
...
TODO: fix error if someone enters non-date text
2015-03-04 18:59:45 -08:00
9f3edd701b
Fixes #565 - Soft Delete Models and Allow Restore
...
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
2015-02-26 22:35:57 +10:30
snipe