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
Brenda Wallace
5319d23ee3
Using translations on links from photo page
2017-01-07 12:03:31 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Brenda Wallace
ca7868b79a
Use guard clauses
2016-12-14 21:28:35 +00:00
Daniel O'Connor
2594e5d334
Rubocop
2016-12-09 12:06:14 +10:30
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Shiny
1388aa3b06
Merge branch 'dev' into bw/useless-assignments
2016-12-03 08:23:19 +13:00
Jim Stallings
160c6efd04
Remove example file, add documentation
2016-12-02 15:34:38 +10:30
Jim Stallings
fe6e269c64
GS-658 - i18n automation POC
2016-12-02 15:34:38 +10:30
Jim Stallings
81f2fa5fa4
GS-658: sort locale keys, add rake task for it
2016-12-02 15:31:07 +10:30
Shiny
b454132cae
Merge branch 'dev' into bw/useless-assignments
2016-12-01 12:51:13 +13:00
Miles Gould
1841548936
Precompile assets in test
...
According to
https://github.com/teampoltergeist/poltergeist/issues/677#issuecomment-222919584 ,
a possible cause of the "Request failed to reach server" problem (#901 )
is that assets are being compiled on-demand, causing enough of a
slowdown for PhantomJS to think the connection has failed. This turns
off lazy asset compilation in the test environment and precompiles
assets before testing on Travis. We should also turn off lazy asset
compilation in production - see
http://stackoverflow.com/questions/8821864/config-assets-compile-true-in-rails-production-why-not
Our Heroku deployments already run `rake assets:precompile`.
2016-11-30 11:01:25 +00:00
Brenda Wallace
9aa4fa8031
Fixes for two calls to deprecated methods
2016-11-30 10:25:23 +13:00
Brenda Wallace
8c7fcd9d49
Fixed all useless assignments
2016-11-26 19:36:59 +13:00
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
Brenda Wallace
2e46cccd21
Hash alignment
2016-11-26 11:52:10 +13:00
Brenda Wallace
d268d2b09e
Fixed indentation on comments
2016-11-26 11:45:25 +13:00
Harry Brodsky