1962 Commits

Author	SHA1	Message	Date
Brenda Wallace	a1c74bfdfb	Translations for members controller	2017-01-22 17:36:48 +13:00
Brenda Wallace	2f9453780e	Translations for harvests controller	2017-01-22 17:28:49 +13:00
Brenda Wallace	725ae817d4	Translations for gardens controller	2017-01-22 17:26:30 +13:00
Brenda Wallace	40a981c94d	Removed unnecesary braces on hash args	2017-01-22 15:10:11 +13:00
Shiny	6121a9bc6e	Merge branch 'dev' into bw/translations	2017-01-20 21:05:31 +11:00
Brenda Wallace	b198305d36	Translations for account controller	2017-01-20 22:48:04 +13:00
Brenda Wallace	7d7f5bfda3	Translations for account types	2017-01-20 22:46:12 +13:00
pozorvlak	cc59c4f49b	Merge branch 'dev' into bw/rubocop	2017-01-17 16:47:07 +00:00
Shiny	f8dda12de6	Merge branch 'dev' into bw/active-plantings	2017-01-15 17:36:32 +13:00
Shiny	ab332976da	Merge branch 'dev' into bw/rubocop	2017-01-15 17:36:17 +13:00
Brenda Wallace	39888d44e2	Rubocop compliance for the account model	2017-01-14 21:11:02 +13:00
Brenda Wallace	b603bae1a7	Rubocop compliance for the notification model	2017-01-14 21:09:47 +13:00
Brenda Wallace	05db5f3109	Rubocop compliance for the order_item model	2017-01-14 21:08:47 +13:00
Brenda Wallace	ad72ab0ba8	Rubocop compliance for the role model	2017-01-14 21:04:19 +13:00
Brenda Wallace	3beb3974fc	Rubocop compliance for the product model	2017-01-14 21:03:01 +13:00
Brenda Wallace	fa15fd2912	Rubocop compliance for the photo model	2017-01-14 21:01:46 +13:00
Brenda Wallace	78ed7869c5	Rubocop compliance for the member model	2017-01-14 20:57:18 +13:00
Brenda Wallace	0fa9f54c9c	Rename member.has_role? to role?	2017-01-14 20:54:43 +13:00
Brenda Wallace	f214f608ff	Rename member.is_paid? to paid?	2017-01-14 20:51:22 +13:00
Brenda Wallace	eb70f6dc57	Rubocop compliance for the seed model	2017-01-14 20:48:19 +13:00
Brenda Wallace	43c4b154f9	Rubocop compliance for the follow model	2017-01-14 20:45:54 +13:00
Brenda Wallace	832a20eac9	Rubocop compliance for order model	2017-01-14 20:42:32 +13:00
Brenda Wallace	f6cc0f3e13	rubocop compliance in post model	2017-01-14 20:34:08 +13:00
Brenda Wallace	5be5585084	Rubocop disable Rails/HasAndBelongsToMany	2017-01-14 20:31:34 +13:00
Brenda Wallace	989f176fb7	Crop model adhering to rubocop	2017-01-14 20:09:54 +13:00
Brenda Wallace	be07b5fd0e	Only check values.zero? if they are present	2017-01-14 20:09:09 +13:00
Brenda Wallace	d07509f9e4	Rubocop compliance for comment model	2017-01-14 17:23:39 +13:00
Brenda Wallace	0c1220d11f	Rubocop compliance for harvest model	2017-01-14 17:22:33 +13:00
Brenda Wallace	f889b112fe	Rubocop compliance for garden model	2017-01-14 17:20:21 +13:00
Brenda Wallace	477f9669bd	Added nav for plantings	2017-01-14 16:54:37 +13:00
Brenda Wallace	c1da5e4dc8	Split plantings#index into two methods to simplify	2017-01-14 16:47:29 +13:00
Brenda Wallace	6bdfe5a669	Moved plantings nav bar to own file and simplified	2017-01-14 16:32:03 +13:00
Brenda Wallace	eba397117c	Planting needs to calculate slugs before model is valid	2017-01-14 11:41:48 +13:00
Brenda Wallace	405dfe4bc9	Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links	2017-01-08 21:35:59 +13:00
Shiny	15de4ac08c	Merge branch 'dev' into bw/active-plantings	2017-01-08 11:16:19 +13:00
Brenda Wallace	062ff16acf	Put garden.to_s back to garden.name	2017-01-07 13:17:53 +13:00
Brenda Wallace	7f30ce04e0	Garden name (truncated) on front page link	2017-01-07 13:09:35 +13:00
Brenda Wallace	90b19d52bb	Don't rely on to_s for slug. Fragile with translations	2017-01-07 12:49:57 +13:00
Brenda Wallace	76be980163	Translate garden.location	2017-01-07 12:48:14 +13:00
Brenda Wallace	88b1f02574	Added require of photo model constants	2017-01-07 12:44:08 +13:00
Brenda Wallace	5b633b484b	Fixes link to seeds, and spec for link to seeds	2017-01-07 12:22:28 +13:00
Brenda Wallace	5319d23ee3	Using translations on links from photo page	2017-01-07 12:03:31 +13:00
Brenda Wallace	350c1d4c08	Descriptive links from photo page	2017-01-06 22:25:13 +13:00
Shiny	5ca8829727	Merge branch 'dev' into bw/active-plantings	2017-01-05 16:35:39 +13:00
Shiny	d40eccdb63	Merge branch 'dev' into bw/harvests-linkto-plantings	2017-01-05 16:31:22 +13:00
Brenda Wallace	283bb76a9e	Link a harvest to a planting, and display	2017-01-04 22:45:49 +13:00
Brenda Wallace	b27b361e2f	Show active plantings by default	2017-01-04 16:25:19 +13:00
Shiny	8b3b28b9d6	Merge branch 'dev' into bw/garden-specs	2017-01-03 20:50:20 +13:00
Brenda Wallace	881acdccc9	Shortening long garden names on a user's page	2017-01-02 20:54:22 +13:00
Brenda Wallace	3b1753d3d5	Garden's name in link	2017-01-02 20:36:25 +13:00