mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 22:27:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor
cad361ed7a #509 Update expectations, they were slightly different to what the test tool claimed they would be. 2015-08-25 00:57:39 +09:30
Daniel O'Connor
1187719e7b #509 Add some basic test coverage 2015-08-25 00:51:13 +09:30
Daniel O'Connor
859cf7f215 #509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic 2015-08-25 00:32:17 +09:30
Daniel O'Connor
6d97a060c3 #509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic 2015-08-25 00:32:06 +09:30
pozorvlak
fc04dde1e8 Merge pull request #814 from CloCkWeRX/fix_facebook_logo_733 
Add correct prefix to fix facebook share icon
 2015-08-24 09:47:32 +01:00
Daniel O'Connor
9564866f6d #645 Avoid collisions by using a 20 character random string as a fallback 2015-08-24 17:33:28 +09:30
Daniel O'Connor
e3c52b1a56 #733 Render as a 'website' 2015-08-24 16:56:35 +09:30
Daniel O'Connor
3258a6754c #733 Render only one image, and do it with a full URL 2015-08-24 16:46:42 +09:30
Daniel O'Connor
db876ff107 #733 Add the correct RDFa prefix 2015-08-24 16:38:00 +09:30
Daniel O'Connor
994296640b #645 Implement all of finish signup, fix an edge case of an authentication without a member, fix error messages on failed oauth. 2015-08-24 16:20:39 +09:30
Daniel O'Connor
9a68c7e1c3 #645 Add a 'finish signup' flow 2015-08-24 11:41:36 +09:30
Daniel O'Connor
ec597d4e6e #645 Fix minor logic error 2015-08-24 11:23:41 +09:30
twconquest
2882e3d1a5 Correct Gibbon list id to point to correct list 2015-08-21 19:29:03 +00:00
Daniel O'Connor
86e9cd0ec6 #645 Improve error handling and login_name generation. Annoyingly still a change of collisions. 2015-08-21 13:43:58 +09:30
Daniel O'Connor
3a05f75ab0 #645 Add notes around permissions/scopes of later interest 2015-08-21 13:43:24 +09:30
Daniel O'Connor
34b4d30014 #645 Enable account creation or authorisation from a facebook signin (and should work for others with minimal extra work) 2015-08-21 13:22:49 +09:30
Daniel O'Connor
89b6c47bfb #645 Configure devise / omniauth in only one spot, to avoid CSRF errors 2015-08-21 12:21:55 +09:30
Daniel O'Connor
70f48108b4 #645 Add handling for facebook 2015-08-21 12:21:23 +09:30
Daniel O'Connor
df5689ec18 #645 Rename 2015-08-21 11:36:26 +09:30
Daniel O'Connor
22d72b13d5 #645 Add example keys 2015-08-21 11:36:17 +09:30
Daniel O'Connor
dee7ff34c9 #645 Indicate that a member is omniauthable, so devise knows to render sign-in-with-facebook 2015-08-21 11:36:04 +09:30
Daniel O'Connor
07eb305992 #645 Ask for name, email address only 2015-08-21 11:25:57 +09:30
Daniel O'Connor
c7f0076ee6 #645 Add facebook omniauth middleware 2015-08-21 11:21:44 +09:30
Daniel O'Connor
93bc5255e7 #645 Add facebook omniauth provider 2015-08-21 11:21:30 +09:30
Cesy
b87194336f Wrangler has different name in tests, fixing failing test 2015-08-20 14:16:39 +00:00
Cesy
0e98f84da7 Fixing admin tests where you need to click on navmenu with JS 2015-08-20 14:06:21 +00:00
Cesy
b9ce3d4fe6 Revert "Adding ids to navbar so PhantomJS can find them" 
Not needed - test issue was caused by wrong link text
This reverts commit d65ab59d35.
 2015-08-20 13:59:37 +00:00
Cesy
d65ab59d35 Adding ids to navbar so PhantomJS can find them 2015-08-20 13:36:13 +00:00
Cesy
65e0752376 RSS feeds don't need JS 2015-08-20 13:07:25 +00:00
Cesy
3251dd1c54 Merge branch 'js_all_the_features' of github.com:pozorvlak/growstuff into phantomjs 
Conflicts:
	spec/features/admin/forums_spec.rb
	spec/features/crops/alternate_name_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/features/member_profile_spec.rb
	spec/features/rss/members_spec.rb
	spec/features/scientific_name_spec.rb
	spec/features/signin_spec.rb
	spec/features/signup_spec.rb
 2015-08-20 12:09:18 +00:00
pozorvlak
c404d8220d Merge pull request #791 from cesy/cachethumbnails 
Cache thumbnails
 2015-08-19 15:11:16 +01:00
Cesy
48409698ab Merge pull request #787 from twconquest/show-roles 
Show roles in member profile page
 2015-08-19 14:13:32 +01:00
pozorvlak
4d7c4f38ae Merge pull request #804 from cesy/issue658i18n 
Issue #658 i18n
 2015-08-17 19:52:10 +01:00
twconquest
c2e4686a23 Add negative tests for roles on profiles 2015-08-17 18:29:00 +00:00
twconquest
24df32ba7f Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md 
Conflicts:
	CONTRIBUTORS.md
 2015-08-17 17:48:50 +00:00
Cesy
744caef4f2 Merge pull request #806 from CloCkWeRX/bump_ruby_2_1_6 
Upgrade to ruby 2.1.6 for CVE-2015-1855
 2015-08-13 09:06:48 +01:00
Daniel O'Connor
5cac8743f8 Upgrade to ruby 2.1.6 for CVE-2015-1855: Ruby OpenSSL Hostname Verification 2015-08-13 15:06:56 +10:00
pozorvlak
9c4d83dad3 Merge pull request #801 from CloCkWeRX/fix_cve_2015_2963 
Fix CVE-2015-2963,  CVE-2015-3448, CVE-2015-1820 & CVE-2015-1840
 2015-08-12 17:08:27 +01:00
Cesy
fd3e69c9ab Removing footer translation as it's now in the CMS 2015-08-12 14:57:13 +00:00
Cesy
b6dfeb980c i18n example 2015-08-12 14:56:36 +00:00
Cesy
e8266480e5 Adding bootstrap-accessibility plugin 2015-08-12 14:17:41 +00:00
Cesy
e784ec9b33 Making it trigger the crop thumbnail cache properly 2015-08-12 11:45:18 +00:00
Cesy
1df0c36e72 Keying the cache correctly 2015-08-12 10:49:48 +00:00
Cesy
a5e7a8d315 Cache crop thumbnails 2015-08-12 10:49:48 +00:00
Daniel O'Connor
cafd49c143 Name: jquery-rails 
Version: 3.1.2
Advisory: CVE-2015-1840
Criticality: Unknown
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY
Title: CSRF Vulnerability in jquery-ujs and jquery-rails
Solution: upgrade to >= 4.0.4, ~> 3.1.3
 2015-08-12 16:59:14 +09:30
Daniel O'Connor
7c7c66348c Name: rest-client 
Version: 1.7.2
Advisory: CVE-2015-3448
Criticality: Unknown
URL: http://www.osvdb.org/show/osvdb/117461
Title: Rest-Client Gem for Ruby logs password information in plaintext
Solution: upgrade to >= 1.7.3

Name: rest-client
Version: 1.7.2
Advisory: CVE-2015-1820
Criticality: Unknown
URL: https://github.com/rest-client/rest-client/issues/369
Title: rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses
Solution: upgrade to >= 1.8.0
 2015-08-12 16:57:58 +09:30
Daniel O'Connor
00ae4ed49f Name: paperclip 
Version: 4.2.1
Advisory: CVE-2015-2963
Criticality: Medium
URL: https://robots.thoughtbot.com/paperclip-security-release
Title: Paperclip Gem for Ruby vulnerable to content type spoofing
Solution: upgrade to >= 4.2.2
 2015-08-12 16:23:48 +09:30
Cesy
12a1484a26 Merge pull request #800 from CloCkWeRX/fix_all_checkbox_labels 
Fix more checkbox labels in registration and email editing
 2015-08-11 09:51:05 +01:00
Cesy
5bacdb71cc Merge pull request #798 from CloCkWeRX/cve-2015-3226 
Minor rails version upgrade to apply security fixes
 2015-08-11 08:23:58 +01:00
Cesy
6565e79057 Merge pull request #797 from CloCkWeRX/minor_usability_checkbox_login 
Style checkbox for 'remember me'
 2015-08-11 08:21:39 +01:00