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
117 Commits 8 Branches 8 Tags
Commit Graph

76 Commits

Author SHA1 Message Date
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
145a731ed2 Remove puts 2013-05-19 16:44:28 -04:00
Jason Denney
a00c1ed925 Finished Checkin/out feature for now 
-Checkin/out api methods can be used while signed in
-Added checkout button in Netzke App, which also signs out in addition to checking out.
 2013-05-19 16:41:43 -04:00
Jason Denney
d7755f00ed Initial stab at check-in feature 2013-05-19 15:43:44 -04:00
Jason Denney
c504252541 Add bootstrap css to login page 2013-05-16 23:40:36 -04:00
Jason Denney
65c8cf8cf1 Fix setting default log action 2013-05-16 22:44:27 -04:00
Jason Denney
81217f1ea8 Give better names to columns, add last name col 2013-05-16 22:41:31 -04:00
Jason Denney
bc1eeea16e Make the title of user roles tab 2013-05-16 22:41:00 -04:00
John N. Milner
8f988b2cf1 Use self.table_name = instead of set_table_name to avoid deprecation warning 2013-05-10 03:21:13 -04:00
Jason Denney
a614b28558 Make it possible to limit roles by date 2013-04-25 21:38:55 -04:00
Jason Denney
6f6902dd82 Update Ability to get user roles, not role 2013-04-25 21:25:49 -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
59e45fa4d3 Initial work on permissions with cancan 2013-04-11 21:14:27 -04:00
John N. Milner
6a29eda8d9 WIP: cancan permissions; it breaks stuff! 2013-04-07 20:44: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
cd65e34ae1 Altered Bikes view to show a bike's task list. 
Need to create a default task list for all bikes.
 2013-02-09 10:00:46 -05:00
Jason Denney
545c33b953 Added TaskList and Task migrations and models 2013-02-08 22:10:52 -05:00
Jason Denney
ec19c8461d Adding transactions 2013-02-02 14:30:00 -05:00
Jason Denney
1fbf183603 Use latest acts_as_loggable, switch to not wrapping bikes_border because, netzke? 2013-02-02 14:26:51 -05:00
Jason Denney
873bccb030 Completed adding transactions 2013-02-02 14:08:42 -05:00
Jason Denney
55d0b8f2f7 Some Transactions view adjustments 
-moved js to customers and users components, in order to use accordion.
-Made the transaction form a little prettier
 2013-01-23 00:09:39 -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
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
92f7a3178c Changed tab titles, and removed some redundant panel headers(titles) 2013-01-06 17:28:19 -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
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