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
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
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
d92e2eaebc
Method for assigned asset locations
2015-05-07 18:21:27 -07:00
2d7a348ab7
Fixed multi-level array nesting for locations
2015-05-07 00:15:44 -07:00
139dd13392
Super janky miulti-level menu on create - TODO: Fix this ish.
2015-05-04 18:13:26 -07:00
c487beeaca
Asset counter for #759 (needs more work)
2015-05-04 03:05:22 -07:00
f463cd6c8d
Fixes for #759 - location heirarchy
2015-05-04 02:50:42 -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
551b5c42d8
"Years" turn out to be 12 times longer than months, apparently
2015-04-08 16:36:06 -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
4aa4e7c9fc
Fix error if user is not in throttle table
2015-03-18 17:11:34 +10:30
61e6d55bcf
Merge pull request #669 from madd15/patch-1
...
Fix scopeGetDeleted - Missing withTrashed()
2015-03-17 15:36:51 -07:00
c00086c740
Fix eager loading for user throttle
2015-03-17 15:36:11 -07:00
e01b1b3935
Fix scopeGetDeleted - Missing withTrashed()
2015-03-18 09:04:51 +10:30
46c1f2a28b
Server side datatables for user view - needs fix for deleted users
2015-03-16 17:33:41 -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
61b04d6e40
Fixes #579 - user cannot accept more than once
2015-03-01 16:35:32 -08:00
1273c4ca87
EULA/req improvements
2015-02-26 18:20:52 -08:00
04735f1aff
Fixed assetlog display
2015-02-26 17:04:21 -08:00
231e465898
Added category types to view
2015-02-26 16:00:52 -08:00
afe2eb736c
Added category type
2015-02-26 15:48:44 -08:00
c0c563b1c7
Fixes accessory relationshop for pivot
2015-02-26 15:25:08 -08:00
430b8233ed
Fixed user relationship
2015-02-26 15:24:51 -08:00
4ef2dd0c7e
Remove unused trashedAssets()
2015-02-27 08:42:53 +10:30
5010720a97
Fixed accessory relationship
2015-02-26 14:07:52 -08:00
efaf067b94
Fixed user relationship
2015-02-26 14:07:39 -08:00
6efd268004
Disable checkouts if there are none left
2015-02-26 13:28:08 -08:00
ad30aebcbc
Methods to extend the category EULA to the accessory
2015-02-26 11:41:47 -08:00
97d97fc4df
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -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