mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-07 21:42:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,986 Commits 66 Branches 92 Tags
cf784cbedd7cfa24418e4c19b55bba4b3144ce3b
Commit Graph
2986 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor cf784cbedd Update parser to current 2016-06-10 15:20:31 +09:30
Daniel O'Connor 5c68830919 Update guard-rspec 2016-06-10 15:19:57 +09:30
Daniel O'Connor 370aab41c3 Update mime-types 2016-06-10 15:19:28 +09:30
Daniel O'Connor 081f4021bc Upgrade nokogiri 2016-06-10 15:19:03 +09:30
Daniel O'Connor 36f846fabf Merge pull request #982 from CloCkWeRX/update_gibbon 
Upgrade gibbon
 2016-06-10 15:13:18 +09:30
pozorvlak f6d094f57c Merge pull request #985 from lucasnogueira/fix_simplecov_deprecation 
Fix SimpleCov Deprecation Warning
 2016-06-09 22:37:40 +01:00
Lucas Nogueira 9ce097b7d6 Fix SimpleCov Deprecation Warning 2016-06-09 17:42:11 -03:00
pozorvlak b03ccce575 Merge pull request #980 from lucasnogueira/replace_pluralize 
Replace pluralize calls
 2016-06-09 16:39:34 +01:00
Lucas Nogueira 63b8788c80 Change hash syntax 2016-06-09 11:57:56 -03:00
Daniel O'Connor faa3beddbc Upgrade gibbon 2016-06-10 00:17:28 +09:30
Lucas Nogueira 5dbd5bc1d2 Correct minor typos 2016-06-09 08:21:28 -03:00
Lucas Nogueira b8b0d98e07 Update the contributors list 2016-06-08 22:06:26 -03:00
Lucas Nogueira b911ebfd07 Replace pluralize calls 2016-06-08 22:03:40 -03:00
Lucas Nogueira 1ca515bd4e Add missing activerecord model to locales 2016-06-08 21:56:29 -03:00
Lucas Nogueira 905710b6e9 Helper for plural localization 2016-06-08 21:55:33 -03:00
Mackenzie 12e0f674bc Merge pull request #977 from pozorvlak/fix_devise_warnings 
Replace deprecated Devise `for` method with `permit`
 2016-06-08 13:14:05 -04:00
Mackenzie 18739c2a24 Merge pull request #974 from pozorvlak/remove_vendor_dir 
Remove vendor directory
 2016-06-08 11:12:14 -04:00
pozorvlak f3dc2ff7e5 Replace deprecated Devise for method with permit 
This should eliminate the screens-ful of deprecation warnings when
running the test suite.
 2016-06-08 15:00:05 +00:00
Mackenzie dbf64a4e90 Merge pull request #975 from Growstuff/revert-972-show_concern 
Revert "Show concern"
 2016-06-08 09:26:58 -04:00
pozorvlak a8961c3466 Revert "Show concern" 2016-06-08 12:58:32 +01:00
pozorvlak 6931952688 Whitespace fixes 2016-06-07 17:43:36 +00:00
pozorvlak 936aa17ecc Remove references to vendor directory 
This consisted of instructions to various code-quality tools to
ignore it.
 2016-06-07 17:43:36 +00:00
pozorvlak f3d7420b8a Remove vendor directory 
We no longer need it, since we're now getting the functionality we
needed from upstream gems.
 2016-06-07 17:43:35 +00:00
pozorvlak e419acea6e Install BogusPayPalGateway gem 
We were maintaining a vendor fork of active_merchant because they
refused to merge this feature in; it's now been released as a
separate gem.
 2016-06-07 17:43:35 +00:00
pozorvlak 95ae15b780 Merge pull request #972 from maco/show_concern 
Show concern
 2016-06-07 16:22:17 +01:00
Mackenzie Morgan ed468e79fc Merge branch 'dev' of gitmaco:Growstuff/growstuff into show_concern 2016-06-07 09:57:47 -04:00
Daniel O'Connor 130565af75 Merge pull request #969 from maco/code_climate_token 
add Code Climate token to Travis config
 2016-06-07 09:01:27 +09:30
Daniel O'Connor ad8f360336 Merge pull request #970 from maco/codeclimate_exclude_vendor 
exclude vendor gems from code climate
 2016-06-07 09:01:05 +09:30
Daniel O'Connor 15775403fd Merge pull request #971 from maco/readme_email 
info@ email exists again
 2016-06-07 09:00:38 +09:30
Mackenzie Morgan e1b83c32af info@ email exists again 2016-06-06 13:27:13 -04:00
Mackenzie Morgan 3fc7c65247 exclude vendor gems from code climate 2016-06-06 13:14:01 -04:00
Mackenzie Morgan c8d1239b79 add Code Climate token to Travis config 2016-06-06 09:40:30 -04:00
Cesy 7885257fae Merge pull request #943 from CloCkWeRX/adjust_helper 
Deal with .nil quantity of a seed in rendering helper
 2016-06-04 12:41:03 +01:00
Daniel O'Connor a8d22709e6 Add explict test coverage of the helper with nil seeds (page level tests already cover this rendering on crop detail in general) 2016-06-04 20:51:20 +09:30
pozorvlak 31b7b45ae3 Merge pull request #966 from cesy/readme 
Updating readme with current wiki status and Gitter link
 2016-06-03 14:34:35 +01:00
Cesy Avon 681798b582 Updating readme with current wiki status and Gitter link 2016-06-03 13:12:19 +00:00
Cesy f05ea56179 Merge pull request #965 from dv2/dev 
Add test coverage for GardensHelper
 2016-06-03 14:03:07 +01:00
DV Dasari ed4269ea4c fixing grammar in test descriptions 2016-06-03 07:54:24 -05:00
DV Dasari 085fcc958e Add test coverage for GardensHelper 2016-06-02 22:22:14 -05:00
pozorvlak 8f33fe3595 Merge pull request #960 from CloCkWeRX/update_various_gems 
Update various gems
 2016-06-02 18:18:12 +01:00
pozorvlak 980a7d79d3 Merge pull request #963 from CloCkWeRX/add_better_opengraph_squashed 
Various bugfixes for facebook/opengraph
 2016-06-02 17:58:05 +01:00
pozorvlak 9c5c07e087 Merge pull request #948 from cesy/issue875 
Fix #875 edited date on comments on homepage
 2016-06-02 17:41:59 +01:00
Daniel O'Connor faaf07cad8 Render the full size image, as facebook doesn't like smaller thumbnails 2016-06-03 01:58:34 +09:30
Daniel O'Connor 0e83a230b9 Helps not to render excess info 2016-06-03 01:54:26 +09:30
Daniel O'Connor c278b36858 Up the various opengraph images to 200x200 2016-06-03 01:45:43 +09:30
pozorvlak 0805f86b86 Merge pull request #961 from cesy/issue476 
Issue 476 edited by date on comments and posts
 2016-06-02 16:53:44 +01:00
pozorvlak aad88f1da6 Merge pull request #962 from CloCkWeRX/add_better_opengraph_squashed 
Add better opengraph behaviour, fix facebook share thumbnail size
 2016-06-02 16:52:13 +01:00
Daniel O'Connor 7550bc860f #816 Add better opengraph behaviour, fix facebook share thumbnail size 2016-06-03 01:01:03 +09:30
Cesy Avon fc38e1edea Issue #476 test update 2016-06-02 14:58:10 +00:00
Daniel O'Connor 88a66a705b Update devise to 4.1.X and unpin 2016-06-03 00:23:58 +09:30