55 commits

Author	SHA1	Message	Date
snipe	f2ddc7b0ae	Added purchase cost and purchase date to listing	2016-07-07 02:07:21 -07:00
snipe	a7a748385f	Longer cookie	2016-07-01 01:05:22 -07:00
snipe	0c65b6cad1	Nicer bulk delete layout	2016-06-29 04:30:21 -07:00
snipe	0c98390eef	Hide bulk actions, checkbox and checkout/in if deleted	2016-06-29 04:19:37 -07:00
Daniel Meltzer	d484636bba	Add model number column to the hardware list. (#2204) ... * Add model number column to the hardware list and allow searching based on model number. Column is hidden by default. * Fix sorting. Add scope to order by model number.	2016-06-27 22:32:40 -07:00
snipe	0cf563ae5b	Show admin in maintenances	2016-06-22 17:04:47 -07:00
Daniel Meltzer	43e64a5f8c	Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name.	2016-06-22 15:13:01 -04:00
snipe	dd1241f964	Fix in case crated_at is blank	2016-06-21 17:19:46 -07:00
snipe	e9227f77b6	Fixes #2163 - put model image in view if no asset image	2016-06-21 12:20:22 -07:00
snipe	6165d804f9	Merge pull request #2145 from dmeltzer/disable-select2-on-ios ... Disable select2 on ios.	2016-06-17 17:15:47 -07:00
snipe	1c51db876c	Merge pull request #2172 from ddreier/v3-label-changes ... Center 1D Barcode and include Custom CSS in barcodes view	2016-06-17 17:14:28 -07:00
snipe	48595e3d76	Merge pull request #2135 from YetAnotherCodeMonkey/v3 ... Swap bgutter and sgutter as they seem to be reversed.	2016-06-17 17:12:47 -07:00
Daniel Dreier	52084a2c24	Add CSS to center the 1D barcode and add PHP to include the custom CSS from Settings.	2016-06-17 14:38:50 -05:00
snipe	412756b651	Fix link to view manufacturer in hardware view	2016-06-15 21:14:26 -07:00
snipe	87352470c0	Added sortable created_at to assets and users	2016-06-15 21:06:17 -07:00
snipe	1efa69e51f	Fixes #2158	2016-06-15 11:50:57 -07:00
snipe	3ca81f4d73	Fixes #2140	2016-06-13 12:07:01 -07:00
snipe	2daed3c271	Fix for custom fields not saving	2016-06-10 16:36:46 -07:00
Daniel Meltzer	2159d77fc2	No longer necessary.	2016-06-10 07:46:38 -05:00
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	7a9cfb1a8f	Fixed label weirdness when no serial	2016-06-10 04:43:17 -07:00
snipe	4e1472f66d	Merge remote-tracking branch 'origin/v3' into v3-master	2016-06-10 00:48:33 -07:00
Daniel Meltzer	25c10c43dd	Disable select2 on ios. It's terribly slow, doesn't register click events, and has forces focus to the search bar by default (which makes the keyboard popup and take over the screen. The latter issue might justify disabling it for all mobile devices, but the performance issues certainly justify it on iOS.	2016-06-09 20:31:23 -05: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
Drew Wilkinson	7f22d3f486	Fix margin for bottom to not be equal to side gutter, looks like a typo	2016-06-07 13:03:21 -04:00
snipe	485fb26393	Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status	2016-06-02 14:04:54 -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
Daniel Meltzer	dab2a50982	Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements.	2016-05-31 18:04:01 -05:00
snipe	c9d00b1f06	Merge branch 'v3' of github.com:snipe/snipe-it into v3	2016-05-31 14:27:39 -07:00
snipe	9bb258bb99	Updated alt tag	2016-05-31 14:27:33 -07:00
Daniel Meltzer	004c63cd5d	Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification.	2016-05-26 21:29:29 -05:00
snipe	c89f357e4a	Fixes #2082 ... LOL whoops	2016-05-25 13:32:33 -07:00
snipe	66beeeb26d	Added notes back to asset file uploads	2016-05-19 23:12:27 -07:00
snipe	cbcc155f27	Settings tweaks	2016-05-19 19:49:25 -07:00
snipe	29e54830e1	Added 2D barcodes to labels	2016-05-19 19:12:42 -07:00
snipe	c1c7fa143d	Components display on assets page	2016-05-18 19:26:50 -07:00
snipe	4ba2b89940	Add MS Excel as export ... Excel does not work in Safari - known webkit issue, no fix :(	2016-05-18 18:14:40 -07:00
snipe	0780f97807	Add multisort to assets	2016-05-18 16:48:46 -07:00
snipe	a726934cde	Fixed bulk delete+checkin for users	2016-05-12 21:01:31 -07:00
snipe	6d91774943	[Feature Request] Fixes #2030 - allow asset name change on checkin	2016-05-12 12:34:44 -07:00
snipe	ae8a03fec3	Add manufacturer name/sorting/searching on assets	2016-05-12 10:38:57 -07:00
snipe	e6cbafe5ff	Suppress console warning	2016-04-28 20:19:31 -07:00
snipe	1b5ef695f2	Add custom fields to modals in create asset	2016-04-23 03:12:31 -07:00
snipe	30c6657fc1	Fixes date selector box	2016-04-23 02:36:08 -07:00
snipe	66a5050143	Fixed field name on checkin form	2016-04-23 02:06:57 -07:00
snipe	b72429a303	Suppress console log	2016-04-19 07:17:57 -07:00