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

Conflicts:
	db/schema.rb

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

..

20120227024410_devise_create_users.rb

Almost usable, still a lot of work left

2012-12-31 15:38:34 -05:00

20120227040841_add_lockable_to_user.rb

git init

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

20120301124238_add_names_to_user.rb

git init

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

20120308031328_create_teams.example

git init

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

20120325023452_add_private_team_to_team.example

git init

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

20120325031259_create_team_memberships.example

git init

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

20121204220660_acts_as_loggable_migration.rb

Still a work in progress

2012-12-26 21:21:58 -05:00

20121204220661_acts_as_loggable_bike_actions_migration.rb

Make sure some columns are never null.

2012-12-04 23:36:50 -05:00

20121204220662_acts_as_loggable_user_actions_migration.rb

Make sure some columns are never null.

2012-12-04 23:36:50 -05:00

20121204220663_acts_as_loggable_transaction_actions_migration.rb

Make sure some columns are never null.

2012-12-04 23:36:50 -05:00

20121204221242_create_bike.rb

Almost usable, still a lot of work left

2012-12-31 15:38:34 -05:00

20121204223403_create_user_profile.rb

Almost usable, still a lot of work left

2012-12-31 15:38:34 -05:00

20121205024701_create_bike_statuses.rb

Make sure some columns are never null.

2012-12-04 23:36:50 -05:00

20121205040400_create_bike_brands.rb

Added bike_brands and bike_models sql data

2012-12-08 14:59:49 -05:00

20121205040602_create_bike_models.rb

Added bike_brands and bike_models sql data

2012-12-08 14:59:49 -05:00

20121205040829_create_bike_styles.rb

Make sure some columns are never null.

2012-12-04 23:36:50 -05:00

20121205041000_create_bike_conditions.rb

Make sure some columns are never null.

2012-12-04 23:36:50 -05:00

20121205043759_create_transactions.rb

Creating Transactions works

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

20121229160809_create_user_roles.rb

Added user roles and authentication, sign in/out

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

20130120142249_create_customers.rb

Created customers

2013-01-20 13:52:19 -05:00

20130209022259_task_list.rb

Added TaskList and Task migrations and models

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

20130209023110_task.rb

Added TaskList and Task migrations and models

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

20130405012238_alter_bike.rb

Add migration to accompany 55fbd06305

2013-04-07 16:50:53 -04:00

20130419010051_add_ends_to_user_roles.rb

WIP adding user roles view; adding end datetime to user roles

2013-04-18 22:16:13 -04:00

20130423231937_alter_user_roles.rb

Store role_id as an integer instead of a string

2013-05-10 03:30:54 -04:00

20130423233228_add_roles.rb

Changing UserRole to UserRoleJoin

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

20130424005701_alter_user.rb

Changing UserRole to UserRoleJoin

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

20130525143240_add_username_to_user.rb

Auth by username instead of email

2013-05-25 11:08:58 -04:00