Brenda Wallace
|
faf117b002
|
test for link to member's harvest
|
2016-09-19 18:02:44 +12:00 |
|
Brenda Wallace
|
13e491cda7
|
harvest thumbnail title linking to the harvest itself
|
2016-09-18 18:33:28 +12:00 |
|
Cesy
|
286b7118be
|
Merge pull request #1041 from CloCkWeRX/openfarm-links
Add links to OpenFarm
|
2016-09-15 11:31:13 +01:00 |
|
Cesy
|
b2dfe31b5c
|
Merge pull request #1043 from CloCkWeRX/fix_1042
Fix map token in prod configuration
|
2016-09-15 09:09:02 +01:00 |
|
Daniel O'Connor
|
1f005a3d42
|
Fixes #1042
|
2016-09-14 21:41:18 +09:30 |
|
Daniel O'Connor
|
36c64bd8dc
|
#1038 Add links to OpenFarm
|
2016-09-14 14:57:08 +09:30 |
|
Daniel O'Connor
|
277325d58c
|
Merge pull request #1036 from Br3nda/bw/json-sessions
allow registration and signin/out on the API
|
2016-09-14 14:50:04 +09:30 |
|
Brenda Wallace
|
370f407ad6
|
Adding Brenda Wallace to contributors
|
2016-09-13 19:25:22 +12:00 |
|
Daniel O'Connor
|
3ea8e2294e
|
Update README.md
Fixes #1037
|
2016-09-12 21:57:27 +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 |
|
Cesy
|
0fa15161d4
|
Merge pull request #811 from CloCkWeRX/add_facebook_signup
Add facebook signup
|
2016-08-24 10:37:47 +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
|
ad04c07017
|
Merge pull request #1034 from cesy/railsupdate
Rails update
|
2016-08-23 01:03:46 +09:30 |
|
Daniel O'Connor
|
f3f8326360
|
Merge pull request #1033 from cesy/gemupdate
Updating a few gems
|
2016-08-23 01:00:36 +09:30 |
|
Cesy Avon
|
3798e386ae
|
Upgrading rails to 4.2.1
|
2016-08-22 14:14:58 +00:00 |
|
Cesy Avon
|
7d3afa005c
|
Updating a few gems
|
2016-08-22 14:00:03 +00:00 |
|
Daniel O'Connor
|
29765ebc19
|
rubocop --only HashSyntax --auto-correct
|
2016-08-22 19:02:27 +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
|
0f034523e1
|
Only maximize if the driver supports such a thing
|
2016-08-22 18:26:08 +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
|
4e2311e8d7
|
Indent
|
2016-08-22 16:36:30 +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 |
|
Daniel O'Connor
|
1c3016a31e
|
Adjust for when running with selenium-webdriver to avoid clicks being placed in the wrong location; and for drivers that don't support blacklisting
|
2016-08-22 16:17:36 +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
|
049d792053
|
Fix Gemfile.lock
|
2016-08-16 12:05:14 +09:30 |
|
Daniel O'Connor
|
e399085a57
|
Update bootstrap-sass coveralls friendly_id js-routes sass-rails simplecov
|
2016-08-16 11:58:12 +09:30 |
|
Daniel O'Connor
|
18b4a90690
|
Upgrade excon ffi autoprefixer-rails multi_json mimemagic pry active_utils activemerchant
|
2016-08-16 11:56:50 +09:30 |
|
Daniel O'Connor
|
a68ffda7eb
|
Upgrade minor gems: kramdown, notifany, httparty, codemirror-rails, bootstrap_form, globalid
|
2016-08-16 11:56:25 +09:30 |
|
Daniel O'Connor
|
0a722edc88
|
Fix regression from bad merge
|
2016-08-16 11:45:58 +09:30 |
|
Daniel O'Connor
|
de407608f2
|
Merge remote-tracking branch 'upstream/dev' into queue_mail
|
2016-08-16 11:11:40 +09:30 |
|
Daniel O'Connor
|
ece0fdfe6c
|
Drop sidekiq web for the moment
|
2016-08-16 11:08:59 +09:30 |
|
Daniel O'Connor
|
5008d35614
|
Add sidekiq configuration
|
2016-08-16 11:02:35 +09:30 |
|
Daniel O'Connor
|
6b470f180c
|
#951 Add sidekiq as our activejob backend
|
2016-08-16 11:01:19 +09:30 |
|
Daniel O'Connor
|
4deb895b4c
|
#951 Add sidekiq
|
2016-08-16 10:59:30 +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
|
4b066ec37f
|
Merge pull request #1028 from CloCkWeRX/minor_gem_upgrades_august_2016
Minor gem upgrades for August 2016
|
2016-08-15 23:28:30 +09:30 |
|
Daniel O'Connor
|
0dad02343e
|
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
|
2016-08-15 23:14:49 +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
|
c2dc2c5836
|
Merge pull request #1027 from CloCkWeRX/cve-2016-6317
Fix CVE-2016-6316 CVE-2016-6317
|
2016-08-15 23:10:27 +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 |
|