Commit Graph

208 Commits

Author SHA1 Message Date
snipe 98cf8767f2 Locked new top boxes down to admin 2013-11-18 21:23:34 -05:00
snipe 3bbd98f1c7 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-18 21:20:16 -05:00
snipe 532c03a73d Placeholder top summary boxes
There aren't wired up yet
2013-11-18 21:19:30 -05:00
snipe 44ba90f9f0 Fixed icon set to white in main nav 2013-11-18 21:11:50 -05:00
snipe 981ff2b6e5 Asset action log table 2013-11-18 21:10:30 -05:00
Brady Wetherington e819c642db Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-18 15:29:49 -05:00
Brady Wetherington 8268edae81 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-18 15:16:02 -05:00
snipe edbf195034 Changed footer 2013-11-18 14:52:01 -05:00
snipe 1590c1a300 whitespace 2013-11-18 14:40:32 -05:00
snipe 6dd320171f log files 2013-11-18 14:36:38 -05:00
snipe 5c43caf057 More table fixes 2013-11-18 13:30:48 -05:00
snipe ddfd69e510 More table fixes 2013-11-18 13:23:15 -05:00
snipe 0e11b29cf9 Sigh. 2013-11-18 13:15:38 -05:00
snipe 3401fee672 Another table fix 2013-11-18 13:14:26 -05:00
snipe ffdb4b1aa8 Fixed wonky layout issue 2013-11-18 13:10:38 -05:00
snipe f409ade3a5 So wow. Missed tables disappoint. Such code. 2013-11-18 12:51:20 -05:00
Brady Wetherington 064d7da38e Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-18 12:40:22 -05:00
snipe 4854228851 Moved font awesome files 2013-11-18 12:39:26 -05:00
Brady Wetherington 88599fad7f Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-18 12:37:59 -05:00
snipe d0a5afbf02 Tweaking backend display 2013-11-18 12:36:41 -05:00
snipe c2f5b48635 Removed extraneous images 2013-11-18 12:36:18 -05:00
snipe 5172954aef Added wildcard to nav display 2013-11-18 12:33:32 -05:00
Brady Wetherington 14de269474 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-18 12:25:23 -05:00
snipe ad914b73b0 Ghetto way to grab location by asset
Need to move this out of the view
2013-11-18 11:51:09 -05:00
snipe c679d446fd Nulled extra values for artisan install 2013-11-18 11:50:17 -05:00
snipe 889b66d578 hurrr 2013-11-18 10:53:20 -05:00
snipe b966bb2889 Added location to asset view 2013-11-18 10:45:14 -05:00
snipe abac6489c4 Removed location_id from assets table
Going to handle this via the people it's checked out to instead
2013-11-18 10:33:35 -05:00
snipe 4ef506cde7 New language entry for no results on user filter 2013-11-18 10:28:03 -05:00
snipe c7c072b07c New fields included in table view 2013-11-18 10:27:48 -05:00
snipe 7b59f42fb0 Fixed pagination bug, styled buttons 2013-11-18 10:27:26 -05:00
snipe 50387874bf Added complete info to the locations seeder 2013-11-18 10:26:47 -05:00
snipe 02ed943ffa New fields in form view 2013-11-18 09:55:07 -05:00
snipe 8f665e82ae Style update for action buttons 2013-11-18 09:54:52 -05:00
snipe 897bc63621 Location drop down to user in views 2013-11-18 09:54:37 -05:00
snipe 673f5accf9 Added location drop down to user 2013-11-18 09:54:19 -05:00
snipe 6214c7b706 migration for new user and location fields 2013-11-18 09:54:00 -05:00
snipe 7c37f91dd5 Linked user in asset view to user profile view 2013-11-18 07:58:20 -05:00
snipe ca90300d2f Added user profile view 2013-11-18 07:53:33 -05:00
snipe d2427bdea2 Cosmetic tweaks 2013-11-18 06:54:12 -05:00
snipe 57107dceee Fixed checkin text
Was mistakenly using checkout text on error/confirmation
2013-11-18 04:54:22 -05:00
snipe 48e180c691 Fixed asset bug caused by unique validation in assets model
Pulled validation back out into the controller for asset tag
2013-11-18 04:50:28 -05:00
snipe b554a9f9db Updated blades with new style buttons 2013-11-18 04:49:54 -05:00
snipe e3fa628bac Reskin files 2013-11-18 04:04:06 -05:00
snipe c29b3c93f7 Removed old bootstrap files 2013-11-18 04:03:20 -05:00
snipe 524d3d233d Added count of assets in asset models table 2013-11-18 01:32:22 -05:00
snipe 2fd8b1760c Removed the note that it's not ready for you yet :) 2013-11-18 01:24:54 -05:00
snipe 7bc7ffb728 Fixed some error reporting/required fields around checkout/checkin 2013-11-18 01:16:08 -05:00
snipe 7d38a7db61 Added checkout/checkin to index display 2013-11-18 00:56:14 -05:00
snipe 785b32c8ff Cleaned up user function for assets 2013-11-18 00:55:57 -05:00