Commit Graph

384 Commits

Author SHA1 Message Date
snipe bf3cb73070 Include location ID on user import 2015-06-23 15:05:11 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00
snipe c87d4ad801 Eager load dashboard queries 2015-06-23 11:52:18 -07:00
snipe 826d3ccae8 Eager loading user info 2015-06-22 17:57:55 -07:00
snipe fd7d4eb3f2 Removed checkin for consumables 2015-06-22 17:57:44 -07:00
snipe 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
snipe 221ae62ea5 Example configs 2015-06-19 17:38:06 -07:00
snipe ec10526d69 Center envelope in user listing 2015-06-18 15:00:32 -07:00
snipe 2be1d64de3 Merge remote-tracking branch 'origin/develop' into 1.3.0 2015-06-16 12:56:14 -07:00
snipe c3c4e9def2 Fixes #852 - localized string for file types, added zip and rar for asset upload 2015-06-16 12:54:53 -07:00
snipe 16ec68e0b6 Hide email icon if no email address is provided 2015-06-16 01:45:34 -07:00
snipe d943408f44 Location and email not required, username required 2015-06-15 18:39:34 -07:00
snipe c4375f9fbc Merge remote-tracking branch 'origin/develop' into 1.3.0
# Conflicts:
#	app/controllers/admin/UsersController.php
2015-06-15 11:30:40 -07:00
snipe 7820efc121 Fixes #822 and #847 - added notes field on import for MySQL strict mode 2015-06-15 11:20:09 -07:00
snipe d0189fb076 Added consumables to user matrix for #782 2015-06-09 20:05:24 -07:00
snipe e4517a8782 Removed checkin for #782, since that doesn't exist in consumables 2015-06-09 19:58:22 -07:00
snipe 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 2540ac09ec Fixes #822 2015-06-09 16:02:10 -07:00
snipe af2decea9d Merge remote-tracking branch 'origin/master' into 1.3.0
# Conflicts:
#	app/controllers/admin/AssetsController.php
2015-06-09 02:10:29 -07:00
snipe c69038d3ae Fixes #836 2015-06-09 02:00:55 -07:00
snipe 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0
# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php
2015-05-27 11:17:14 -07:00
Tom Castleman b161a38e9b Add licenses.reassignable migration
Implement licenses.reassignable

View edit for licenses.reassignable

Add licenses.reassignable to LicensesController

Disable Check In when !license->reassignable

Validate license check-in post
2015-05-22 14:11:36 +01:00
snipe 3597d71230 Eager load assigned asset locations 2015-05-07 18:21:39 -07:00
snipe 95279f885b Fixes #759 - populate form with parent location info 2015-05-07 01:51:46 -07:00
snipe 2d7a348ab7 Fixed multi-level array nesting for locations 2015-05-07 00:15:44 -07:00
snipe 139dd13392 Super janky miulti-level menu on create - TODO: Fix this ish. 2015-05-04 18:13:26 -07:00
snipe aab52d0850 Fix for strict mode with location parent 2015-05-04 15:10:57 -07:00
snipe 71febc1c81 Added accessories and location 2015-05-04 13:31:47 -07:00
snipe 0d2333203a Display default location 2015-05-04 13:08:38 -07:00
snipe 51eeee09d7 Fixes bug in #736 for new fields 2015-05-04 11:14:38 -07:00
snipe c487beeaca Asset counter for #759 (needs more work) 2015-05-04 03:05:22 -07:00
snipe f463cd6c8d Fixes for #759 - location heirarchy 2015-05-04 02:50:42 -07:00
snipe 5e7a4e8193 Fixes #599 - show groups in user list 2015-05-04 01:44:49 -07:00
snipe c8870ddcab Fixes #736 - more fields in bulk edit 2015-05-04 01:30:20 -07:00
snipe 7556f989df Accessories Slack integration 2015-04-30 20:53:44 -07:00
snipe 8207597a58 Slack integration for Licenses 2015-04-30 20:37:23 -07:00
snipe 1137768f84 Escape notes 2015-04-30 19:23:41 -07:00
snipe 5f6925858b Richer slack integrations 2015-04-30 18:54:34 -07:00
snipe c95af84452 Fixes #750 because @uberbrady can't code 2015-04-30 17:14:31 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 767e2c69f3 Fixes #751 - ignore whether depreciation was selected or not to display purchase cost 2015-04-29 16:31:38 -07:00
snipe 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
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe 6a7fcd5c40 Fixes #769 - set sort order for Accessory Category 2015-04-29 13:54:54 -07:00
Fei Song 1c2e5ecc0f Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error 2015-04-28 15:19:00 +08:00
snipe e88a81141f Added view link to asset tag, since some assets won't have names 2015-04-02 15:40:41 -07:00
snipe 33e7ce6761 Fixes for #722 localization 2015-04-02 14:28:11 -07:00
snipe 0a734d8502 Missing semicolons 2015-04-01 15:44:13 -07:00
madd15 46781c94cd Fix #715 - Missing $modelCheck api call 2015-04-02 09:10:07 +10:30