 snipe
|
ddabdaca02
|
Merge branch 'refs/heads/develop'
v0.1.2
|
2013-11-28 20:59:05 -05:00 |
|
|
snipe
|
839d01a3af
|
Fixed relationship method because fuck you ORM
|
2013-11-28 20:58:40 -05:00 |
|
|
snipe
|
4d421c9a50
|
Leftover method that's not used since the license/asset split
|
2013-11-28 20:58:15 -05:00 |
|
|
snipe
|
9fa826b2e7
|
Fixed assigned to id
|
2013-11-28 20:40:02 -05:00 |
|
|
snipe
|
7718e8d928
|
Checks that checkedout_to isn't 0 before trying to get fullName()
|
2013-11-28 20:28:09 -05:00 |
|
|
snipe
|
23374b7fc6
|
Another leftover from #88
|
2013-11-28 20:27:44 -05:00 |
|
|
snipe
|
f0f07b578b
|
Fixing pivot for users
|
2013-11-28 20:19:23 -05:00 |
|
|
snipe
|
e23f1f10b7
|
Switched validation to alpha_space on notes
|
2013-11-28 20:02:11 -05:00 |
|
|
snipe
|
1b56c31a22
|
Fixed relationship between users/locations because fuck you ORM
|
2013-11-28 19:58:16 -05:00 |
|
|
snipe
|
9f7cbc8a4f
|
Another fix related to #88, also accounts for users with invalid location_ids
|
2013-11-28 19:57:42 -05:00 |
|
|
snipe
|
f504175578
|
Smaller char req for first/last name, longer req for password
|
2013-11-28 19:45:47 -05:00 |
|
|
snipe
|
103faca6ef
|
Clearer display of current vs trashed
|
2013-11-28 19:45:25 -05:00 |
|
|
snipe
|
2fce4884d7
|
Cosmetic changes
|
2013-11-28 19:45:05 -05:00 |
|
|
snipe
|
4142629665
|
Layout tweaks for mobile - related to #54
|
2013-11-28 19:22:39 -05:00 |
|
|
snipe
|
03821838eb
|
Merge branch 'refs/heads/develop'
|
2013-11-28 18:48:15 -05:00 |
|
|
snipe
|
d2959e82a1
|
Redirect to /hardware to finish cleaning up re-routing from #88
|
2013-11-28 18:47:54 -05:00 |
|
|
snipe
|
6a5ccc89df
|
Updated urls from #88
|
2013-11-28 18:44:20 -05:00 |
|
|
snipe
|
5858bfb99b
|
Fixed language file paths caused by #88
|
2013-11-28 18:44:04 -05:00 |
|
|
snipe
|
3cce78c087
|
Weird layout
|
2013-11-28 18:43:30 -05:00 |
|
|
snipe
|
0d0d42f86a
|
Merge branch 'refs/heads/develop'
|
2013-11-28 18:32:07 -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
|
c3769adf80
|
Merge branch 'refs/heads/develop'
|
2013-11-28 15:52:23 -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
|
ccb7a5ddba
|
Merge branch 'refs/heads/develop'
|
2013-11-28 01:16:05 -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 |
|