Timeline added to home page, currently timeline just shows last 100 activities
Timeline added to home page, currently timeline just shows last 100 activities
Forgot to add three files to spec

/imprintables/_form.html.erb_spec.rb
/imprintables/edit.html.erb_spec.rb
/imprintables/new.html.erb_spec.rb
Finish colors and brands
Finish work on sizes, sortable table is a go
Merge branch 'develop-nigel' into develop

Conflicts:
	db/schema.rb
Sorting timeline by newest first
Schema commit
Fixed path to grey background
Merge branch 'develop' into timeline

Conflicts:
	db/schema.rb
Work on sizes, features

Sizes list is sortable
Sizes now contains a display value
Sizes default scope is on order
Include spec for _sidebar_menu, check for nav functionality
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop

Conflicts:
	app/helpers/application_helper.rb
Timeline, modal ajax view in orders,
Timeline, modal ajax view in orders,
Hotfix failure issues in have_field_for

When testing have_field_for inside a form with a css ID and class both containing the resource name, it would always succeed, even if the expected field was not present. This is fixed
Merge branch 'develop-nigel-users' into develop

Conflicts:
	config/routes.rb
	db/schema.rb
	spec/support/form_helpers.rb
Removed public_activity gem
Added authentication to features, removed feature for sorting sizes table
Merge branch 'modal-popup' into develop

Conflicts:
	config/routes.rb
	db/schema.rb
Added the devise auth to timeline controller spec