Brenda Wallace
5e0cff5b8e
Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces
...
Conflicts:
app/helpers/seeds_helper.rb
spec/support/controller_macros.rb
2016-11-17 19:04:44 +13:00
Brenda Wallace
5ec2877577
Covert all tabs to spaces
2016-11-16 13:18:26 +13:00
Brenda Wallace
6bd9bd98d9
Removed extra blank lines, & added a end of file
2016-11-16 12:52:48 +13:00
Brenda Wallace
510c31f669
Removed 3 blank lines that codeclimate didn't like
2016-11-14 15:10:13 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Miles Gould
ce2141ddb7
Only initialise Crop.__elasticsearch__ if needed
...
The mere presence of this field was causing any test that ran
`FactoryGirl.create :alternate_name` to try to connect to an
ElasticSearch server, even if GROWSTUFF_ELASTICSEARCH was false.
Fixes #1047
2016-10-07 14:49:09 +01:00
Miles Gould
36c88c3762
Delete trailing whitespace
2016-10-07 14:48:38 +01:00
Brenda Wallace
13e491cda7
harvest thumbnail title linking to the harvest itself
2016-09-18 18:33:28 +12:00
Daniel O'Connor
36c64bd8dc
#1038 Add links to OpenFarm
2016-09-14 14:57:08 +09:30
Brenda Wallace
c6413afa67
allow registration and signin/out on the API
2016-09-11 14:23:50 +12:00
Cesy
fe137a11bb
Merge pull request #1031 from CloCkWeRX/queue_mail
...
Queue mail in sidekiq
2016-08-24 10:38:13 +01:00
Daniel O'Connor
aeb8792165
Merge remote-tracking branch 'upstream/dev' into queue_mail
2016-08-24 06:35:51 +09:30
Daniel O'Connor
c60609d507
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-23 16:34:03 +09:30
Daniel O'Connor
b91f0e7f63
Whitelist providers to avoid session data being tampered with
2016-08-22 18:59:28 +09:30
Daniel O'Connor
87352b04f1
Refactor to a method to DRY, even if its not 100% the best spot for it to live long term
2016-08-22 18:52:12 +09:30
Daniel O'Connor
20b87e596a
Modern syntax
2016-08-22 18:25:57 +09:30
Daniel O'Connor
4b7cffad04
DEPRECATION WARNING: [Devise] bypass option is deprecated and it will be removed in future version of Devise.
2016-08-22 16:42:08 +09:30
Daniel O'Connor
bcb0a19dea
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-22 16:37:50 +09:30
Daniel O'Connor
c7be0f3b0e
Fix redirects and sign the user in if they weren't yet created
2016-08-22 16:35:58 +09:30
Daniel O'Connor
9ab79209ef
Adjust TOS url
2016-08-22 16:35:41 +09:30
Cesy
941001c743
Merge pull request #1029 from CloCkWeRX/add_seed_purchase_links
...
Add links to ebay, which seems to have a variety of seeds to purchase…
2016-08-16 08:53:09 +01:00
Cesy
40cf5ba63a
Merge pull request #1030 from CloCkWeRX/fix_998
...
Ensure we look at the current control, not the entire collection when marking planting finished
2016-08-16 08:50:30 +01:00
Cesy
9a40449f08
Merge pull request #1024 from CloCkWeRX/mapboxv4
...
#981 Add mapbox v4
2016-08-16 08:49:44 +01:00
Daniel O'Connor
de407608f2
Merge remote-tracking branch 'upstream/dev' into queue_mail
2016-08-16 11:11:40 +09:30
Daniel O'Connor
5d70d822eb
#951 Swap to deliver_later implementation
2016-08-16 10:55:40 +09:30
Daniel O'Connor
90a88cf69d
Fixes #998 Ensure we look at the current control, not the entire collection
2016-08-16 10:33:23 +09:30
Daniel O'Connor
044a992d25
Merge pull request #1025 from polveenomials/nav-header
...
Enhancement of the navigation bar (header)
2016-08-15 23:30:11 +09:30
Daniel O'Connor
7f6a1a424d
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:13:55 +09:30
Daniel O'Connor
58452204aa
Add links to ebay, which seems to have a variety of seeds to purchase with our affiliate id
2016-08-15 22:42:32 +09:30
Daniel O'Connor
dba6b2a291
Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/
2016-08-15 21:31:45 +09:30
Daniel O'Connor
7d3991b295
#967 Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/
2016-08-15 21:30:51 +09:30
Daniel O'Connor
fdb0e842de
#864 Add links to google, gardenate
2016-08-15 21:30:33 +09:30
Daniel O'Connor
e38321aa33
#981 Add mapbox access token (on my free 50k views account) and update to v4
2016-07-28 14:27:49 +09:30
Kristine Nicole Polvoriza
d1438d1b2e
Fixed the nav header in mobile view
2016-07-28 12:31:50 +08:00
pozorvlak
b6f848ef66
Merge pull request #1021 from CloCkWeRX/picture_improvements
...
If a harvest doesn't have any photos, try to look at the crop's default photo
2016-07-21 18:24:58 +01:00
Daniel O'Connor
6911f7b24b
Typo
2016-07-21 12:05:37 +09:30
Daniel O'Connor
4b87977e24
It helps to type properly
2016-07-08 18:12:16 +09:30
Daniel O'Connor
dfa28264c6
#1017 When a crop has no photos, look for harvests of the crop with photos.
2016-07-08 18:09:53 +09:30
Daniel O'Connor
f0c1d6d4c2
#997 Use the harvest photo lookup, not the harvest.crop one
2016-07-08 18:01:53 +09:30
Daniel O'Connor
427b98a157
#997 If a harvest doesn't have any photos, try to look at the crop's default photo
2016-07-08 17:59:32 +09:30
Daniel O'Connor
8f5000443f
Use navbar-right, and reposition search box to fix mobile layout
2016-07-08 17:45:00 +09:30
Daniel O'Connor
7947fd6e91
Clean up link_to as per #1013
2016-07-08 17:08:17 +09:30
Daniel O'Connor
70bf5499b2
Clean up logic a bit as per #1013
2016-07-08 17:07:14 +09:30
Daniel O'Connor
6b059cb4f4
Clean up a bit as per #1013 with TODO comments
2016-07-08 17:06:05 +09:30
Daniel O'Connor
efd112c4b8
And vs && - revised version of b50127c166
2016-07-08 17:01:59 +09:30
Mackenzie Morgan
5c7b760f34
Use array literal [] instead of Array.new
2016-07-08 16:58:34 +09:30
Mackenzie Morgan
81ae473972
space between comma-separated arguments
2016-07-08 16:58:29 +09:30
Daniel O'Connor
c803ed4ee6
Merge pull request #976 from pozorvlak/remove_default_shows
...
Remove "show" methods that just do the default
2016-07-08 16:56:25 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Daniel O'Connor
c3d9885525
Merge pull request #987 from CloCkWeRX/upgradazzle_rails
...
Upgrade to rails 4.2.0+ (round 2)
2016-06-29 14:47:05 +09:30
