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
463469e7c7
Added validation for notes
2015-08-12 22:34:35 -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
b22789aa59
Unbreaking the dashboard :(
2015-08-11 19:44:02 -07:00
4247904f19
Resolving hostname problems
2015-08-11 18:52:42 -07:00
4538bca29f
Allow 0 qty consumable
2015-08-11 14:34:54 -07:00
481b905331
Fixes #1045 - allow 0 value for accessories
2015-08-11 14:01:13 -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
afbe23c214
Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query
...
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
2015-08-07 18:50:55 -04:00
9540db424a
Fixes #948 - validate on model name+modelno+manufacturer combination
2015-08-06 05:58:50 -07:00
66991ea663
Fixes #1018 - allow name re-use if deleted
2015-08-05 13:57:04 -07:00
4082957c85
Added phpdocs to the model
2015-08-01 14:41:09 -04:00
24edf81b27
Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport
2015-08-01 12:29:29 -04:00
b195934a4a
Finished building out the report, and refactoring to make the code more expressive
...
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
794dc5998a
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-08-01 12:20:48 -04:00
8f68bdb318
Working through getting the dataset correctly from the asset logs so that we can generate a report
2015-08-01 12:17:13 -04:00
239f438a98
Added a scope to the Category model to pull back only categories that required acceptance
2015-08-01 12:14:21 -04: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
64bff852bd
Added a scope to the Model model to allow for selecting only models that belong to a list of categories
2015-08-01 12:14:20 -04:00
e560cc2ee2
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-07-31 19:29:44 -04:00
7876ae462c
Added the migration for the thread_id on the asset_logs table
...
Added the relationships for the self-referential links on thread_id
2015-07-29 19:16:57 -04:00
87c493bf12
Added the migration for the thread_id on the asset_logs table
...
Added the relationships for the self-referential links on thread_id
2015-07-29 19:10:59 -04:00
8c30c5d879
Fixed issue in routes file
2015-07-29 19:09:32 -04:00
d8df6a0982
Added a scope to the Category model to pull back only categories that required acceptance
2015-07-29 19:05:56 -04:00
d6382fb4a3
Added scope to the Asset model to pull all assets that belonged to a list of models
2015-07-29 19:05:56 -04:00
9772039c4f
Added a scope to the Model model to allow for selecting only models that belong to a list of categories
2015-07-29 19:05:56 -04:00
480fd78c51
Disllow delete if parent
2015-07-28 20:45:32 -07:00
0c9018289b
Fixes #970
2015-07-28 20:24:58 -07:00
26e081a2cb
Fixes #909 again, because math is super hard
2015-07-27 15:26:53 -07:00
f9c7022bcc
Add checkin_email()
2015-07-24 12:01:21 +09:30
60d05e1ae1
Add checkin_email()
2015-07-24 11:58:09 +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
2457003deb
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-07-20 21:16:06 -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
3aa3d67675
Fixed the need to only be a date instead of a date time
2015-07-20 21:03:00 -04:00
4b3267649a
Updated the Improvement and Supplier relationship
2015-07-20 21:02:31 -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
914b1cb628
Added the improvements table migration to create the improvements table
2015-07-20 21:01:33 -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
56345b5743
Fixes #909 - expired licenses showing in email report
2015-07-13 20:59:02 -07:00
aed7036595
Merge pull request #907 from madd15/user-fileuploads
...
Feature #746 - Add File Uploads to Users
2015-07-13 09:22:39 -07:00
9fbb9746bc
Merge pull request #895 from madd15/patch-1
...
Add Checkout of first available license to license list view
2015-07-13 09:22:18 -07:00
f04b3f9b09
Change to LicenseSeat
2015-07-10 10:02:46 +09:30
1e730078c1
Add file uploads to Users
2015-07-10 09:23:34 +09:30
e1724cf25f
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# .gitignore
# app/config/production/session.example.php
# app/config/staging/session.example.php
# app/config/version.php
# app/models/User.php
2015-07-09 01:02:49 -07:00
e9443a244c
Small fix to config value
2015-07-09 00:52:05 -07:00
snipe