407 Commits

Author	SHA1	Message	Date
Brenda Wallace	79cf7b452c	removing some cms stuff	2018-01-04 14:31:24 +13:00
Brenda Wallace	f4af682d45	Updated code for Rail 5	2018-01-03 17:12:17 +13:00
Brenda Wallace	f1c8743623	Config for rails 5	2018-01-03 17:10:50 +13:00
Brenda Wallace	8a446ecbfc	Member admin	2017-12-17 12:45:19 +13:00
Brenda Wallace	47e82eb0a7	Convert hashes in routes	2017-12-10 19:50:08 +13:00
Brenda Wallace	182c626226	Prefer if/unless modifier	2017-12-06 14:23:12 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +13:00
Brenda Wallace	13e8d1f5a5	Merge remote-tracking branch 'upstream/dev' into api	2017-11-17 21:51:39 +13:00
Shiny	df7a9448b0	Underscore prefix on our last unused args (#1442)	2017-11-13 09:54:55 +00:00
Brenda Wallace	88a119deac	Add a default paginator for api responses	2017-11-13 19:19:18 +13:00
Brenda Wallace	d07fd1a277	Added seeds and harvests to api, and tidied up resources	2017-11-13 19:19:18 +13:00
Brenda Wallace	c96695258b	Basic read only api	2017-11-13 19:19:18 +13:00
Logan Gingerich	10a8df47a9	Factorygirl to factorybot - fixes #1413 (#1425) ... * FactoryGirl Changed to FactoryBot file fix changes based on comments received Bundle Update on 2017-10-29 style update to align hash literal added package-lock * indentation fixes with rubocop * name added to contributors	2017-11-01 15:03:31 +00:00
Brenda Wallace	96b4742e78	Dev is almost always on port 3000	2017-10-28 10:38:51 +13:00
Brenda Wallace	1e81dac699	All crop photos; crops-> photos route	2017-10-24 09:34:03 +13:00
Brenda Wallace	d367b9ef21	UI for removing photos from plantings	2017-04-18 07:09:47 +00:00
Brenda Wallace	87d3764eeb	Route for flickr auth callback -- Fixes #1106	2017-04-17 08:28:52 +00:00
Harry Brodsky	78f4b3dbf3	Update irregular crop pluralizations	2017-03-30 19:15:48 +13:00
Shiny	b72a3d6942	Merge branch 'dev' into query-optimising	2017-03-24 18:31:18 +13:00
Brenda Wallace	5baa357bb3	Use bullet to find queries to optomise	2017-03-24 16:07:05 +13:00
Daniel O'Connor	4a20f68d3a	Merge branch 'dev' into plantings-harvests	2017-03-16 09:40:56 +10:30
Brenda Wallace	c89c20e842	View harvests for a planting	2017-03-12 14:44:11 +13:00
Brenda Wallace	a93c4e9fb8	Yaml file clean up	2017-03-12 10:38:39 +13:00
Shiny	b8884beb2f	Merge branch 'dev' into test_runners	2017-02-21 11:31:02 +13:00
Brenda Wallace	550848a513	ParenthesesAroundCondition fixup	2017-02-19 16:20:45 +13:00
Miles Gould	9030e5b978	Merge branch 'dev' into test_runners	2017-02-16 13:31:39 +00:00
Brenda Wallace	2b03381a24	Removed trailing commas	2017-02-15 23:33:06 +00:00
Miles Gould	f11bc42507	Turn on asset compilation in test ... This is required for running jasmine tests via `rake spec:javascript`. The comment above this setting warned that it would slow down testing considerably; in my quick tests the slowdown is only about 2% (3mins 14 vs 3mins 11). We precompile assets in Travis, so this *shouldn't* cause any more random CI failures...	2017-02-07 14:27:14 +00:00
Shiny	7731623397	Merge branch 'dev' into likeable	2017-01-27 14:21:53 +13:00
Brenda Wallace	4fedc7f23f	Member can see crops they have requested	2017-01-23 09:49:47 +13:00
Brenda Wallace	5e61be9853	Merge remote-tracking branch 'upstream/dev' into HEAD	2017-01-22 18:26:38 +13:00
Brenda Wallace	ff50ec65d0	Merge remote-tracking branch 'upstream/dev' into HEAD	2017-01-22 18:26:29 +13:00
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
Daniel O'Connor	f7f1907b74	Silence config/routes.rb:1:39: W: Lint/UnneededDisable: Unnecessary disabling of Metrics/BlockLength for now	2017-01-21 16:45:04 +10:30
Shiny	6121a9bc6e	Merge branch 'dev' into bw/translations	2017-01-20 21:05:31 +11:00
Brenda Wallace	c2804f1725	Merge branch 'bw/controller-translations' into bw/translations ... Conflicts: config/locales/en.yml	2017-01-20 23:04:00 +13: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
Brenda Wallace	d97af8e76e	Adding missing translation for harvests	2017-01-20 22:40:14 +13:00
Brenda Wallace	91adc5f59e	Normalise english translations file	2017-01-20 22:23:38 +13:00
Shiny	ab332976da	Merge branch 'dev' into bw/rubocop	2017-01-15 17:36:17 +13:00
Brenda Wallace	0fa9f54c9c	Rename member.has_role? to role?	2017-01-14 20:54:43 +13:00
Shiny	e11603cb3e	Merge branch 'dev' into bw/description-photo-links	2017-01-14 18:25:52 +13:00
Brenda Wallace	a1cfa826d9	Removed unwanted quotes in member name in menu ... Fix for Issue #1144	2017-01-14 17:11:58 +13:00
Brenda Wallace	405dfe4bc9	Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links	2017-01-08 21:35:59 +13:00
Brenda Wallace	062ff16acf	Put garden.to_s back to garden.name	2017-01-07 13:17:53 +13:00
Brenda Wallace	76be980163	Translate garden.location	2017-01-07 12:48:14 +13:00