Skud 89a5a777e6 Merge branch 'dev' into payments-new ...

Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb

2013-06-04 19:42:00 +10:00

..

admin

added admin controller and index view

2013-05-31 10:23:06 +10:00

account_types.js.coffee

added account_types, fixed a bunch of tests

2013-05-17 16:07:46 +10:00

admin.js.coffee

added admin controller and index view

2013-05-29 14:37:42 +10:00

application.js

Tried to use Bootstrap datepicker. Failed!

2013-03-26 19:27:45 +11:00

bootstrap.js.coffee

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

comments.js.coffee

rails g scaffold Comment

2013-02-06 14:49:49 +11:00

crops.js.coffee

Generate scaffold for Crops; refactor tests

2012-10-02 11:32:56 +01:00

forums.js.coffee

rails g scaffold Forum

2013-02-13 12:55:17 +11:00

gardens.js.coffee

added gardens table

2012-11-05 11:45:56 +08:00

home.js.coffee

Adding a home page

2012-08-23 12:56:37 -07:00

notifications.js.coffee

rails g scaffold notifications.

2013-02-12 13:17:14 +00:00

order_items.js.coffee

rails g scaffold OrderItem...

2013-05-15 13:47:16 +10:00

orders.js.coffee

rails g scaffold Order...

2013-05-07 21:14:08 +10:00

photos.js.coffee

rails g scaffold Photo...

2013-05-08 20:52:35 +10:00

plantings.js.coffee

fixed pozorvlak's date-picker branch

2013-03-26 20:54:12 +11:00

products.js.coffee

rails g scaffold Product...

2013-05-07 21:13:23 +10:00

roles.js.coffee

Added roles, but haven't yet hooked them up to CanCan

2013-02-19 12:29:22 +11:00

scientific_names.js.coffee

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

updates.js.coffee

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00