bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 08:43:23 -05:00
Code Issues Projects Releases Wiki Activity
236 Commits 8 Branches 8 Tags
Commit Graph

236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Denney
490c9d84b6 Merge pull request #90 from spacemunkay/denney-custom-time-field 
Denney custom time field
 2013-11-03 05:49:29 -08:00
Jason Denney
84ed8503d1 Remove console.log 2013-11-03 08:46:30 -05:00
Jason Denney
75f4a7980b Need end date to edit start date, fix type 2013-11-03 08:45:10 -05:00
Jason Denney
16cda6aa86 Remove unused code, add comment 2013-11-03 08:42:30 -05:00
Jason Denney
de338276c0 Couldn't edit in columns, assign date correctly 2013-11-03 08:40:37 -05:00
Jason Denney
25808eb27a Boom! Meridian time component 2013-11-03 07:22:57 -05:00
Jason Denney
d983647e29 Almost done, need to change minutes to textfield 2013-11-03 07:12:56 -05:00
Jason Denney
cb4763c172 So close, just a minor bug left to fix 
Can't put a field container within a field container, need to flatten it out.
 2013-11-02 19:38:31 -04:00
Jason Denney
3d6f698fb9 Only update shop_id in migration 2013-11-02 15:12:55 -04:00
Jason Denney
f7ce96152b Merge pull request #89 from spacemunkay/wheelsize-list 
Wheelsize list
 2013-10-19 16:34:52 -07:00
Jason Denney
4c8f74acf2 Merge branch 'master' of github.com:spacemunkay/velocipede 2013-10-19 19:26:42 -04:00
Jason Denney
c2b8a13db2 Update Gemfile.lock 2013-10-19 19:26:21 -04:00
Jason Denney
77d7fad3ce Merge pull request #88 from spacemunkay/grid-sizing-79 
Added forceFit option to all the grids so they resize nicely
 2013-10-19 15:30:08 -07:00
Jason Denney
3bea39b53a Merge pull request #75 from spacemunkay/default-dropdown-values-67 
Default dropdown values 67
 2013-10-19 15:09:51 -07:00
Jason Denney
4eae374aa9 Fix column title while we're at it 2013-10-19 18:08:55 -04:00
Jason Denney
dc60630d2d On second thought, don't want to default this one. 2013-10-19 18:08:32 -04:00
root
6e92d343a5 Merge branch 'wheelsize-list' of https://github.com/spacemunkay/velocipede into wheelsize-list 2013-10-19 21:43:17 +00:00
root
2ceb744925 Allow horizontal scrolling for combo list box drop down items 2013-10-19 21:42:29 +00:00
Jason Denney
b27d682517 Bug caused by Bike.wheel_size no longer existing 2013-10-19 16:28:09 -04:00
Ron Warholic
ba0f84a97c Added forceFit option to all the grids so they resize nicely 2013-10-19 16:19:27 -04:00
Jason Denney
4aed82cf80 Make wheel size an combobox option on bikes 2013-10-19 15:37:01 -04:00
Ron Warholic
83bdaf5973 Removed errant whitespace 2013-10-19 12:53:28 -04:00
Ron Warholic
d94d747373 Merge branch 'master' of https://github.com/spacemunkay/velocipede 2013-10-19 12:51:10 -04:00
Ron Warholic
da176e00ba Added default values for most add-item forms 2013-10-19 12:50:38 -04:00
Jason Denney
f17c168d1d Merge pull request #72 from spacemunkay/sorting-and-shop-id-fix-68-63 
Sorting and shop id fix 68 63
 2013-10-19 07:12:57 -07:00
Ron Warholic
5e042c2577 Added migration file 2013-10-19 10:03:02 -04:00
Jason Denney
bceac0543a Merge pull request #73 from spacemunkay/denney-min-chars 
Denney min chars
 2013-10-18 21:36:18 -07:00
Jason Denney
3faa19bc0c Adding min chars to forms 2013-10-19 00:32:08 -04:00
Jason Denney
bbba67d7d5 remove trailing whitespace 2013-10-19 00:31:36 -04:00
Ron Warholic
6cbe0f8b57 Merge branch 'master' of https://github.com/spacemunkay/velocipede 2013-10-18 23:45:51 -04:00
Ron Warholic
86ada003d6 Fixed default sort and added migration for shop_id => Integer 2013-10-18 23:44:12 -04:00
Jason Denney
9a78478f1a Merge pull request #71 from spacemunkay/sequence-increment-bug-31 
Fixed the seeder loading the sql incorrectly; now stubs the index out so...
 2013-10-18 19:57:51 -07:00
Jason Denney
8d8058dea0 Comment for bike brands sql insert issue 2013-10-18 22:57:10 -04:00
Ron Warholic
93b8e3b055 Fixed the seeder loading the sql incorrectly; now stubs the index out so it generates the sequence number. 2013-10-18 21:24:44 -04:00
Jason Denney
cfeb6fd1d2 Update README.md 
Remove mailcatcher instructions since no emails are sent currently.
 2013-10-15 16:21:57 -04:00
Jason Denney
ec5db646a0 Use models to sort data when possible 2013-09-02 18:24:34 -04:00
Jason Denney
de266e72d9 Merge pull request #62 from spacemunkay/denney-css-user-sign-up 
Make user signup easier to read & enter
 2013-09-02 15:08:59 -07:00
Jason Denney
67c51068cc Make user signup easier to read & enter 2013-09-02 18:08:05 -04:00
Jason Denney
8c6513099d Merge pull request #61 from spacemunkay/denney-move-model-to-bike 
Moving bike model to the bikes table
 2013-09-02 14:28:06 -07:00
Jason Denney
47f616b7b0 Moving bike model to the bikes table 
Leaving the bike_models table and bikes.bike_model_id column as a backup.
 2013-09-02 17:26:07 -04:00
Jason Denney
087325c444 Whoops, only create once… not for every update... 2013-09-02 16:23:58 -04:00
Jason Denney
3c4e5c21c2 Merge pull request #59 from spacemunkay/denney-remove-bike-log-end-date 
Bike log events are instanteous, remove end_date
 2013-09-02 12:28:59 -07:00
Jason Denney
69c01b8225 Bike log events are instanteous, remove end_date 2013-09-02 15:26:08 -04:00
Jason Denney
0aa9c16dbd Merge pull request #58 from spacemunkay/denney-default-sort-order 
Set default sort order on users, bikes, userroles
 2013-09-02 11:17:08 -07:00
Jason Denney
e491c0530c Set default sort order on users, bikes, userroles 2013-09-02 14:16:39 -04:00
Jason Denney
3599cc2bbb Merge pull request #56 from spacemunkay/denney-bike-status-to-purpose 
Changing bike_status to bike_purporse
 2013-09-02 11:03:21 -07:00
Jason Denney
cecb3b1a32 Changing bike_status to bike_purporse 2013-09-02 14:02:18 -04:00
Jason Denney
611b1b1151 Merge pull request #55 from spacemunkay/denney-disable-username-edit 
set username to read only
 2013-09-02 09:23:32 -07:00
Jason Denney
5e80c8866a set username to read only 2013-09-02 12:22:26 -04:00
Jason Denney
835e73ea97 Merge branch 'master' of github.com:spacemunkay/velocipede 2013-08-28 23:06:14 -04:00