bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-10-31 17:05:36 -04:00
Code Issues Projects Releases Wiki Activity
379 Commits 8 Branches 8 Tags
Commit Graph

379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Denney
2d51bd1d9a Creating Transactions works 
-Need to scope transactions for users
-Only Admins should be able to create transactions
 2013-01-20 16:14:53 -05:00
Jason Denney
1b7daa45ca Nested isn't working, another approach, add trans validations 
User a transactions border, select the customer from a view of users and customers
 2013-01-20 14:57:43 -05:00
Jason Denney
31935f6f7e Nested attributes on Transactions isn't working so well 2013-01-20 13:52:47 -05:00
Jason Denney
d95f51eeca Created customers 2013-01-20 13:52:19 -05:00
Jason Denney
11e738b428 Adding transactions 
-Need to create a customers table to store contact information of customers who are not a user.
-Need to scope "User Transactions" for users, staff, and admin. Need to have a "All Shop Transactions" tab.
-Need to add conditional UX to form.
 2013-01-19 15:59:47 -05:00
Jason Denney
855565dcc4 Removing everything that is not necessary (keeping them in dev branch) 2013-01-13 14:08:58 -05:00
Jason Denney
a9533e6249 Merge branch 'js_refactor' 2013-01-13 13:51:49 -05:00
Jason Denney
6918520b01 Make create user let users enter address info, only require phone num 2013-01-06 22:43:40 -05:00
Jason Denney
cee461ebd9 Breaking out javascript into js files instead of inline 2013-01-06 22:41:59 -05:00
Jason Denney
c1dbd2b8ec Merge branch 'master' of github.com:spacemunkay/velocipede 2013-01-06 17:28:39 -05:00
Jason Denney
92f7a3178c Changed tab titles, and removed some redundant panel headers(titles) 2013-01-06 17:28:19 -05:00
Jason Denney
960d40ecad Update README.md 
Update install procedure
 2013-01-05 14:55:05 -05:00
Jason Denney
40393d882f adding public/images directory 2013-01-05 14:46:53 -05:00
Jason Denney
aa3658ec63 fix wrong id in fixtures 2013-01-05 14:31:59 -05:00
Jason Denney
55584bf003 Update lock 2013-01-05 14:29:00 -05:00
Jason Denney
a42aba6961 Ignore extjs library, icons, and .DS_Store 2013-01-05 14:19:34 -05:00
Jason Denney
9b7ca53f8e remove comment 2013-01-05 14:09:37 -05:00
Jason Denney
c00c8fa3df Fixed user profiles and added NOTE action to bike_logs 2013-01-05 14:01:26 -05:00
Jason Denney
b11d04a397 Removing puts and console.logs 2013-01-01 21:06:41 -05:00
Jason Denney
3ac630f9f3 Round hours on stats page 2013-01-01 20:49:30 -05:00
Jason Denney
665cc9f97a Update stats when user log grid updated, and other stuff 2013-01-01 20:48:57 -05:00
Jason Denney
189137ba9d Almost usable, still a lot of work left 
-Moved bikes to User model instead of profile
-User can copy user log to a bike log with new actsasloggable
-Added user stats
-some css was messing up checkboxes, need to figure out which stylesheet was doing that
 2012-12-31 15:38:34 -05:00
Jason Denney
922af526c1 Order bike brands and models alphabetically 2012-12-29 16:22:46 -05:00
Jason Denney
db9982dcd2 Added user roles and authentication, sign in/out 2012-12-29 16:22:24 -05:00
Jason Denney
bb27c7a585 Removing unused file 2012-12-29 16:19:23 -05:00
Jason Denney
a626395648 Fixed associated attribute headers 2012-12-27 02:16:23 -05:00
Jason Denney
3f850d61f1 Added extra status to bike statuses 2012-12-27 02:15:56 -05:00
Jason Denney
39246da893 Added default times to log forms 2012-12-27 02:15:39 -05:00
Jason Denney
4ebcbca081 Still a work in progress 2012-12-26 21:21:58 -05:00
Jason Denney
985451f959 Remove Unused file 2012-12-26 21:20:33 -05:00
Jason Denney
d7f5eb26bf Experimenting with Netzke/ ExtJS 2012-12-23 09:02:07 -05:00
Jason Denney
ead5f7b433 Add bikes and users links to layouts 2012-12-17 22:24:56 -05:00
Jason Denney
d5b312fa54 Add users resources and paginate users index 2012-12-17 22:24:31 -05:00
Jason Denney
939ea5b9db Refactored log controller, added log editing 
Refactored log controller, added log editing
 2012-12-17 10:19:02 -05:00
Jason Denney
c98c53de76 Got logs working for users and bikes 
Not my best work, but it works, need to add transactions, need to add edit/show actions
 2012-12-14 00:03:11 -05:00
Jason Denney
b2eefd8163 actsasloggable transaction actions fixtures, resources, controller, and views 2012-12-09 18:11:18 -05:00
Jason Denney
139f5ccf9b ActsAsLoggable User Actions fixtures, resources, controller, and views 2012-12-09 18:06:04 -05:00
Jason Denney
7e0f43b271 Added BikeConditions resources, controller, and views 2012-12-09 17:53:06 -05:00
Jason Denney
ca8b945e03 Updating doesn't work on bike_actions 2012-12-09 16:28:05 -05:00
Jason Denney
a27c898ddb Add acts_as_loggable/bike_actions resources, controller, and views 
-Note that updating doesn't work due to expose gem perhaps?  Need to fix
 2012-12-09 16:27:38 -05:00
Jason Denney
b4f2abf05f Rename models to singular 2012-12-09 16:26:12 -05:00
Jason Denney
4e6abf4a52 Needed some to_s 2012-12-09 14:27:07 -05:00
Jason Denney
d3c466761e Add bike routes, controller, and views. Update model. 2012-12-09 14:26:58 -05:00
Jason Denney
885caefaf7 Create factory for seeding db with fake bikes, update seeds.rb 2012-12-09 14:26:31 -05:00
Jason Denney
e41426ea7b Added bike styles routes, controller and views 2012-12-09 13:29:20 -05:00
Jason Denney
1c203d86f5 Fix instance variables to locals 2012-12-09 13:16:26 -05:00
Jason Denney
4ae03fc563 expose is awesome 2012-12-09 13:15:57 -05:00
Jason Denney
8d488c86a0 Added Bike Status routes, Controller and views 2012-12-09 13:15:38 -05:00
Jason Denney
747b8d9c4b Added bike models controller and views 2012-12-08 16:56:50 -05:00
Jason Denney
62c70f4388 edit brand show.html 2012-12-08 16:56:30 -05:00