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
Cesy 369868672b Merge pull request #942 from pozorvlak/fix_coverage_calculations 
Fix coverage calculations
 2016-06-01 15:41:42 +01:00
Daniel O'Connor 321f3517a7 #920 Deal with .nil quantity of a seed in rendering helper 2016-06-01 23:26:43 +09:30
Miles Gould 6dd7ec9f95 Fix coverage calculations 
SimpleCov was reporting 0% coverage for any files loaded before
`SimpleCov.start` was called, even if they were fully tested. This patch
loads the application *after* starting SimpleCov, leading to more
accurate coverage figures.
 2016-06-01 14:54:13 +01:00
Cesy dc00878ff9 Merge pull request #938 from Growstuff/dev 
Release 11
release11 		2016-06-01 14:13:42 +01:00
Mackenzie Morgan 90f444dc1a Merge branch 'dev' of gitmaco:Growstuff/growstuff into add_bootstrap_flashes 2016-05-31 10:50:56 -04:00
Miles Gould 4fa2e273aa Merge remote-tracking branch 'origin/pr/933' into dev 2016-05-31 15:48:17 +01:00
pozorvlak df92e0574a Merge pull request #934 from dv2/dev 
Align links properly on "Forgot password page", "Resend confirmation" and "Resend unlock" pages
 2016-05-31 15:46:27 +01:00
DV Dasari e2053e2f8b adding me to CONTRIBUTORS.md 2016-05-31 07:33:40 -05:00
Eric Tillberg 31f0052b9d added to contributors list 2016-05-31 06:49:17 -04:00
pozorvlak b6169778fd Merge pull request #932 from CloCkWeRX/location-not-set 
Add a location not set layout (lets try this again!)
 2016-05-31 11:41:11 +01:00
Mackenzie Morgan 32b98a7e40 Add support for Bootstrap alert types 
* All alerts are currently shoved into either red (error) or green (success)
* Add support for yellow (warning) and blue (info) alert types

Solution from this Stack Overflow: http://stackoverflow.com/questions/31094771/rails-bootstrap-haml-how-to-convert-this-code-to-display-flash-messages-to
 2016-05-30 21:48:11 -04:00
Daniel O'Connor 5111c2a96b Add sr-only text 2016-05-31 09:43:53 +09:30
Eric Tillberg 2ac901c891 feature test for issue 910 2016-05-30 09:06:09 -04:00
Mackenzie ff4466951c Merge pull request #935 from CloCkWeRX/remove_crowdfunding 
Remove crowdfunding code
 2016-05-29 23:27:22 -04:00
Daniel O'Connor 8f05e254a2 Remove crowdfunding code 2016-05-30 10:06:51 +09:30
DV Dasari 5122903139 align links on "Resend unlock instructions" page 2016-05-29 18:25:01 -05:00
DV Dasari 1344f776e4 align devise shared links properly on "Resend confirmation instructions" page 2016-05-29 18:23:57 -05:00
DV Dasari f33367ebac align devise shared links properly on "Forgot your password" page 2016-05-29 18:19:15 -05:00
Eric Tillberg 3ac42deae5 crop approval flash alert for wranglers upon sign in 2016-05-29 16:13:21 -04:00
Daniel O'Connor 3d04e7c125 Add list-inline to ensure the sidebar never conflicts with other content 2016-05-28 09:30:54 +09:30
Daniel O'Connor fa77f11177 Based on MIT licenced icon-globe (http://fontawesome.io/3.2.1/icon/globe/) 2016-05-28 09:26:00 +09:30
pozorvlak 45c8767234 Merge pull request #922 from maco/bug-#848 
Swap over to having "(Optional)" (or translation) after optional form…
 2016-05-27 17:41:42 +01:00
Mackenzie Morgan 13dc87f368 Optional field improvements 
* Added custom matcher `have_optional(field id name goes here)`
* Fix partial
* Add tests
 2016-05-27 11:26:36 -04:00
Mackenzie Morgan fc0116182f Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848 2016-05-27 11:24:37 -04:00
Mackenzie bbe9f3f1db Merge pull request #927 from pozorvlak/delete_puts_in_spec 
Remove warnings and debugging puts from rspec output
 2016-05-27 11:21:52 -04:00
Miles Gould 1009570102 Check href attribute of links in planting reminder 
To check the target of a link, you need to pass it to `has_link` as an
`href` keyword argument. We were passing it as a positional argument,
which meant that

 - it was ignored, weakening the tests
 - the output of rspec filled up with annoying warnings.

Fixes #928.
 2016-05-27 15:46:21 +01:00
Mackenzie Morgan 47f42d0ffa Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848 2016-05-27 10:22:35 -04:00
Miles Gould 23d21be73f Delete debugging puts statement from spec 
Fixes the "rspec output includes an HTML page dump" issue noted at
https://github.com/Growstuff/growstuff/commit/2089866756f8c42c8c582f33ceccbeb0585df141#diff-6464240396bc745d7e89a408c200fd3aR15
 2016-05-27 14:04:30 +01:00
pozorvlak 25f8d2ca44 Merge pull request #924 from maco/capybara-tools 
Add capybara-screenshot to assist with feature testing
 2016-05-27 13:18:26 +01:00
pozorvlak 58d91ec0b0 Merge pull request #923 from maco/bug-#854 
Display one line of description in harvest card, then go to ellipsis …
 2016-05-27 12:17:10 +01:00
pozorvlak 85cc9868cb Merge pull request #925 from maco/bug-#906 
Capture originalText from the button that's been clicked, not from…
 2016-05-27 11:24:08 +01:00
Mackenzie Morgan 75631da398 Set filename of screenshot to test name 2016-05-27 00:21:02 -04:00
Mackenzie Morgan 03c74dae03 Capture originalText from the button that's been clicked, not from the array of all possible date-picker buttons. 
Fixes #906
 2016-05-26 23:55:49 -04:00
Mackenzie Morgan 2089866756 Display one line of description in harvest card, then go to ellipsis and put read more on next line 
Fixes #854
 2016-05-26 23:08:23 -04:00
Mackenzie Morgan 8d982c7e3e Add capybara-screenshot to assist with feature testing 2016-05-26 22:39:58 -04:00
Mackenzie Morgan 079cecc529 Swap over to having "(Optional)" (or translation) after optional form elements rather than using placeholder text 
Fixes #848
 2016-05-26 16:53:46 -04:00
pozorvlak b0d90f6fd5 Merge pull request #921 from maco/bug-#876 
Use standardized & translateable strings for the photo show page
 2016-05-26 17:50:12 +01:00
Mackenzie Morgan 58f4ae32d0 test update 2016-05-26 12:28:58 -04:00
Mackenzie Morgan dd0373a3ee Use standardized & translateable strings for the photo show page 
Fixes #876
 2016-05-26 11:51:46 -04:00
pozorvlak 170dca7086 Merge pull request #918 from maco/bug-#855 
Stop hard-coding strings for pagination
 2016-05-26 13:00:33 +01:00
pozorvlak c930f04b5a Merge pull request #905 from maco/photos 
refactor photo controller create for readability
 2016-05-26 12:57:29 +01:00
Cesy f41d919ca8 Merge pull request #916 from maco/bug_873 
make seed card heading link to seed page and add owner link. Fixes #873
 2016-05-26 09:58:37 +01:00
Cesy 8c4583b0d3 Merge pull request #915 from maco/autocomplete_dropdown 
set background color on autocomplete dropdown. Fixes #914
 2016-05-26 09:57:02 +01:00
Mackenzie Morgan 972518e9fc Stop hard-coding strings for pagination 
Use translation template to set singular/other strings
for .model_name

Fixes #855
 2016-05-25 23:15:36 -04:00
pozorvlak 5b38fad85e Merge pull request #912 from maco/small_fixes 
Fix two small things (including: make tests stop failing)
 2016-05-25 23:25:47 +01:00
Mackenzie Morgan d227601627 Add config/factory_girl.rb so that rspec doesn't fail with a confusing 
'Could not find mapping for #<Member...' error
http://blog.thefrontiergroup.com.au/2011/03/reloading-factory-girl-factories-in-the-rails-3-console/
 2016-05-25 17:35:57 -04:00
Mackenzie Morgan 736e45aec9 update Gemfile.lock for code climate 2016-05-25 17:35:23 -04:00
Mackenzie Morgan 11e2e86b06 make seed card heading link to seed page and add owner link. Fixes #873 2016-05-25 16:21:17 -04:00
Mackenzie Morgan 58617b5685 set background color on autocomplete dropdown. Fixes #914 2016-05-25 16:07:49 -04:00
Mackenzie Morgan 8c2aa4844f use CW's case statement idea 2016-05-25 15:15:09 -04:00