Commit Graph

  • 06cbd0723e Fixes #93 snipe 2013-11-28 23:32:44 -05:00
  • ddabdaca02 Merge branch 'refs/heads/develop' v0.1.2 snipe 2013-11-28 20:59:05 -05:00
  • 839d01a3af Fixed relationship method because fuck you ORM snipe 2013-11-28 20:58:40 -05:00
  • 4d421c9a50 Leftover method that's not used since the license/asset split snipe 2013-11-28 20:58:15 -05:00
  • 9fa826b2e7 Fixed assigned to id snipe 2013-11-28 20:40:02 -05:00
  • 7718e8d928 Checks that checkedout_to isn't 0 before trying to get fullName() snipe 2013-11-28 20:28:09 -05:00
  • 23374b7fc6 Another leftover from #88 snipe 2013-11-28 20:27:44 -05:00
  • f0f07b578b Fixing pivot for users snipe 2013-11-28 20:19:23 -05:00
  • e23f1f10b7 Switched validation to alpha_space on notes snipe 2013-11-28 20:02:11 -05:00
  • 1b56c31a22 Fixed relationship between users/locations because fuck you ORM snipe 2013-11-28 19:58:16 -05:00
  • 9f7cbc8a4f Another fix related to #88, also accounts for users with invalid location_ids snipe 2013-11-28 19:57:42 -05:00
  • f504175578 Smaller char req for first/last name, longer req for password snipe 2013-11-28 19:45:47 -05:00
  • 103faca6ef Clearer display of current vs trashed snipe 2013-11-28 19:45:25 -05:00
  • 2fce4884d7 Cosmetic changes snipe 2013-11-28 19:45:05 -05:00
  • 4142629665 Layout tweaks for mobile - related to #54 snipe 2013-11-28 19:22:39 -05:00
  • 03821838eb Merge branch 'refs/heads/develop' snipe 2013-11-28 18:48:15 -05:00
  • d2959e82a1 Redirect to /hardware to finish cleaning up re-routing from #88 snipe 2013-11-28 18:47:54 -05:00
  • 6a5ccc89df Updated urls from #88 snipe 2013-11-28 18:44:20 -05:00
  • 5858bfb99b Fixed language file paths caused by #88 snipe 2013-11-28 18:44:04 -05:00
  • 3cce78c087 Weird layout snipe 2013-11-28 18:43:30 -05:00
  • 0d0d42f86a Merge branch 'refs/heads/develop' snipe 2013-11-28 18:32:07 -05:00
  • d9a37f3822 Fixes #88 snipe 2013-11-28 18:31:36 -05:00
  • 4fcdf72ab6 Responsive design bug fixes, placeholder code for #64 (commented out) snipe 2013-11-28 16:50:53 -05:00
  • 8680d98bc3 Fixed status display bug snipe 2013-11-28 16:46:34 -05:00
  • b3bb2d4f11 Added soon-out-of-warranty example to test notifications snipe 2013-11-28 16:37:24 -05:00
  • 5c28089f2b RTD has to be 0, or it will conflict with the custom status labels snipe 2013-11-28 16:37:05 -05:00
  • c3769adf80 Merge branch 'refs/heads/develop' snipe 2013-11-28 15:52:23 -05:00
  • 9e189aa309 Fixes #80, also prevents the user from checking out an asset that is undeployable, etc snipe 2013-11-28 15:52:00 -05:00
  • 7a3d92522e Merge pull request #86 from peelman/develop snipe 2013-11-28 11:13:32 -08:00
  • 54013cfd42 Cancel and back buttons on edit forms now take you back properly Nick Peelman 2013-11-28 10:23:52 -05:00
  • ccb7a5ddba Merge branch 'refs/heads/develop' snipe 2013-11-28 01:16:05 -05:00
  • 54d9d72549 Tweaks to example configs to prevent data leakage snipe 2013-11-28 01:15:30 -05:00
  • 819a606204 Changed modelno validator to alpha_space snipe 2013-11-28 00:58:34 -05:00
  • 33f81abcd3 Added a few more symbols for alpha_space snipe 2013-11-28 00:58:08 -05:00
  • fbb0b22522 vi or GTFO snipe 2013-11-28 00:57:40 -05:00
  • 6b017d12c0 Merge pull request #85 from snipe/gitignore_clean snipe 2013-11-27 21:33:23 -08:00
  • 6691447624 Replace enumeration of files with wildcard Brady Wetherington 2013-11-27 19:26:53 -05:00
  • 39cc0c6ad7 Merge pull request #83 from peelman/IgorningProductionConfigs snipe 2013-11-27 16:22:10 -08:00
  • cb87b16e28 its code, not a block quote... Nick Peelman 2013-11-27 19:22:04 -05:00
  • 5be13d5eb5 Ignore production configs and sqlite files. Provide example files for renaming. Update install instructions in README accordingly. Nick Peelman 2013-11-27 19:19:07 -05:00
  • eb015b1e22 Merge branch 'refs/heads/develop' snipe 2013-11-27 14:14:41 -05:00
  • 012a889444 Corrected license seat count associated with license. Fixes #75 snipe 2013-11-27 14:13:29 -05:00
  • e79d27c984 Merge branch 'refs/heads/develop' snipe 2013-11-27 12:26:15 -05:00
  • 6552401fd8 Fixes #77 snipe 2013-11-27 12:25:48 -05:00
  • da96126445 Merge pull request #78 from peelman/ExpandManufacturer snipe 2013-11-27 09:05:10 -08:00
  • 301ef3fddb Add Manufacturer and Model info to asset page Nick Peelman 2013-11-27 11:37:22 -05:00
  • d6ba98252d Change N/A to Select One Nick Peelman 2013-11-27 11:37:02 -05:00
  • 9aa6b519c9 Wider display for address field in index blade snipe 2013-11-27 10:34:51 -05:00
  • 9f19792985 Save manufacturer ID Nick Peelman 2013-11-27 10:32:50 -05:00
  • e4d56dba92 Merge pull request #73 from peelman/EmailInputTypes snipe 2013-11-27 07:28:15 -08:00
  • e49cb9eb85 Merge pull request #72 from peelman/AddAddressToLocation snipe 2013-11-27 07:27:45 -08:00
  • b7579a1420 Copy/Paste Error Nick Peelman 2013-11-27 10:25:25 -05:00
  • 6f59617546 Add to controller's edit method too... Nick Peelman 2013-11-27 10:23:11 -05:00
  • 996458dde3 missing semicolon Nick Peelman 2013-11-27 10:18:43 -05:00
  • c2d889de12 Add necessary use statements, clean up the run-on return statement that was forming... Nick Peelman 2013-11-27 10:18:15 -05:00
  • b5a0da03a8 Add manufacturer to edit form Nick Peelman 2013-11-27 10:06:36 -05:00
  • 8d3d337820 Change input type to email where relevant (better mobile support) Nick Peelman 2013-11-27 08:41:03 -05:00
  • 1314a1ffea Add location address values to controller save methods... Nick Peelman 2013-11-27 08:30:51 -05:00
  • bed78dd935 Remove erroneous rule from address2 Nick Peelman 2013-11-27 08:28:00 -05:00
  • 02e5333101 Add address fields to Location edit form Nick Peelman 2013-11-27 08:21:12 -05:00
  • 0aa3c676c2 Merge branch 'refs/heads/develop' snipe 2013-11-27 03:40:21 -05:00
  • acd9505597 Two-digit decimal for purchase_cost snipe 2013-11-27 03:40:01 -05:00
  • 65cd28aad3 Fixes #14 snipe 2013-11-27 03:39:28 -05:00
  • 12684b214a Merge branch 'refs/heads/develop' snipe 2013-11-27 02:57:21 -05:00
  • 5c72aabdea Updated readme for DB migrations reminder snipe 2013-11-27 02:57:02 -05:00
  • a2b353fb6d Merge branch 'refs/heads/develop' snipe 2013-11-27 02:41:04 -05:00
  • aa38d83ba6 Fixes #63 and #70 snipe 2013-11-27 02:38:16 -05:00
  • af69467bea Added notes to log table snipe 2013-11-27 01:29:57 -05:00
  • 432600ab7b Merge branch 'refs/heads/develop' snipe 2013-11-27 01:21:19 -05:00
  • b1aa67ddb7 Fixes #69 snipe 2013-11-27 01:20:57 -05:00
  • c16382e9d4 Merge branch 'refs/heads/develop' snipe 2013-11-26 22:07:26 -05:00
  • 9f9bb96076 Merge pull request #67 from abrahamvegh/patch-1 snipe 2013-11-26 18:56:54 -08:00
  • f1e280ccde Merge pull request #68 from abrahamvegh/patch-2 snipe 2013-11-26 18:55:14 -08:00
  • cfe28ad903 Update default.blade.php Abraham Vegh 2013-11-26 20:33:44 -05:00
  • bda827c590 Update User.php Abraham Vegh 2013-11-26 20:19:30 -05:00
  • ebc40857e4 Update AssetsController.php Abraham Vegh 2013-11-26 20:15:41 -05:00
  • 69ede7f82c Merge branch 'refs/heads/develop' v0.1.1 snipe 2013-11-26 18:11:00 -05:00
  • 0e3bcfecd0 Should be final fixes for mysql strict mode snipe 2013-11-26 18:10:46 -05:00
  • 96368444ac Default user id snipe 2013-11-26 17:53:03 -05:00
  • ec4172d41a Merge branch 'refs/heads/develop' snipe 2013-11-26 17:49:51 -05:00
  • 8eeae70313 Formatting cleanup snipe 2013-11-26 17:48:51 -05:00
  • a33435ee12 No seriously. Fuck you, MySQL strict. snipe 2013-11-26 17:47:21 -05:00
  • eb7801abf9 Fuck you, MySQL strict mode. Right in the eye. snipe 2013-11-26 17:36:06 -05:00
  • 42450d9cd6 Merge branch 'refs/heads/master' into develop snipe 2013-11-26 17:24:05 -05:00
  • 4c0af1eae1 Fixed typo causing failure with mysql strict snipe 2013-11-26 17:22:40 -05:00
  • 35e5df8bdc Merge branch 'refs/heads/develop' snipe 2013-11-26 16:51:44 -05:00
  • dfd374b875 Removed optional from db seed snipe 2013-11-26 16:51:23 -05:00
  • 7722c50312 Merge branch 'refs/heads/develop' snipe 2013-11-26 16:37:09 -05:00
  • 1527b88fd6 Fixes #61 snipe 2013-11-26 16:36:42 -05:00
  • 7f82a6e9fa Merge branch 'refs/heads/develop' v0.1.0 snipe 2013-11-26 14:55:49 -05:00
  • 196710dac8 Fixed bug in error validation display snipe 2013-11-26 14:55:04 -05:00
  • 194c0b6c7b Implemented new alpha_space validation snipe 2013-11-26 14:54:46 -05:00
  • b3b67abaa0 New alpha_space custom validation snipe 2013-11-26 14:08:17 -05:00
  • 0f0059342c CSRF routing snipe 2013-11-26 12:49:04 -05:00
  • d7a8cac1dc Fixed validation snipe 2013-11-26 12:46:23 -05:00
  • c8288b430e Merge branch 'refs/heads/develop' snipe 2013-11-26 11:57:39 -05:00
  • dc5ad87686 Fixes #59 snipe 2013-11-26 11:57:14 -05:00
  • 1ff93f65b3 Merge branch 'refs/heads/develop' snipe 2013-11-26 07:29:08 -05:00
  • 4ccb93665b Sexy typeahead select2 boxes for license and asset checkout snipe 2013-11-26 07:28:47 -05:00
  • 32a63cdd56 Switched asset->id to license->id snipe 2013-11-26 07:26:07 -05:00