pozorvlak
|
4a12523793
|
Merge pull request #991 from Growstuff/dev
Release 12
release12
|
2016-06-17 11:37:29 +01:00 |
|
pozorvlak
|
6aa601b8ab
|
Merge pull request #993 from Growstuff/revert-988-dev
Revert "Handled Issue #950 (Branded Error Pages)"
|
2016-06-16 13:30:50 +01:00 |
|
pozorvlak
|
a66a040207
|
Revert "Handled Issue #950 (Branded Error Pages)"
|
2016-06-16 12:58:22 +01:00 |
|
pozorvlak
|
547a408a99
|
Merge pull request #988 from Prashanth261993/dev
Add branding to error pages (#950)
|
2016-06-16 11:12:23 +01:00 |
|
pozorvlak
|
8cd224b7fa
|
Merge pull request #990 from maco/sparkpost_#917
don't override our environment email settings with plain old sendmail
|
2016-06-15 20:03:35 +01:00 |
|
Mackenzie Morgan
|
8428e93b47
|
don't override our environment email settings with plain old sendmail
|
2016-06-15 13:27:51 -04:00 |
|
Prashanth
|
483143f2fe
|
Merge branch 'growstuff-dev' into dev
Conflicts:
CONTRIBUTORS.md
|
2016-06-14 17:09:06 +05:30 |
|
pozorvlak
|
1b3d106b6d
|
Merge pull request #989 from maco/sparkpost_#917
update to SparkPost's mailserver
|
2016-06-13 18:04:43 +01:00 |
|
Mackenzie Morgan
|
e7be006fa7
|
update to SparkPost's mailserver
|
2016-06-13 12:12:00 -04:00 |
|
Prashanth
|
b9f40151d8
|
Handled Issue #950 (Branded Error Pages)
Moved error related views from public to errors (asset pipeline can be used).
Header and footer were included along with the error message.
|
2016-06-10 18:35:48 +05:30 |
|
pozorvlak
|
e1ad0c31c8
|
Merge pull request #986 from CloCkWeRX/update_various_gems_nokogiri
Update various gems - nokogiri, mime-types, parser, guard-rspec
|
2016-06-10 11:09:12 +01:00 |
|
Daniel O'Connor
|
deaf49c18f
|
Update selenium-webdriver
|
2016-06-10 15:40:56 +09:30 |
|
Daniel O'Connor
|
53543fff4c
|
Update terminal-table
|
2016-06-10 15:40:29 +09:30 |
|
Daniel O'Connor
|
ea5e710a70
|
Update codeclimate-test-reporter
|
2016-06-10 15:38:43 +09:30 |
|
Daniel O'Connor
|
ad5a52ae74
|
Update tilt
|
2016-06-10 15:36:07 +09:30 |
|
Daniel O'Connor
|
c0cc5ab085
|
Update geocoder
|
2016-06-10 15:35:29 +09:30 |
|
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 |
|