Commit Graph

365 Commits

Author SHA1 Message Date
snipe a27be4e053 Merge branch 'refs/heads/develop' 2013-11-25 19:56:41 -05:00
snipe 7e6013b125 Added seat numbers 2013-11-25 19:56:22 -05:00
snipe e310d16fb7 Merge branch 'refs/heads/develop' 2013-11-25 18:33:53 -05:00
snipe 6b224ea8aa Removed dummy text 2013-11-25 18:33:27 -05:00
snipe 7a5b133c58 Fixed bug linking to assets when they should be pointing to licenses 2013-11-25 18:31:59 -05:00
snipe 4e25a9e815 Removed extra columns 2013-11-25 18:31:44 -05:00
snipe 084ec064cb Removed created_at from listing. Not important enough to waste the screen space on 2013-11-25 13:38:14 -05:00
snipe 0eb86ccd1d Merge branch 'refs/heads/develop' 2013-11-25 13:35:32 -05:00
snipe e87e5b9cae Fixes #46 2013-11-25 13:34:52 -05:00
snipe 20cce33273 Merge branch 'refs/heads/develop' 2013-11-25 13:18:49 -05:00
snipe e235a4565c Added manufacturer to model display 2013-11-25 13:16:59 -05:00
snipe a345cbd907 Added view for model in routes 2013-11-25 12:40:09 -05:00
snipe 5959e1f9fc Layout tweaks 2013-11-25 12:39:59 -05:00
snipe 3ea0ad87c8 Fixes #22 2013-11-25 12:39:47 -05:00
snipe cf438d0207 Whitespace 2013-11-25 12:37:26 -05:00
snipe 1624dbffa4 Added model view 2013-11-25 12:37:11 -05:00
snipe e2a1cda50e Changed method name 2013-11-25 12:36:51 -05:00
snipe 6fee1067bc Added depreciate flag for assets and licenses 2013-11-25 11:31:02 -05:00
snipe 3ba2880a35 Layout tweaks 2013-11-25 10:12:41 -05:00
snipe 5a2c6391bf Added category relationship 2013-11-25 10:12:23 -05:00
snipe 447a74928b Ditched parent ID - extraneous feature, not really needed 2013-11-25 10:11:40 -05:00
snipe 62e03e0910 Merge branch 'refs/heads/develop' 2013-11-25 08:26:05 -05:00
snipe 1a970716cc Experimenting with nicer error messages 2013-11-25 08:25:47 -05:00
snipe 57d0f36435 Fixes #4 2013-11-25 08:25:34 -05:00
snipe a8d01550dc Prep for unit testing 2013-11-25 08:09:14 -05:00
snipe f071fe5867 Merge branch 'refs/heads/develop' 2013-11-25 07:57:59 -05:00
snipe acfda8dc82 One more change to tighten the sorting.
Still looks weird, still need to revisit.
2013-11-25 07:57:43 -05:00
snipe 3cc0ed8743 Fixed sorting weirdness
Sort of. Still need to revisit, but this works for now.
2013-11-25 07:55:18 -05:00
snipe ffcfc853b3 Merge branch 'refs/heads/develop' 2013-11-25 07:47:18 -05:00
snipe 051ef0a218 Weird sorting on License table
Need to come back to this
2013-11-25 07:38:06 -05:00
snipe 5fcbc9ba78 ALL THE DATATABLES! 2013-11-25 07:24:51 -05:00
snipe 9dbb147ada Removed pagination, since that's handled via data tables now 2013-11-25 07:07:15 -05:00
snipe 718236b2d4 Fixed #9 2013-11-25 07:06:49 -05:00
snipe efb5269a0c Removed unnecessary image 2013-11-25 07:03:42 -05:00
snipe 74034ae69e Sortable, searchable datatables 2013-11-25 07:03:32 -05:00
snipe 9284164e96 Removed unnecessary graphics 2013-11-25 07:03:15 -05:00
snipe dc26a901d4 More paring down the licenses interface
Still looks assy, but it's a little better now
2013-11-25 06:07:52 -05:00
snipe ad680a337e Fixed column name spelling in DB 2013-11-25 05:47:17 -05:00
snipe dab7ec3457 Sigh. 2013-11-25 05:41:57 -05:00
snipe 46714172ba Spelling is still hard. 2013-11-25 05:41:25 -05:00
snipe 4844cd0b38 Copy edit 2013-11-25 05:40:01 -05:00
snipe 79f93ab475 Merge branch 'refs/heads/develop' 2013-11-25 05:37:02 -05:00
snipe 2b088a3fb2 Fixes #17 2013-11-25 05:36:42 -05:00
snipe 2353eda611 Removed extra columns in license table to make it easier to read, moved buttons for more compact view 2013-11-25 05:12:23 -05:00
snipe 343eb31c56 More info on license page 2013-11-25 05:11:46 -05:00
snipe 56586b7e83 Smaller flat buttons 2013-11-25 05:07:20 -05:00
snipe 1b152396ad Merge branch 'refs/heads/develop' 2013-11-25 04:43:42 -05:00
snipe 69badc7fda Filter action log for hardware 2013-11-25 04:41:03 -05:00
snipe 2727ec13c6 Action log seeder 2013-11-25 04:40:51 -05:00
snipe e457aaee6a Remove software models from model seeder 2013-11-25 04:33:14 -05:00