55f544829d
Update Category Types Array to include Consumable
2015-07-01 17:28:58 +09:30
bb7ce83c48
Merge remote-tracking branch 'origin/develop' into 2.0
2015-06-30 22:42:00 -07:00
1d4cfcfd58
Only save uploaded logo if not in demo mode
2015-06-30 22:38:40 -07:00
f2abbd0e8f
Deny editing users on demo
2015-06-30 22:10:23 -07:00
62f8d002e3
Temp commented out some stuff
2015-06-30 22:05:21 -07:00
0766ae2d17
Disallow group edit for demo
2015-06-30 22:04:48 -07:00
588ff742fe
Add manufacturer to models listing for clarity
2015-06-30 19:15:43 -07:00
a8cb5c1e7d
Beginning QR mobile interface
2015-06-30 19:07:44 -07:00
edfa064fd4
Disable emailing imported users if demo mode
2015-06-23 18:38:21 -07:00
bf3cb73070
Include location ID on user import
2015-06-23 15:05:11 -07:00
28a9f90a72
Lazy eager load history for optimized queries
2015-06-23 13:44:49 -07:00
c87d4ad801
Eager load dashboard queries
2015-06-23 11:52:18 -07:00
826d3ccae8
Eager loading user info
2015-06-22 17:57:55 -07:00
fd7d4eb3f2
Removed checkin for consumables
2015-06-22 17:57:44 -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
221ae62ea5
Example configs
2015-06-19 17:38:06 -07:00
ec10526d69
Center envelope in user listing
2015-06-18 15:00:32 -07:00
2be1d64de3
Merge remote-tracking branch 'origin/develop' into 1.3.0
2015-06-16 12:56:14 -07:00
c3c4e9def2
Fixes #852 - localized string for file types, added zip and rar for asset upload
2015-06-16 12:54:53 -07:00
16ec68e0b6
Hide email icon if no email address is provided
2015-06-16 01:45:34 -07:00
d943408f44
Location and email not required, username required
2015-06-15 18:39:34 -07:00
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
7820efc121
Fixes #822 and #847 - added notes field on import for MySQL strict mode
2015-06-15 11:20:09 -07:00
d0189fb076
Added consumables to user matrix for #782
2015-06-09 20:05:24 -07:00
e4517a8782
Removed checkin for #782 , since that doesn't exist in consumables
2015-06-09 19:58:22 -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
2540ac09ec
Fixes #822
2015-06-09 16:02:10 -07:00
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
c69038d3ae
Fixes #836
2015-06-09 02:00:55 -07:00
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
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
3597d71230
Eager load assigned asset locations
2015-05-07 18:21:39 -07:00
95279f885b
Fixes #759 - populate form with parent location info
2015-05-07 01:51:46 -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
aab52d0850
Fix for strict mode with location parent
2015-05-04 15:10:57 -07:00
71febc1c81
Added accessories and location
2015-05-04 13:31:47 -07:00
0d2333203a
Display default location
2015-05-04 13:08:38 -07:00
51eeee09d7
Fixes bug in #736 for new fields
2015-05-04 11:14:38 -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
5e7a4e8193
Fixes #599 - show groups in user list
2015-05-04 01:44:49 -07:00
c8870ddcab
Fixes #736 - more fields in bulk edit
2015-05-04 01:30:20 -07:00
7556f989df
Accessories Slack integration
2015-04-30 20:53:44 -07:00
8207597a58
Slack integration for Licenses
2015-04-30 20:37:23 -07:00
1137768f84
Escape notes
2015-04-30 19:23:41 -07:00
5f6925858b
Richer slack integrations
2015-04-30 18:54:34 -07:00
c95af84452
Fixes #750 because @uberbrady can't code
2015-04-30 17:14:31 -07:00
62b5ec5b02
Slack field validation and placeholder text
2015-04-30 16:58:33 -07:00
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
madd15