Commit Graph

466 Commits

Author SHA1 Message Date
snipe 3cce78c087 Weird layout 2013-11-28 18:43:30 -05:00
snipe d9a37f3822 Fixes #88 2013-11-28 18:31:36 -05:00
snipe 4fcdf72ab6 Responsive design bug fixes, placeholder code for #64 (commented out) 2013-11-28 16:50:53 -05:00
snipe 8680d98bc3 Fixed status display bug 2013-11-28 16:46:34 -05:00
snipe b3bb2d4f11 Added soon-out-of-warranty example to test notifications 2013-11-28 16:37:24 -05:00
snipe 5c28089f2b RTD has to be 0, or it will conflict with the custom status labels 2013-11-28 16:37:05 -05:00
snipe 9e189aa309 Fixes #80, also prevents the user from checking out an asset that is undeployable, etc 2013-11-28 15:52:00 -05:00
snipe 7a3d92522e Merge pull request #86 from peelman/develop
Cancel and back buttons on edit forms now take you back properly
2013-11-28 11:13:32 -08:00
Nick Peelman 54013cfd42 Cancel and back buttons on edit forms now take you back properly 2013-11-28 10:23:52 -05:00
snipe 54d9d72549 Tweaks to example configs to prevent data leakage 2013-11-28 01:15:30 -05:00
snipe 819a606204 Changed modelno validator to alpha_space 2013-11-28 00:58:34 -05:00
snipe 33f81abcd3 Added a few more symbols for alpha_space 2013-11-28 00:58:08 -05:00
snipe fbb0b22522 vi or GTFO
:P
2013-11-28 00:57:40 -05:00
snipe 6b017d12c0 Merge pull request #85 from snipe/gitignore_clean
Replace enumeration of files with wildcard
2013-11-27 21:33:23 -08:00
Brady Wetherington 6691447624 Replace enumeration of files with wildcard 2013-11-27 19:26:53 -05:00
snipe 39cc0c6ad7 Merge pull request #83 from peelman/IgorningProductionConfigs
Igorning production configs
2013-11-27 16:22:10 -08:00
Nick Peelman cb87b16e28 its code, not a block quote...
i are stupid.
2013-11-27 19:22:04 -05:00
Nick Peelman 5be13d5eb5 Ignore production configs and sqlite files. Provide example files for renaming. Update install instructions in README accordingly. 2013-11-27 19:19:07 -05:00
snipe eb015b1e22 Merge branch 'refs/heads/develop' 2013-11-27 14:14:41 -05:00
snipe 012a889444 Corrected license seat count associated with license. Fixes #75 2013-11-27 14:13:29 -05:00
snipe e79d27c984 Merge branch 'refs/heads/develop' 2013-11-27 12:26:15 -05:00
snipe 6552401fd8 Fixes #77 2013-11-27 12:25:48 -05:00
snipe da96126445 Merge pull request #78 from peelman/ExpandManufacturer
Expand Manufacturer
2013-11-27 09:05:10 -08:00
Nick Peelman 301ef3fddb Add Manufacturer and Model info to asset page 2013-11-27 11:37:22 -05:00
Nick Peelman d6ba98252d Change N/A to Select One 2013-11-27 11:37:02 -05:00
snipe 9aa6b519c9 Wider display for address field in index blade 2013-11-27 10:34:51 -05:00
Nick Peelman 9f19792985 Save manufacturer ID 2013-11-27 10:32:50 -05:00
snipe e4d56dba92 Merge pull request #73 from peelman/EmailInputTypes
Email input types
2013-11-27 07:28:15 -08:00
snipe e49cb9eb85 Merge pull request #72 from peelman/AddAddressToLocation
Add address to location form
2013-11-27 07:27:45 -08:00
Nick Peelman b7579a1420 Copy/Paste Error 2013-11-27 10:25:25 -05:00
Nick Peelman 6f59617546 Add to controller's edit method too... 2013-11-27 10:23:11 -05:00
Nick Peelman 996458dde3 missing semicolon 2013-11-27 10:18:43 -05:00
Nick Peelman c2d889de12 Add necessary use statements, clean up the run-on return statement that was forming... 2013-11-27 10:18:15 -05:00
Nick Peelman b5a0da03a8 Add manufacturer to edit form 2013-11-27 10:06:36 -05:00
Nick Peelman 8d3d337820 Change input type to email where relevant (better mobile support) 2013-11-27 08:42:31 -05:00
Nick Peelman 1314a1ffea Add location address values to controller save methods... 2013-11-27 08:30:51 -05:00
Nick Peelman bed78dd935 Remove erroneous rule from address2 2013-11-27 08:28:00 -05:00
Nick Peelman 02e5333101 Add address fields to Location edit form 2013-11-27 08:21:12 -05:00
snipe 0aa3c676c2 Merge branch 'refs/heads/develop' 2013-11-27 03:40:21 -05:00
snipe acd9505597 Two-digit decimal for purchase_cost 2013-11-27 03:40:01 -05:00
snipe 65cd28aad3 Fixes #14 2013-11-27 03:39:28 -05:00
snipe 12684b214a Merge branch 'refs/heads/develop' 2013-11-27 02:57:21 -05:00
snipe 5c72aabdea Updated readme for DB migrations reminder 2013-11-27 02:57:02 -05:00
snipe a2b353fb6d Merge branch 'refs/heads/develop' 2013-11-27 02:41:04 -05:00
snipe aa38d83ba6 Fixes #63 and #70 2013-11-27 02:38:16 -05:00
snipe af69467bea Added notes to log table 2013-11-27 01:29:57 -05:00
snipe 432600ab7b Merge branch 'refs/heads/develop' 2013-11-27 01:21:19 -05:00
snipe b1aa67ddb7 Fixes #69
Removed problem migration file
2013-11-27 01:20:57 -05:00
snipe c16382e9d4 Merge branch 'refs/heads/develop' 2013-11-26 22:07:26 -05:00
snipe 9f9bb96076 Merge pull request #67 from abrahamvegh/patch-1
Patch 1
2013-11-26 18:56:54 -08:00