Commit Graph

  • 635cd71ef7 Herp-derp. Braces. snipe 2013-11-26 07:23:47 -05:00
  • 116af7e809 Merge branch 'refs/heads/develop' snipe 2013-11-26 07:12:14 -05:00
  • ee3fb2785e Fixed XSS on modal snipe 2013-11-26 07:05:04 -05:00
  • 2b1ddd9a45 Escaping HTML in modal title snipe 2013-11-26 06:58:14 -05:00
  • 1fe925ad5f Removing alpha_dash snipe 2013-11-26 06:56:54 -05:00
  • c220c0a427 Alpha_dash is too contrictive snipe 2013-11-26 06:56:20 -05:00
  • 52fa847769 Updated to prevent the XSS in the menu snipe 2013-11-26 06:20:46 -05:00
  • 9854752036 Don't need it snipe 2013-11-26 04:45:11 -05:00
  • 37fd854003 Merge branch 'refs/heads/develop' snipe 2013-11-26 03:13:33 -05:00
  • e6fc1956fc Fixes #55 snipe 2013-11-26 03:13:09 -05:00
  • 5bf38b1d02 Fixes #50 snipe 2013-11-26 02:33:16 -05:00
  • 5b8adda5da Merge branch 'refs/heads/develop' snipe 2013-11-26 02:14:31 -05:00
  • d0cbb9f3a7 Fixes #52 snipe 2013-11-26 02:14:06 -05:00
  • 1295855302 Fixes #51 snipe 2013-11-26 02:12:32 -05:00
  • 4d1dd1c446 Fixed #50 - MOAR VALIDATION! snipe 2013-11-26 02:09:37 -05:00
  • e77b47717e More validation snipe 2013-11-26 02:04:29 -05:00
  • 3f4ce4025f Tighter data validation on name snipe 2013-11-26 01:58:57 -05:00
  • 680b377bd1 Validation on price snipe 2013-11-26 01:28:45 -05:00
  • 45c04b1cde Fixed display bug snipe 2013-11-26 01:27:27 -05:00
  • e13578d97d Fixed error when no category is given snipe 2013-11-26 01:21:55 -05:00
  • 1d50724c91 Removed parent from category snipe 2013-11-26 01:15:25 -05:00
  • d469a9601b Merge branch 'refs/heads/develop' snipe 2013-11-25 19:57:40 -05:00
  • fa246aade1 Removed line thingie snipe 2013-11-25 19:57:28 -05:00
  • a27be4e053 Merge branch 'refs/heads/develop' snipe 2013-11-25 19:56:41 -05:00
  • 7e6013b125 Added seat numbers snipe 2013-11-25 19:56:22 -05:00
  • e310d16fb7 Merge branch 'refs/heads/develop' snipe 2013-11-25 18:33:53 -05:00
  • 6b224ea8aa Removed dummy text snipe 2013-11-25 18:33:27 -05:00
  • 7a5b133c58 Fixed bug linking to assets when they should be pointing to licenses snipe 2013-11-25 18:31:59 -05:00
  • 4e25a9e815 Removed extra columns snipe 2013-11-25 18:31:44 -05:00
  • 084ec064cb Removed created_at from listing. Not important enough to waste the screen space on snipe 2013-11-25 13:38:14 -05:00
  • 0eb86ccd1d Merge branch 'refs/heads/develop' snipe 2013-11-25 13:35:32 -05:00
  • e87e5b9cae Fixes #46 snipe 2013-11-25 13:34:52 -05:00
  • 20cce33273 Merge branch 'refs/heads/develop' snipe 2013-11-25 13:18:49 -05:00
  • e235a4565c Added manufacturer to model display snipe 2013-11-25 13:16:59 -05:00
  • a345cbd907 Added view for model in routes snipe 2013-11-25 12:40:09 -05:00
  • 5959e1f9fc Layout tweaks snipe 2013-11-25 12:39:59 -05:00
  • 3ea0ad87c8 Fixes #22 snipe 2013-11-25 12:39:47 -05:00
  • cf438d0207 Whitespace snipe 2013-11-25 12:37:26 -05:00
  • 1624dbffa4 Added model view snipe 2013-11-25 12:37:11 -05:00
  • e2a1cda50e Changed method name snipe 2013-11-25 12:36:51 -05:00
  • 6fee1067bc Added depreciate flag for assets and licenses snipe 2013-11-25 11:31:02 -05:00
  • 3ba2880a35 Layout tweaks snipe 2013-11-25 10:12:41 -05:00
  • 5a2c6391bf Added category relationship snipe 2013-11-25 10:12:23 -05:00
  • 447a74928b Ditched parent ID - extraneous feature, not really needed snipe 2013-11-25 10:11:40 -05:00
  • 62e03e0910 Merge branch 'refs/heads/develop' snipe 2013-11-25 08:26:05 -05:00
  • 1a970716cc Experimenting with nicer error messages snipe 2013-11-25 08:25:47 -05:00
  • 57d0f36435 Fixes #4 snipe 2013-11-25 08:25:34 -05:00
  • a8d01550dc Prep for unit testing snipe 2013-11-25 08:09:14 -05:00
  • f071fe5867 Merge branch 'refs/heads/develop' snipe 2013-11-25 07:57:59 -05:00
  • acfda8dc82 One more change to tighten the sorting. snipe 2013-11-25 07:57:43 -05:00
  • 3cc0ed8743 Fixed sorting weirdness snipe 2013-11-25 07:55:18 -05:00
  • ffcfc853b3 Merge branch 'refs/heads/develop' snipe 2013-11-25 07:47:18 -05:00
  • 051ef0a218 Weird sorting on License table snipe 2013-11-25 07:38:06 -05:00
  • 5fcbc9ba78 ALL THE DATATABLES! snipe 2013-11-25 07:24:51 -05:00
  • 9dbb147ada Removed pagination, since that's handled via data tables now snipe 2013-11-25 07:07:15 -05:00
  • 718236b2d4 Fixed #9 snipe 2013-11-25 07:06:49 -05:00
  • efb5269a0c Removed unnecessary image snipe 2013-11-25 07:03:42 -05:00
  • 74034ae69e Sortable, searchable datatables snipe 2013-11-25 07:03:32 -05:00
  • 9284164e96 Removed unnecessary graphics snipe 2013-11-25 07:03:15 -05:00
  • dc26a901d4 More paring down the licenses interface snipe 2013-11-25 06:07:52 -05:00
  • ad680a337e Fixed column name spelling in DB snipe 2013-11-25 05:47:17 -05:00
  • dab7ec3457 Sigh. snipe 2013-11-25 05:41:57 -05:00
  • 46714172ba Spelling is still hard. snipe 2013-11-25 05:41:25 -05:00
  • 4844cd0b38 Copy edit snipe 2013-11-25 05:40:01 -05:00
  • 79f93ab475 Merge branch 'refs/heads/develop' snipe 2013-11-25 05:37:02 -05:00
  • 2b088a3fb2 Fixes #17 snipe 2013-11-25 05:36:42 -05:00
  • 2353eda611 Removed extra columns in license table to make it easier to read, moved buttons for more compact view snipe 2013-11-25 05:12:23 -05:00
  • 343eb31c56 More info on license page snipe 2013-11-25 05:11:46 -05:00
  • 56586b7e83 Smaller flat buttons snipe 2013-11-25 05:07:20 -05:00
  • 1b152396ad Merge branch 'refs/heads/develop' snipe 2013-11-25 04:43:42 -05:00
  • 69badc7fda Filter action log for hardware snipe 2013-11-25 04:41:03 -05:00
  • 2727ec13c6 Action log seeder snipe 2013-11-25 04:40:51 -05:00
  • e457aaee6a Remove software models from model seeder snipe 2013-11-25 04:33:14 -05:00
  • 03edbc008c Fixes #43 snipe 2013-11-25 04:28:51 -05:00
  • 2203789f4c Fixes #41 snipe 2013-11-25 04:00:04 -05:00
  • 74607c0534 Added set count snipe 2013-11-25 03:59:28 -05:00
  • 0d9184870c More license tweaks - view blade, asset log snipe 2013-11-25 03:48:54 -05:00
  • faae6a21d3 More license tweaks snipe 2013-11-25 03:22:38 -05:00
  • 1b01074b9e Changed license structure to use join table to handle multiple seats snipe 2013-11-25 01:04:39 -05:00
  • 54894227f0 Removed unneeded snipe 2013-11-25 01:02:27 -05:00
  • c72e98a193 Drop old tables snipe 2013-11-24 19:07:08 -05:00
  • 295c2e35eb Edits to status dropdown snipe 2013-11-24 19:06:52 -05:00
  • 75c48c351c Merge branch 'refs/heads/develop' snipe 2013-11-22 18:16:42 -05:00
  • 37e1ae7f5a Changed settings table structure snipe 2013-11-22 18:04:16 -05:00
  • e9bd8397d8 Added site settings into controllers for page_num, added site_name to blade snipe 2013-11-22 18:03:57 -05:00
  • 9b5274fdcd Nicer title display based on filter snipe 2013-11-22 06:47:51 -05:00
  • d5bbf38915 View status on show all state snipe 2013-11-22 06:07:03 -05:00
  • c32d45e901 Fixed ID snipe 2013-11-22 06:01:27 -05:00
  • 2774b07bce Show asset status on undeployable snipe 2013-11-22 05:54:55 -05:00
  • a356dbd73d Change table display based on filters snipe 2013-11-22 05:43:40 -05:00
  • 9249786a25 Fixed status display snipe 2013-11-22 05:37:36 -05:00
  • 135d21e27d Filtering options on assets page snipe 2013-11-22 05:14:21 -05:00
  • 95fb2f6efd Include filtering snipe 2013-11-22 04:57:31 -05:00
  • 6434db2a8e Buttons for asset filtering snipe 2013-11-22 04:31:57 -05:00
  • d0d94bac44 Merge branch 'refs/heads/develop' snipe 2013-11-22 03:25:25 -05:00
  • b7251d9992 Fixed potential bug in blade snipe 2013-11-22 03:24:48 -05:00
  • 1b1efec858 Fixed foreign key in assets snipe 2013-11-22 03:24:34 -05:00
  • 52020d09f0 Fixed bomb when asset is unassigned snipe 2013-11-22 03:18:11 -05:00
  • 8dd5704697 Added settings snipe 2013-11-22 03:17:55 -05:00
  • 7b2cf64d7f DB seed info snipe 2013-11-22 03:17:32 -05:00