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
f8be47dfbf
Fixes #903 - adds config variable for multi_login, overrides Sentry method
2015-07-09 00:41:46 -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
38c36699a7
Add freeSeat function
2015-07-07 12:32:33 +09:30
1edce0a4fa
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-06 19:29:22 -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
1301119c9a
Remove unique from modelno validation rule
2015-07-07 09:50:43 +09:30
f855bfd4ef
Better error checking for eol data
2015-07-06 14:09:48 -07:00
674348b5a5
Smaller text requirement for address2
2015-07-06 14:06:31 -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
bb7ce83c48
Merge remote-tracking branch 'origin/develop' into 2.0
2015-06-30 22:42:00 -07:00
95920be8ea
Fixed weird commenting
2015-06-30 22:04:05 -07:00
b2847811ef
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-06-27 17:42:15 -04:00
c90ea92a4e
Added all of the functionality for the Improvement to be linked to the Asset
2015-06-27 14:37:40 -04:00
c59c5e35f8
Fixed the need to only be a date instead of a date time
2015-06-27 13:15:08 -04:00
0c63dac5e7
Updated the Improvement and Supplier relationship
2015-06-27 12:41:16 -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
255a492db6
Added the improvements table migration to create the improvements table
2015-06-27 10:51:22 -04:00
fc1e8a4e4e
Minor comment tweak
2015-06-23 15:05:21 -07:00
28a9f90a72
Lazy eager load history for optimized queries
2015-06-23 13:44:49 -07:00
d94cc1f17d
Add consumables log
2015-06-23 11:52:07 -07:00
94f8c61720
Fixes #280 , #64 and #860 - added license expiration alert
2015-06-23 01:52:06 -07:00
818d1769b8
Automated backup to dump SQL and zip uploaded files
...
Usage:
`php artisan snipeit:backup`
This can be set on a cron or scheduled task
2015-06-22 15:52:26 -07:00
d0189fb076
Added consumables to user matrix for #782
2015-06-09 20:05:24 -07:00
19604480bb
Consumables section
...
TODO:
- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
snipe