12 commits

Author	SHA1	Message	Date
Daniel Meltzer	9c4c91063f	Merge branch 'v3' into Fix-Asset-Creation-with-old-data	2016-06-10 07:35:30 -05:00
Daniel Meltzer	4e74c553bd	Fix editing of assets. This also uses the asset form request for validation.	2016-06-10 07:33:33 -05:00
snipe	4e1472f66d	Merge remote-tracking branch 'origin/v3' into v3-master	2016-06-10 00:48:33 -07:00
Daniel Meltzer	044695cb02	Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point.	2016-06-09 20:28:49 -05:00
snipe	66adffe6d9	Moved include	2016-06-09 14:41:58 -07:00
snipe	2b5fb04ba9	Allow admin to add user on checkout screen	2016-06-09 00:36:52 -07:00
Daniel Meltzer	b3454b1c24	Fix bug in image process logic that wouldn't resize the height. Also make it possible to choose files from android as well as pictures directly.	2016-05-31 19:50:58 -05:00
Daniel Meltzer	fcc79456fd	Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff	2016-05-31 19:50:58 -05:00
snipe	1b5ef695f2	Add custom fields to modals in create asset	2016-04-23 03:12:31 -07:00
snipe	b72429a303	Suppress console log	2016-04-19 07:17:57 -07:00
snipe	0e6b8a8358	Switch to use trans from Lang::get for laravel 5.2	2016-04-07 02:51:57 -07:00
snipe	fe00b0e401	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00