Jason Denney
bc1eeea16e
Make the title of user roles tab
12 years ago
darmock
f34def2c09
Store role_id as an integer instead of a string
12 years ago
John N. Milner
8f988b2cf1
Use `self.table_name = ` instead of set_table_name to avoid deprecation warning
12 years ago
Jason Denney
a614b28558
Make it possible to limit roles by date
12 years ago
Jason Denney
6f6902dd82
Update Ability to get user roles, not role
12 years ago
Jason Denney
a083ed715b
Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table
12 years ago
Jason Denney
91bb2ea43e
Changing UserRole to UserRoleJoin
Beware, this breaks the view for some reason
12 years ago
John N. Milner
a3fcdec10c
WIP adding user roles view; adding end datetime to user roles
12 years ago
jnm
ac9e5718c7
Merge pull request #14 from spacemunkay/jnm-cancan
cancan
12 years ago
John N. Milner
59e45fa4d3
Initial work on permissions with cancan
12 years ago
John N. Milner
6a29eda8d9
WIP: cancan permissions; it breaks stuff!
12 years ago
Jason Denney
ff708d940b
Merge pull request #13 from spacemunkay/jnm-shop-id
Add migration to accompany 55fbd06305
12 years ago
John N. Milner
941f7a267b
Add migration to accompany 55fbd06305
12 years ago
Jason Denney
b28780e6c9
Merge pull request #12 from spacemunkay/jnm-shop-id
Closes #1
12 years ago
John N. Milner
55fbd06305
Closes #1
12 years ago
Jason Denney
d03194e70e
Merge pull request #11 from spacemunkay/jnm-update-rails
Updated to Rails 3.2.13
12 years ago
John N. Milner
a7b8651314
Updated to Rails 3.2.13
12 years ago
Jason Denney
ad26dab160
Finished adding default Bike task list
12 years ago
Jason Denney
cd65e34ae1
Altered Bikes view to show a bike's task list.
Need to create a default task list for all bikes.
12 years ago
Jason Denney
545c33b953
Added TaskList and Task migrations and models
12 years ago
Jason Denney
ec19c8461d
Adding transactions
12 years ago
Jason Denney
1fbf183603
Use latest acts_as_loggable, switch to not wrapping bikes_border because, netzke?
12 years ago
Jason Denney
873bccb030
Completed adding transactions
12 years ago
Jason Denney
f95191b3e4
Merge pull request #9 from ahacopahacop/master
hack night
12 years ago
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
12 years ago
Ara Hacopian
99e7b26e19
hack night update version change
ruby version change
gemfile and gemfile.lock url update
12 years ago
Jason Denney
2d51bd1d9a
Creating Transactions works
-Need to scope transactions for users
-Only Admins should be able to create transactions
12 years ago
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
12 years ago
Jason Denney
31935f6f7e
Nested attributes on Transactions isn't working so well
12 years ago
Jason Denney
d95f51eeca
Created customers
12 years ago
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.
12 years ago
Jason Denney
855565dcc4
Removing everything that is not necessary (keeping them in dev branch)
12 years ago
Jason Denney
a9533e6249
Merge branch 'js_refactor'
12 years ago
Jason Denney
6918520b01
Make create user let users enter address info, only require phone num
12 years ago
Jason Denney
cee461ebd9
Breaking out javascript into js files instead of inline
12 years ago
Jason Denney
c1dbd2b8ec
Merge branch 'master' of github.com:spacemunkay/velocipede
12 years ago
Jason Denney
92f7a3178c
Changed tab titles, and removed some redundant panel headers(titles)
12 years ago
Jason Denney
960d40ecad
Update README.md
Update install procedure
12 years ago
Jason Denney
40393d882f
adding public/images directory
12 years ago
Jason Denney
aa3658ec63
fix wrong id in fixtures
12 years ago
Jason Denney
55584bf003
Update lock
12 years ago
Jason Denney
a42aba6961
Ignore extjs library, icons, and .DS_Store
12 years ago
Jason Denney
9b7ca53f8e
remove comment
12 years ago
Jason Denney
c00c8fa3df
Fixed user profiles and added NOTE action to bike_logs
12 years ago
Jason Denney
b11d04a397
Removing puts and console.logs
12 years ago
Jason Denney
3ac630f9f3
Round hours on stats page
12 years ago
Jason Denney
665cc9f97a
Update stats when user log grid updated, and other stuff
12 years ago
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
12 years ago
Jason Denney
922af526c1
Order bike brands and models alphabetically
12 years ago
Jason Denney
db9982dcd2
Added user roles and authentication, sign in/out
12 years ago