John N. Milner c5b16139f5 Merge branch 'master' into denney-new-user-form ...

Conflicts:
	db/schema.rb

2013-05-30 22:03:53 -04:00

..

acts_as_loggable

Completed adding transactions

2013-02-02 14:08:42 -05:00

.gitkeep

git init

2012-12-04 00:46:15 -05:00

ability.rb

Update Ability to get user roles, not role

2013-04-25 21:25:49 -04:00

bike_brand.rb

Order bike brands and models alphabetically

2012-12-29 16:22:46 -05:00

bike_condition.rb

Needed some to_s

2012-12-09 14:27:07 -05:00

bike_model.rb

Order bike brands and models alphabetically

2012-12-29 16:22:46 -05:00

bike_status.rb

Needed some to_s

2012-12-09 14:27:07 -05:00

bike_style.rb

Needed some to_s

2012-12-09 14:27:07 -05:00

bike.rb

Closes #1

2013-04-04 22:27:54 -04:00

customer.rb

Some Transactions view adjustments

2013-01-23 00:09:39 -05:00

role.rb

Changing UserRole to UserRoleJoin

2013-04-23 23:21:17 -04:00

task_list.rb

Finished adding default Bike task list

2013-02-09 22:34:56 -05:00

task.rb

Added TaskList and Task migrations and models

2013-02-08 22:10:52 -05:00

team_membership.example

git init

2012-12-04 00:46:15 -05:00

team.example

git init

2012-12-04 00:46:15 -05:00

transaction.rb

Creating Transactions works

2013-01-20 16:14:53 -05:00

user_profile.rb

Registration form now remembers field values for nested form errors

2013-05-25 09:00:12 -04:00

user_role_join.rb

Use self.table_name = instead of set_table_name to avoid deprecation warning

2013-05-10 03:21:13 -04:00

user.rb

Merge branch 'master' into denney-new-user-form

2013-05-30 22:03:53 -04:00