mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-04 20:22:47 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 98 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel O'Connor 711ba73d6b Upgrade devise to 4.2 2016-08-15 22:12:34 +09:30
Daniel O'Connor 5354f2732f Update bootstrap-sass coveralls friendly_id js-routes sass-rails simplecov 2016-08-15 22:07:39 +09:30
Daniel O'Connor 9bbaaa2211 Upgrade excon ffi autoprefixer-rails multi_json mimemagic pry active_utils activemerchant 2016-08-15 22:04:43 +09:30
Daniel O'Connor 93c47d774e Upgrade minor gems: kramdown, notifany, httparty, codemirror-rails, bootstrap_form, globalid 2016-08-15 22:01:56 +09:30
Daniel O'Connor d8ad697d09 Swap tokens 2016-08-15 21:53:17 +09:30
Daniel O'Connor 7308a7cf9a Name: actionview 
Version: 4.2.6
Advisory: CVE-2016-6316
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/I-VWr034ouk
Title: Possible XSS Vulnerability in Action View
Solution: upgrade to ~> 3.2.22.3, ~> 4.2.7.1, >= 5.0.0.1

Name: activerecord
Version: 4.2.6
Advisory: CVE-2016-6317
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/rubyonrails-security/rgO20zYW33s
Title: Unsafe Query Generation Risk in Active Record
Solution: upgrade to ~> 4.2.7.1
 2016-08-15 21:45:26 +09:30
Cesy c9c49a7e5e Merge pull request #1026 from CloCkWeRX/gardenate_attempt_2 
Gardenate attempt 2
 2016-08-15 13:15:21 +01:00
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 e4c0ecfb5a Add basic test 2016-08-15 21:30:40 +09:30
Daniel O'Connor fdb0e842de #864 Add links to google, gardenate 2016-08-15 21:30:33 +09:30
polveenomials 85ff36198b Added name to the CONTRIBUTORS.md 2016-08-04 14:27:49 +08:00
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 ff47784aee Add explicit test coverage 2016-07-21 12:21:56 +09:30
Daniel O'Connor 1dba711057 Add more explicit test coverage 2016-07-21 12:13:37 +09:30
Daniel O'Connor 6911f7b24b Typo 2016-07-21 12:05:37 +09:30
pozorvlak 1e94abd063 Merge pull request #1019 from CloCkWeRX/mobile_searchbar 
Use navbar-right, and reposition search box to fix mobile layout
 2016-07-20 12:44:03 +01:00
Cesy 3325e1e388 Merge pull request #1020 from Growstuff/dev 
Release 13
release13 		2016-07-19 10:45:28 +01:00
Daniel O'Connor 07f7bd24d5 Clean up 2016-07-09 21:54:26 +09:30
Daniel O'Connor 04074ff372 Reimplement ajax like/unlike behaviour 2016-07-09 21:53:33 +09:30
Daniel O'Connor d3dac756d6 Merge remote-tracking branch 'upstream/dev' into likeable 2016-07-09 21:08:33 +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