Skud
fe69e2f11d
Merge pull request #663 from rocky-jaiswal/minor/less_verbose_dev_logging
...
Add quiet_assets to reduce noise in dev environment.
2015-01-21 18:36:33 +11:00
Rocky Jaiswal
7950c577e9
Add quiet_assets to reduce noise in dev environment.
2015-01-20 19:45:29 +01:00
pozorvlak
0cb192ce36
Merge pull request #647 from Skud/followability
...
Tidied up authorization around follows
2015-01-19 23:46:55 +00:00
pozorvlak
7257f2e557
Merge pull request #655 from cesy/issue640mincontainer
...
Issue #640 mincontainer
2015-01-19 21:29:46 +00:00
Cesy Avon
ae914daa0c
Whitespace and commenting
2015-01-19 13:56:06 +00:00
Cesy Avon
b984475335
Changing percentage so it doesn't get too tall
2015-01-19 13:54:13 +00:00
Cesy Avon
59f5101858
Issue 640 corrected code
2015-01-19 13:50:32 +00:00
Cesy Avon
e7d3e4d6dd
Issue 640 container min-height setting up id
2015-01-19 13:25:16 +00:00
Skud
ea5b340933
Merge pull request #654 from Growstuff/dev
...
Hotfix: fix CSS for homepage and browse crops
2015-01-19 10:25:48 +11:00
Taylor Griffin
df63819602
Merge pull request #652 from Skud/cropcss
...
Fixed CSS errors with text wrapping
2015-01-17 23:15:31 +11:00
Skud
628d5b24c1
Fixed CSS errors with text wrapping
2015-01-17 21:27:08 +11:00
pozorvlak
eab958eac4
Merge pull request #646 from Skud/imgrounded
...
got rid of all img-rounded classes
2015-01-16 15:34:10 +00:00
Skud
17e94e01d0
Tidied up authorization around follows
2015-01-17 00:57:05 +11:00
Skud
9d7b939d42
got rid of all img-rounded classes
2015-01-16 23:24:54 +11:00
Skud
1a7fc57f66
Merge pull request #643 from Growstuff/dev
...
Production push: release 7
2015-01-16 22:24:08 +11:00
Skud
175996ce90
Merge pull request #637 from pozorvlak/update_contributors
...
Update CONTRIBUTORS.md with the current committers
2015-01-16 22:09:42 +11:00
pozorvlak
f70f82014f
Merge pull request #642 from Skud/release7_tweaks
...
Release7 tweaks
2015-01-16 11:02:31 +00:00
Skud
8756808444
Show members on homepage 3-across (not 2-across)
2015-01-16 21:47:24 +11:00
Skud
bb6e798bce
Fix stylesheets for various thumbnail displays
2015-01-16 21:46:44 +11:00
Skud
a5c226d128
Tweaked homepage crop display to match resized columns
...
- made columns 8/4 rather than 6/6
- show 8 interesting crops, not 12
- show 6 recent plantings, not 4
- use crop thumbnail with visible name/info/etc, rather than popup
version
- tweaked aforementioned thumbnail to have no border, and centre-align
the text
2015-01-16 21:37:15 +11:00
Miles Gould
c7bcbf6323
Update CONTRIBUTORS.md with the current committers
2015-01-15 14:49:12 +00:00
pozorvlak
f3302a9e30
Merge pull request #636 from rocky-jaiswal/upgrade/update_rails_4_1_9
...
Upgrade/update rails 4 1 9
2015-01-15 14:42:31 +00:00
Rocky Jaiswal
1e331fc19d
adding rocky jaiswal in contributors.
2015-01-15 15:25:42 +01:00
Rocky Jaiswal
31a7011260
update to latest patch on rails 4.1
2015-01-15 15:25:21 +01:00
pozorvlak
181c36cdc9
Merge pull request #635 from tygriffin/fix-cache-key
...
Fix cache key
2015-01-15 11:37:24 +00:00
Taylor Griffin
36ac0b75e7
decoy commit to test if travis / phantomjs error was spurious
2015-01-15 22:23:27 +11:00
Taylor Griffin
d5aef16860
add comment
2015-01-15 21:35:10 +11:00
Taylor Griffin
55ba535353
pass in additional parameters to make a more uniquely identifying cache key
2015-01-15 21:21:40 +11:00
Taylor Griffin
a510489570
Merge pull request #631 from Skud/newfooter
...
New footer
2015-01-14 22:45:41 +11:00
Taylor Griffin
fcbc6002d1
Merge pull request #623 from pozorvlak/seo_crop_detail_page
...
Add SEO-friendly language to the crop detail page
2015-01-14 22:40:25 +11:00
Skud
eeb48e2ad6
Removed sidebar from homepage.
...
Also removed extraneous view tests for things we no longer have.
2015-01-13 20:13:33 +11:00
Skud
b114ed2414
Improved sitewide footer ( fixes #526 )
2015-01-13 20:07:59 +11:00
Skud
1064f39020
Merge pull request #626 from pozorvlak/authentications_page_die_die_die
...
Remove authentications page and extraneous routes
2015-01-13 10:39:06 +11:00
Skud
b5a460a1b7
Merge pull request #624 from pozorvlak/inflections
...
Add inflections for irregular plural crop names
2015-01-13 10:38:58 +11:00
pozorvlak
9a961b80e5
Merge pull request #627 from tygriffin/seed-by-env
...
don't load test and admin users in staging
2015-01-12 13:55:37 +00:00
Taylor Griffin
7bc05fa118
typo
2015-01-12 22:16:42 +11:00
Taylor Griffin
f7af7e649d
update comment to reflect code changes
2015-01-12 20:13:00 +11:00
Taylor Griffin
4efb93ea45
don't load test and admin users in staging
2015-01-12 07:48:48 +11:00
Miles Gould
a5edb6497c
Display lack-of-posts nicely on crop page.
2015-01-11 12:08:57 +00:00
Miles Gould
d6314ea9a1
SEO: add crop name everywhere
2015-01-11 12:08:57 +00:00
Miles Gould
c244ca672f
Add tests for SEO of crop detail page
2015-01-11 12:08:57 +00:00
Miles Gould
401777cc4c
Add some irregular plurals.
2015-01-11 12:02:02 +00:00
Miles Gould
7ef8afb1ba
Tests for crop inflections
2015-01-11 12:02:02 +00:00
Miles Gould
e25bb5578a
Remove extraneous authentication routes.
2015-01-11 11:57:13 +00:00
Miles Gould
401f3e176e
Remove the authentications index page
2015-01-11 11:57:13 +00:00
Taylor Griffin
10ae117914
Merge pull request #451 from tygriffin/rails4-upgrade
...
Rails4 upgrade
2015-01-11 21:12:44 +11:00
Taylor Griffin
86cea2ad9f
add current_password to permitted params
2015-01-11 14:55:12 +11:00
Taylor Griffin
ccef46a5cf
add more permitted parameters to member update
2015-01-11 14:32:19 +11:00
Taylor Griffin
c803da3dfa
fix planted_at on planting create bug
2015-01-11 14:00:51 +11:00
Taylor Griffin
02ff45f705
broaden seeding for staging env
2015-01-11 09:41:04 +11:00
