bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2026-09-10 22:01:38 -04:00
Code Issues Projects Releases Wiki Activity
285 Commits 8 Branches 8 Tags
e0041662d38a7fb9578217915be81c075a709005
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Denney e0041662d3 WIP, adding api/bikes_controller#create 2014-02-02 17:11:13 -05:00
Jason Denney c575fface9 Commenting out description on bike form for now 2014-02-02 17:10:32 -05:00
Jason Denney 83a4e4e9c1 Make bike color not required 2014-02-02 17:10:17 -05:00
Jason Denney f17eba810e WTF? Is this needed? Commenting this out for now 
users#checkout  copy pasta perhaps?
 2014-02-02 17:09:49 -05:00
Jason Denney 4b5133fd02 Fix unauthorized return code 2014-02-02 17:09:13 -05:00
Jason Denney 9edb90203c Remove whitespace 2014-02-02 09:45:18 -05:00
Jason Denney 8e112ca936 Adding logs_controller_spec, finally test coverage!!!!! 2014-02-02 09:45:01 -05:00
Jason Denney 8c5ff986a2 Update spec, remove turnip, to get tests working 2014-02-02 09:44:18 -05:00
Jason Denney f10b2adad6 Convert .rvmrc to ruby version and gemset 2014-02-02 09:43:22 -05:00
Jason Denney bd6872413e Make year dynamically updated 2014-01-21 23:35:11 -05:00
Jason Denney a8bdb52536 Improved Add Bike view 
Worked out some bootstrap overrides issues
 2014-01-19 19:32:18 -05:00
Jason Denney 0f890e12e9 Added bikes views 
*Added new bike template
 2014-01-18 18:25:21 -05:00
Jason Denney 61472e0fb6 Hide admin view button on small devices 2014-01-18 15:20:34 -05:00
Jason Denney ecb5083f1c Created new dashboard index 
*Added js for logging out button
*WIP
 2014-01-18 15:16:23 -05:00
Jason Denney a84b0e0fe7 Moving Netzke Admin view to Panel controller 
*Moved custom_netzke_helpers code to panel.js
*Added panel controller and index and netzke layout
 2014-01-18 15:14:19 -05:00
Jason Denney 2b863b8d8a Updated Forget Password, other minor changes 2014-01-18 12:11:43 -05:00
Jason Denney a35bd2f22b make sign up mobile friendly 2014-01-15 00:33:32 -05:00
Jason Denney c9d2da3e50 Make sign up links like buttons 2014-01-15 00:00:18 -05:00
Jason Denney df3c29a899 Use twitter bootstrap classes on login 2014-01-12 14:24:57 -05:00
Jason Denney a11f5a1b91 Needed to add task_list_id as attr_accessible 
Also improved labels for adding task
 2013-11-21 20:36:35 -05:00
Jason Denney 2a6e10ee9d Disabling by default was just annoying 2013-11-21 20:35:23 -05:00
Jason Denney ed1f2e6be4 Update schema.rb to make last migration 2013-11-21 19:38:10 -05:00
Jason Denney 852a00881e Velocipede changed their wording to CLASS 
Can't find purpose by name, will have to rely on default ID in case wording is changed.
 2013-11-21 19:37:30 -05:00
Jason Denney 8cc72c9f48 Added link to "add a bike" video 2013-11-17 22:49:11 -05:00
Jason Denney 90b3043d67 wording 2013-11-17 16:57:29 -05:00
Jason Denney 2ad9fab243 Move some instructions to proper section 2013-11-17 16:55:00 -05:00
Jason Denney 43db139dc7 Adding information to the about section 2013-11-17 16:51:46 -05:00
Jason Denney 2b72094f00 Update read me with youtube video link 2013-11-16 18:42:23 -05:00
Jason Denney 1075c1a5b3 Merge pull request #98 from spacemunkay/denney-transaction-lower-tabs 
Replacing user/customer accordion with tab panel
 2013-11-09 08:29:47 -08:00
Jason Denney 65708e743d Replacing user/customer accordion with tab panel 2013-11-09 11:29:08 -05:00
Jason Denney 731d0ed3da Increase width for hour in custom time component 2013-11-09 10:45:25 -05:00
Jason Denney 592049b0e6 Merge pull request #97 from spacemunkay/denney-user-profiles-lower-tabs 
Add lower tabs pane instead of splitting
 2013-11-09 07:44:46 -08:00
Jason Denney c73d5f955a Add lower tabs pane instead of splitting 2013-11-09 10:44:08 -05:00
Jason Denney 966c36b563 Merge pull request #96 from spacemunkay/denney-move-checks 
Move checklist to the left in the tasks view.
 2013-11-09 06:48:40 -08:00
Jason Denney 20a350adf2 Move checklist to the left in the tasks view. 2013-11-09 09:48:05 -05:00
Jason Denney bca0903862 Merge pull request #87 from spacemunkay/move-brands-80 
Moved brands/models tab to the lower pane of bikes
 2013-11-08 21:55:16 -08:00
Jason Denney 5212011256 Merge pull request #95 from spacemunkay/denney-improve-wheel-display 
Don't attempt to show a wheel size if it's blank
 2013-11-04 06:39:34 -08:00
Jason Denney 85129dccaa Merge pull request #94 from spacemunkay/denney-add-faker-data 
Denney add faker data
 2013-11-03 10:59:08 -08:00
Jason Denney 3ba443397e Merge pull request #93 from spacemunkay/denney-disable-subpanels 
Disable sub panels until item clicked
 2013-11-03 08:35:32 -08:00
Jason Denney cda94cf955 Merge pull request #91 from spacemunkay/denney-bike-validation 
Don't validate top tube on bike model
 2013-11-03 07:11:18 -08:00
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 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
Jason Denney b27d682517 Bug caused by Bike.wheel_size no longer existing 2013-10-19 16:28:09 -04:00
Jason Denney 4aed82cf80 Make wheel size an combobox option on bikes 2013-10-19 15:37:01 -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
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
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
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
Jason Denney cb2acd19ba ignore public/assets 2013-08-28 23:06:02 -04:00
Jason Denney ee12bfee8a Merge pull request #54 from spacemunkay/denney-autocomplete-max-chars 
Changing min_chars for autocomplete to 1 char
 2013-08-28 20:03:21 -07:00
Jason Denney 4d008163e1 Changing min_chars for autocomplete to 1 char 2013-08-28 23:01:29 -04:00
Jason Denney 06856f115c Merge pull request #52 from spacemunkay/denney-remove-bike-serial-constraint 
Remove unique constraint on bike_serial
 2013-08-17 21:56:07 -07:00
Jason Denney a9fb3487a1 Remove unique constraint on bike_serial 
bike serial index was already removed.
 2013-08-18 00:51:45 -04:00
Jason Denney 869b67d3e4 Merge pull request #50 from spacemunkay/denney-user-roles-by-full-name 
User roles added by full name instead of username
 2013-08-17 21:04:02 -07:00
Jason Denney cd4f891c95 User roles added by full name instead of username 2013-08-18 00:00:53 -04:00
Jason Denney 71a4bb0af4 Merge pull request #49 from spacemunkay/denney-remove-hours-bike 
remove hours, created_at, updated_at in bike logs
 2013-08-17 20:43:22 -07:00
Jason Denney f1214ab7e6 remove hours, created_at, updated_at in bike logs 2013-08-17 23:38:07 -04:00
Jason Denney aaa6fda90c Merge pull request #48 from spacemunkay/denney-add-end-date-user-timesheet 
Added end date to user timesheet, removed created & updated
 2013-08-17 20:23:17 -07:00
Jason Denney 4a7751959c Added end date to user timesheet, removed created & updated 2013-08-17 23:22:07 -04:00
Jason Denney 028a45702e More comments 2013-08-17 14:07:35 -04:00
Jason Denney 1a8b9c9247 Merge pull request #47 from spacemunkay/denney-create-user-sign-in 
Changed so that user gets checked in after create.
 2013-08-17 11:03:00 -07:00
Jason Denney 4e7f3a1761 Changed so that user gets checked in after create. 2013-08-17 14:01:40 -04:00
Jason Denney a6b41b5560 Merge pull request #46 from spacemunkay/denney-fix-search 
Fixing search form for bikes updated to netzke 8.4
 2013-08-15 19:07:01 -07:00
Jason Denney 4d7634605c Fixing search form for bikes updated to netzke 8.4 
Updated Netzke 8.4, better search styling, case insensitive search, can search associations
Fixed mistake where bikes.condition_id was a string… durrrrrr needs to be integer
 2013-08-15 22:05:29 -04:00
Jason Denney cf922be1b1 Quick workflow short term fix 2013-07-28 15:24:02 -04:00
Jason Denney d755f9971e Update README.md 2013-06-29 17:20:53 -04:00
Jason Denney 52e67a1182 Adding Made in Bmore to Login 2013-06-29 17:18:51 -04:00
Jason Denney 7736ac5c34 Added credit tracking and stats 
Added credit_conversions table so conversions can change over time
Added default credit conversion fixture
Added User#transaction_logs
Added User#total_credits (earned minus spent)
Added User#total_credits_spent (through transaction_logs)
Added User#total_earned_credits (complicated query which finds the conversion rate for a log depending on its created_at date)
 2013-06-29 15:19:38 -04:00
Jason Denney bccd5f10d7 Updated seeds.rb for PG 2013-06-29 11:45:19 -04:00
Jason Denney f0ce8b7171 Switch DB from sqlite to Postgres 
-Postgres for production
-Migrations don't translate well between sqlite and postgres, better to just develop using the same database as production.
-Fixed migrations to work with Postgres
-Updated Readme for PG install instructions
-database config moved to .example
 2013-06-25 23:50:34 -04:00
Jason Denney 238a3af7d5 minor change to check for seeding admin 2013-06-25 22:31:29 -04:00
Jason Denney fee421cabe not optimal production config, but it works 2013-06-25 22:24:21 -04:00
Jason Denney f713c6bacd Forgot to remove nickname from registration form 2013-06-25 22:06:43 -04:00
Jason Denney ac24711289 Rename User History to User Timesheet 2013-06-13 21:14:42 -04:00
Jason Denney b89873d0e5 Updating schema file w/ removed user nick 2013-06-13 21:12:34 -04:00
Jason Denney d431024f01 Adding bike_admin fixture, fixed seeds.rb 2013-06-13 21:11:54 -04:00