4812 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Shiny	b4fcf004cd	Merge pull request #1484 from Growstuff/dev ... Release 36 release36	2017-12-14 19:37:02 +13:00
pozorvlak	b783448ec3	Merge pull request #1485 from Br3nda/planting-harvests ... Show photos of a planting's harvests	2017-12-13 12:08:23 +00:00
pozorvlak	e8b5850bfe	Merge branch 'dev' into planting-harvests	2017-12-13 10:57:40 +00:00
pozorvlak	bca72680c4	Merge pull request #1490 from Br3nda/dependabot/npm_and_yarn/coffeelint-2.0.7 ... Bump coffeelint from 1.16.0 to 2.0.7	2017-12-13 10:57:18 +00:00
pozorvlak	358eb96684	Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7	2017-12-13 10:29:18 +00:00
pozorvlak	05807d41f4	Merge pull request #1491 from Br3nda/flickr-auth-fix ... Fix Growstuff::OauthSignupAction not found error when connecting flickr	2017-12-13 10:27:16 +00:00
Shiny	96f1995768	Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7	2017-12-13 23:26:07 +13:00
Shiny	deefbbce71	Merge branch 'dev' into planting-harvests	2017-12-13 23:25:56 +13:00
Brenda Wallace	1f66df0743	Fixed link to associated flickr, twitter, facebook accountss ... fixes #1479	2017-12-13 22:23:22 +13:00
Brenda Wallace	72f52230a1	Fix Growstuff::OauthSignupAction not found error when connecting flickr account	2017-12-13 22:19:41 +13:00
Daniel O'Connor	acecbe93c1	Merge pull request #1487 from Growstuff/bundle-update-2017-12-11-160933 ... Bundle Update on 2017-12-11	2017-12-13 16:20:36 +10:00
dependabot[bot]	bafe2b7fd1	Bump coffeelint from 1.16.0 to 2.0.7 ... Bumps [coffeelint](https://github.com/clutchski/coffeelint) from 1.16.0 to 2.0.7. - [Commits](https://github.com/clutchski/coffeelint/commits)	2017-12-12 11:00:57 +00:00
Shiny	3be1454a69	Merge branch 'dev' into bundle-update-2017-12-11-160933	2017-12-12 12:36:54 +13:00
Shiny	232e5d50ac	Merge branch 'dev' into planting-harvests	2017-12-12 12:36:33 +13:00
pozorvlak	7207a39039	Merge pull request #1486 from Br3nda/cleanup/routes ... Convert hashes in routes	2017-12-11 10:47:18 +00:00
deppbot	291f865f7f	Bundle Update on 2017-12-11	2017-12-11 16:09:34 +08:00
Brenda Wallace	47e82eb0a7	Convert hashes in routes	2017-12-10 19:50:08 +13:00
Brenda Wallace	08dc2a0513	Show photos of a planting's harvests	2017-12-09 22:24:51 +13:00
Shiny	5d44196947	Merge branch 'master' into dev	2017-12-09 13:28:10 +13:00
Shiny	1c41cb7b66	Merge pull request #1483 from Growstuff/bundle-update-2017-12-08-121126 ... Bundle Update on 2017-12-08	2017-12-09 08:25:36 +13:00
Shiny	c3c55eaa09	Merge branch 'dev' into bundle-update-2017-12-08-121126	2017-12-09 08:15:28 +13:00
pozorvlak	98aa9521fe	Merge pull request #1482 from Br3nda/ordering ... Fixes to ordering	2017-12-08 12:04:48 +00:00
Shiny	96bb345ca9	Merge branch 'dev' into ordering	2017-12-08 20:20:27 +13:00
Shiny	9de991a075	Merge branch 'dev' into bundle-update-2017-12-08-121126	2017-12-08 20:19:39 +13:00
Shiny	f76619864c	Merge pull request #1477 from Br3nda/upgrade-rubocop ... Rubocop upgrade (and some style fixes)	2017-12-08 20:19:08 +13:00
deppbot	ec149997b0	Bundle Update on 2017-12-08	2017-12-08 12:11:27 +08:00
Brenda Wallace	ac07f18b2d	Show most recent seeds first	2017-12-07 15:00:16 +13:00
Brenda Wallace	4ce3e8968f	crops#show order posts by most recent first	2017-12-07 14:58:57 +13:00
Brenda Wallace	cd35538b83	Order forums by name	2017-12-07 13:42:48 +13:00
Brenda Wallace	35d8461811	Order recent plantings by when they were planted	2017-12-07 13:39:32 +13:00
Brenda Wallace	8d03a3ffa8	Most recent photos is a crop's default photo	2017-12-06 21:47:01 +13:00
Brenda Wallace	2b0f199329	change string replacement for performance reasons	2017-12-06 15:19:34 +13:00
Brenda Wallace	24f18f78da	use bare percent literals	2017-12-06 14:33:51 +13:00
Brenda Wallace	3cc637017d	Avoid {} for multiline	2017-12-06 14:29:21 +13:00
Brenda Wallace	37f9dcd7dd	for simple loops, use Integer.times	2017-12-06 14:26:58 +13:00
Brenda Wallace	f516ef2e57	Don't use :: for method calls	2017-12-06 14:24:17 +13:00
Brenda Wallace	182c626226	Prefer if/unless modifier	2017-12-06 14:23:12 +13:00
Brenda Wallace	ea2fcd09dc	Fixed last old style word array	2017-12-06 14:18:51 +13:00
Brenda Wallace	878fc7ebcd	Use symbol procs	2017-12-06 14:17:34 +13:00
Brenda Wallace	3fdc23098e	Use perl names for cli script variables	2017-12-06 14:16:47 +13:00
Brenda Wallace	515325c44e	Fixed up % delimiters	2017-12-06 14:14:31 +13:00
Brenda Wallace	25b1836146	Removed nil comparison	2017-12-06 14:13:01 +13:00
Brenda Wallace	c925c95398	Use next, instead of a if wrapper	2017-12-06 14:11:27 +13:00
Brenda Wallace	2d00206abf	Converted sprintf to format	2017-12-06 14:10:26 +13:00
Brenda Wallace	f499f245de	Added new line after block end, for rubocpo	2017-12-06 14:08:05 +13:00
Brenda Wallace	35414391c3	modified spec to please rubocop	2017-12-06 14:07:18 +13:00
Brenda Wallace	1f7f4f52d1	Updated ability_spec.rb to use block end new lines	2017-12-06 14:02:48 +13:00
Brenda Wallace	b4efeee904	Merge remote-tracking branch 'origin/upgrade-rubocop' into upgrade-rubocop	2017-12-06 11:23:03 +13:00
Brenda Wallace	5b588bf9e9	Rubocop change namespace of some cops	2017-12-06 11:21:25 +13:00
Daniel O'Connor	07611e9a5d	Merge branch 'dev' into upgrade-rubocop	2017-12-05 11:38:52 +10:30