Commit Graph

268 Commits

Author SHA1 Message Date
snipe c22dcdafa4 Show used in column regardless for Custom Fields 2015-12-01 04:16:31 -08:00
snipe e5cc6d32d1 More small UI tweaks for Custom Fields
Still lots of work to be done here, this is just a rough improvement
2015-12-01 04:14:36 -08:00
snipe 54655faf83 Bumped version 2015-12-01 04:11:13 -08:00
snipe a44c56c937 Merge branch 'hotfixes/fix_1413' into develop
# Conflicts:
#	app/config/version.php
#	app/models/Company.php
2015-11-29 16:49:34 -08:00
snipe 92410ba054 Bumped version 2015-11-26 14:12:06 -08:00
snipe d8a9d2d3eb Bumped version 2015-11-26 14:08:24 -08:00
snipe 34276984f3 Bumped version 2015-11-25 03:49:47 -08:00
snipe 2195e27d61 Added company_list to license clone 2015-11-25 03:48:05 -08:00
snipe 20490986c6 Fixes #1325 - zenbra striping and borders on table for money value clarity 2015-11-24 23:43:10 -08:00
snipe 64eecc8df7 Added image to model listing view for #1370 2015-11-24 23:24:20 -08:00
snipe 0f33bad1b6 Commented out version of export all
This still works sorta wonky, and only exports 50 per page. Possibly related to https://github.com/wenzhixin/bootstrap-table/issues/1576
2015-11-24 23:15:01 -08:00
snipe 632fa92f92 Fixes #1333 - hide checkout button if asset status is not deployable 2015-11-24 22:49:31 -08:00
snipe 99391d0179 Fixes #1332 - added location to accessories 2015-11-24 22:43:13 -08:00
snipe c6c6bd02bb Possible fix for weird UTF-8 issues 2015-11-24 22:30:00 -08:00
snipe 904ddddce9 Removed consumable search sicne it doesn't do anything yet 2015-11-24 22:20:13 -08:00
snipe d34e7178b3 Order consumable assignments by most recent 2015-11-24 22:18:28 -08:00
snipe 0428d21c5e Order consumable assignments by most recent 2015-11-24 22:18:16 -08:00
snipe d8b43215b0 Fix for missing admin ID 2015-11-24 22:00:29 -08:00
snipe b39c53a5ea Closes #1375 - More data in consumables detail view 2015-11-24 21:58:30 -08:00
snipe 032aabeadd Bumped version 2015-11-24 20:34:16 -08:00
snipe 535263788d Fixed dumb indenting 2015-11-24 20:20:34 -08:00
snipe f04e4b1fb4 Bumped version 2015-11-24 19:38:23 -08:00
snipe a3dbd87f9f Fixed weird company table styles 2015-11-24 13:47:43 -08:00
snipe 6d42d2c614 Fixed bootstrap class for button 2015-11-24 13:44:58 -08:00
snipe e910b532c7 Account for invalid categories 2015-11-24 13:31:54 -08:00
snipe a777499c0b Fixes #1376 - added new fields to consumables view 2015-11-24 13:30:05 -08:00
snipe b99c138cb0 Fixes #1369 - fixed searching/sorting on location 2015-11-24 12:48:41 -08:00
snipe cbb2151f1a Allow re-use of usernames 2015-11-24 12:29:25 -08:00
snipe 256f33e6b4 Company/category search on accessories 2015-11-24 12:08:49 -08:00
snipe 59315878c3 Bumped version 2015-11-24 11:47:40 -08:00
snipe b93f36a856 Bumped version 2015-11-23 21:04:47 -08:00
snipe 407b341510 Updated bootstrap tables 2015-11-23 20:57:18 -08:00
snipe 120c8394bb Fixes #1380 - groups pagination 2015-11-23 19:18:00 -08:00
snipe c24f1721d7 Bumped version 2015-11-23 17:44:00 -08:00
snipe 61107769e8 Add user ID and make company name hidden by default 2015-11-23 15:18:10 -08:00
snipe 9ec132acde Small fixed for LDAP in settings table 2015-11-23 14:33:00 -08:00
snipe 01b574069a Fixes #1362 - status labels losing type on edit 2015-11-20 09:20:14 -08:00
snipe 2b26fd7e20 Fixed string in gh-changelog 2015-11-18 14:29:29 -08:00
snipe 7a0598dfc3 Pulled naughty language from changelog 2015-11-18 13:56:13 -08:00
snipe 2afc252549 Link to category listing from accessories 2015-11-11 17:43:24 -08:00
snipe aa05d041bd Fixes #1324 - missing $inout variable when if/else not met 2015-11-11 17:22:28 -08:00
snipe bbe0189be2 CSS for max image size on asset view 2015-11-11 16:06:17 -08:00
snipe a0599712a6 Show model image if available and no asset image 2015-11-11 16:06:07 -08:00
snipe 1a4926ce13 Sort by asset image for PR #1330 2015-11-11 15:57:41 -08:00
snipe 3c8959e92d Bumped version 2015-11-11 15:56:10 -08:00
snipe 306d8ebaf7 Fixes #1317 - regression issue in bulk delete 2015-11-07 15:40:25 -08:00
snipe af5c221385 Updated language strings 2015-11-04 03:42:37 -08:00
snipe feb74806a8 Removed models override 2015-11-04 01:08:17 -08:00
snipe 14ba5a3b77 Fixes #1310 - adds version hash to table name to prevent cookie issues for folks who pull from dev 2015-11-04 01:08:05 -08:00
snipe bc8c8e4225 Fixes #1012 - more consistency in manufacturer view 2015-11-04 00:48:53 -08:00