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

47 Commits

Author SHA1 Message Date
Jason Denney
7c85e2901f Changes needed to run in produciton 2013-06-02 21:50:22 -04:00
John N. Milner
c5b16139f5 Merge branch 'master' into denney-new-user-form 
Conflicts:
	db/schema.rb
 2013-05-30 22:03:53 -04:00
Jason Denney
9021294c4b Auth by username instead of email 
Added username to User table/model
 2013-05-25 11:08:58 -04:00
jnm
3c90c13c3b Merge pull request #15 from spacemunkay/denney-add-users-roles 
Changing UserRole to UserRoleJoin
 2013-05-23 18:03:59 -07:00
Jason Denney
d7755f00ed Initial stab at check-in feature 2013-05-19 15:43:44 -04:00
darmock
f34def2c09 Store role_id as an integer instead of a string 2013-05-10 03:30:54 -04:00
Jason Denney
a083ed715b Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table 2013-04-24 07:56:02 -04:00
Jason Denney
91bb2ea43e Changing UserRole to UserRoleJoin 
Beware, this breaks the view for some reason
 2013-04-23 23:21:17 -04:00
John N. Milner
a3fcdec10c WIP adding user roles view; adding end datetime to user roles 2013-04-18 22:16:13 -04:00
John N. Milner
941f7a267b Add migration to accompany 55fbd0630527761077a15988b2229a6afac548e4 2013-04-07 16:50:53 -04:00
John N. Milner
55fbd06305 Closes #1 2013-04-04 22:27:54 -04:00
Jason Denney
ad26dab160 Finished adding default Bike task list 2013-02-09 22:34:56 -05:00
Jason Denney
545c33b953 Added TaskList and Task migrations and models 2013-02-08 22:10:52 -05:00
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
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
aa3658ec63 fix wrong id in fixtures 2013-01-05 14:31:59 -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
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
db9982dcd2 Added user roles and authentication, sign in/out 2012-12-29 16:22:24 -05:00
Jason Denney
3f850d61f1 Added extra status to bike statuses 2012-12-27 02:15:56 -05:00
Jason Denney
4ebcbca081 Still a work in progress 2012-12-26 21:21:58 -05:00
Jason Denney
d7f5eb26bf Experimenting with Netzke/ ExtJS 2012-12-23 09:02:07 -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
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
885caefaf7 Create factory for seeding db with fake bikes, update seeds.rb 2012-12-09 14:26:31 -05:00
Jason Denney
29af72787b Add Bike Style model and defaults 2012-12-08 16:36:29 -05:00
Jason Denney
0d5b93b0b1 fix if in seeds.rb 2012-12-08 16:34:39 -05:00
Jason Denney
3ce2cef2f6 Add extra default condition 2012-12-08 16:27:53 -05:00
Jason Denney
a307d5f6d5 Load bike brands and models into sqlite3, This will work for now 2012-12-08 15:00:24 -05:00
Jason Denney
7bf4c4d601 Added bike_brands and bike_models sql data 
-Update some migrations to match source schema, will need to add timestamps back eventually
 2012-12-08 14:59:49 -05:00
Jason Denney
6937cc3146 Added sql for bike brands and their models 2012-12-08 14:22:43 -05:00
Jason Denney
609870c264 removing puts, and fixing File.join 2012-12-08 09:44:02 -05:00
Jason Denney
7ba1ef6225 move test/fixtures to db/seed/fixtures since they are only used for seeding, not testing. 2012-12-08 09:43:46 -05:00
Jason Denney
c99d1e5f55 Can now seed via rake db:seed 
Only using fixtures for seeding, using factories for testing.  
-For some reason, module fixtures won't auto create dates, must include updated_at and created_at dates in fixture.
 2012-12-07 10:39:13 -05:00
Jason Denney
56da361bca Edit migration to allow a user to own a bike 2012-12-05 09:25:14 -05:00
Jason Denney
70b7b33909 Adding transaction migration 2012-12-05 00:07:04 -05:00
Jason Denney
34c13a7717 Make sure some columns are never null. 2012-12-04 23:36:50 -05:00
Jason Denney
312fa7d787 Adding bike attribute tables migrations 2012-12-04 23:15:34 -05:00
Jason Denney
2ac1b7dcd9 formatting 2012-12-04 23:14:53 -05:00
Jason Denney
8f276b6ffc Added bike_statuses. 2012-12-04 21:53:05 -05:00
Jason Denney
d6622b1bbd Add User Profile migration 2012-12-04 20:51:34 -05:00
Jason Denney
219d7616c6 Add bike migration 2012-12-04 17:35:02 -05:00
Jason Denney
ea8dd6842c Adding acts_as_loggable migrations 2012-12-04 17:08:18 -05:00
Jason Denney
aa3ed3d43b git init 2012-12-04 00:46:15 -05:00