3617 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel O'Connor	a607fdc6ec	Merge branch 'dev' into likeable	2017-01-25 12:58:55 +10:30
Daniel O'Connor	25058d02fc	Merge pull request #1164 from Br3nda/bw/link-from-harvest-to-planting ... Link from harvest to planting, instead of garden	2017-01-25 12:54:42 +10:30
Shiny	b80e7f677c	Merge branch 'dev' into likeable	2017-01-24 19:44:42 +13:00
Shiny	e6d3c257e8	Merge branch 'dev' into bw/link-from-harvest-to-planting	2017-01-23 20:17:34 +13:00
Daniel O'Connor	7224ef8848	Merge pull request #1159 from Br3nda/bw/garden-display-fix ... Fix display of gardens on smaller screens	2017-01-23 14:59:43 +10:30
Brenda Wallace	dd9a0071d2	Link from harvest to planting, instead of garden	2017-01-23 09:58:25 +13:00
Shiny	26b3e28171	Merge branch 'dev' into bw/garden-display-fix	2017-01-23 09:41:37 +13:00
Daniel O'Connor	29765c7bab	Merge pull request #1160 from Br3nda/bw/fix-notify-sys-exit ... change deliver_later to deliver_now, so we don't sys.exit() crash	2017-01-23 00:21:47 +10:30
Brenda Wallace	370938c9f9	change deliver_later to deliver_now, so we don't sys.exit() crash	2017-01-22 21:22:30 +13:00
Brenda Wallace	08d407f041	Fix display of gardens on smaller screens	2017-01-22 20:33:37 +13:00
Brenda Wallace	9cadbdec2b	Regenerated schema file	2017-01-22 18:27:32 +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
Daniel O'Connor	c4c50a4174	Merge pull request #1158 from Br3nda/bw/controller-translations ... more controller translations	2017-01-22 15:34:14 +10:30
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
Daniel O'Connor	eab9bcb37d	Merge pull request #1157 from Br3nda/bw/rubocop-hash-braces ... Removed unnecesary braces on hash args	2017-01-22 13:22:11 +10:30
Brenda Wallace	40a981c94d	Removed unnecesary braces on hash args	2017-01-22 15:10:11 +13:00
Cesy	dd2af6a0e3	Merge pull request #1155 from CloCkWeRX/2017-01-21-gem-updates ... 2017 01 21 gem updates	2017-01-21 19:49:05 +00:00
Daniel O'Connor	9192ccf52b	Update coveralls	2017-01-21 17:02:40 +10:30
Daniel O'Connor	4e79fd201c	Update omniauth	2017-01-21 17:01:59 +10:30
Daniel O'Connor	d266d7ed1a	Update i18n-tasks	2017-01-21 16:52:24 +10:30
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
Daniel O'Connor	c42e9ca410	Upgrade factory_girl_rails	2017-01-21 16:42:04 +10:30
Daniel O'Connor	f97c465a92	Update geocoder	2017-01-21 16:41:15 +10:30
Daniel O'Connor	a5b566a207	Update lumberjack	2017-01-21 16:40:27 +10:30
Daniel O'Connor	c6d16c92f5	Update public_suffix	2017-01-21 16:40:04 +10:30
Daniel O'Connor	c5b2e37730	Update diff-lcs	2017-01-21 16:39:31 +10:30
Daniel O'Connor	5c642dfef9	Really disable	2017-01-21 16:37:30 +10:30
Daniel O'Connor	a9b8253dfa	Update connection_pool	2017-01-21 16:35:33 +10:30
Daniel O'Connor	58a3cbf569	Disable check for now	2017-01-21 16:28:57 +10:30
Daniel O'Connor	8b4c8fef3b	Pin to earlier version of rainbow until https://github.com/sickill/rainbow/issues/44 is sorted	2017-01-21 16:14:37 +10:30
Daniel O'Connor	36c0de4504	Upgrade to selenium-webdriver 3.0.0	2017-01-21 16:04:15 +10:30
Daniel O'Connor	3208bf9fb6	Regenerate rubocop configuration	2017-01-21 15:58:52 +10:30
Daniel O'Connor	4eebf5c867	Error: The Style/MethodCallParentheses cop has been renamed to Style/MethodCallWithoutArgsParentheses.	2017-01-21 15:57:01 +10:30
Daniel O'Connor	61f7bdfdd2	Update rubocop	2017-01-21 15:56:02 +10:30
Daniel O'Connor	06838d7ad1	Update ruby_dep, unicode-display_width	2017-01-21 15:55:22 +10:30
Daniel O'Connor	676f246e85	Merge pull request #1154 from Br3nda/bw/translations ... More translations	2017-01-21 15:51:41 +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
pozorvlak	a8d5b14d46	Merge pull request #1150 from Br3nda/bw/rubocop ... Rubocop fix up for the models	2017-01-17 17:43:24 +00:00
pozorvlak	cc59c4f49b	Merge branch 'dev' into bw/rubocop	2017-01-17 16:47:07 +00:00
pozorvlak	8a7b7e75ef	Merge pull request #1141 from Br3nda/bw/active-plantings ... Show only active plantings by default	2017-01-17 16:41:22 +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