mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-28 01:38:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,217 Commits 89 Branches 96 Tags
d08e2f09db5ed7ec05527588efc8df7f1a2da96b
Commit Graph
2217 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Miles Gould d08e2f09db Add feature test for 500-on-follow error 
This doesn't actually catch the problem; I'm committing it so other
people can see it and suggest ways of making it stronger.
 2015-01-23 11:39:20 +00:00
pozorvlak d5cc3f300a Merge pull request #664 from pozorvlak/travis_containers 
Deployment from Travis containers
 2015-01-23 11:00:11 +00:00
Skud 1982cecc31 Merge pull request #673 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-23 13:40:47 +11:00
Taylor Griffin 2f05f1dbdb raise exceptions on unpermitted params in staging 2015-01-23 13:22:52 +11:00
Taylor Griffin a67a55c599 add scientific name to crops create feature spec 2015-01-23 13:21:47 +11:00
Taylor Griffin 253b5a3f85 define permitted param for nested attribute 2015-01-23 13:20:37 +11:00
Taylor Griffin 45aaf31722 Merge branch 'dev' of https://github.com/Growstuff/growstuff into sci-names-permitted-params 2015-01-23 13:19:33 +11:00
Taylor Griffin d0b9917e84 Merge pull request #671 from Growstuff/revert-669-sci-names-permitted-params 
Revert "Sci names permitted params"
 2015-01-23 13:14:42 +11:00
Taylor Griffin 32dcacf9ba copy schema from last known correct version 2015-01-23 13:14:13 +11:00
Taylor Griffin 0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00
pozorvlak dabfeeea3c Merge pull request #669 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-22 23:46:27 +00:00
Taylor Griffin 20b9996f14 raise exceptions on unpermitted parameters in staging 2015-01-23 10:15:06 +11:00
Taylor Griffin 1ea5257da4 include sci names in create crop feature spec 2015-01-23 09:56:23 +11:00
Taylor Griffin 3c360ab1b8 specify permitted params for nested attributes 2015-01-23 09:22:13 +11:00
pozorvlak b1c60572ef Merge pull request #668 from cesy/moretests 
More tests
 2015-01-22 22:01:23 +00:00
Cesy Avon 14ad572f18 Adding test for products 2015-01-22 16:21:10 +00:00
pozorvlak 1481d01cf8 Merge pull request #667 from cesy/moretests 
More tests
 2015-01-22 15:42:11 +00:00
Cesy Avon 492781ea3d The test that's currently failing on some branches 2015-01-22 14:40:11 +00:00
Cesy Avon 542d978d9c Adding extra tests for crop wrangling 2015-01-22 14:24:03 +00:00
Cesy Avon c893dcd271 Moving file to sensible location for crop wrangling test 2015-01-22 14:19:47 +00:00
Miles Gould 57552455e3 Get Heroku app from .travis.yml 2015-01-21 09:13:07 +00:00
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
Miles Gould 531a0bd9ea Roll our own heroku maintenance:(on|off) script 
This allows us to use maintenance mode without installing the full
Heroku toolbelt, which we can't do on the (much faster!) container-based
infrastructure.

We add a (temporary) deployment to my sandbox from the travis_containers
branch: muckingabout with one branch for both container-based and
VM-based approaches was starting to get confusing.
 2015-01-21 00:36:47 +00:00
Rocky Jaiswal 7950c577e9 Add quiet_assets to reduce noise in dev environment. 2015-01-20 19:45:29 +01:00
Miles Gould 5a2d9eabf4 Turn on Bundler caching on Travis 2015-01-20 09:16:00 +00:00
Miles Gould 1b936100e7 Trying out container-based Travis. 2015-01-20 08:47:06 +00:00
Miles Gould 34ea6eb37f Turning on maintenance mode for deploys, attempt 3 2015-01-20 08:20:44 +00:00
Miles Gould 2c006ec430 Remove stray "app: tranquil-basin" 2015-01-20 08:17:41 +00:00
Miles Gould 72f86c4ad0 Don't auto-deploy to production. 
We need this to be stable and tested on staging (including environment
variables and maintenance mode) before we turn it on for production.
 2015-01-19 23:59:27 +00:00
pozorvlak 0cb192ce36 Merge pull request #647 from Skud/followability 
Tidied up authorization around follows
 2015-01-19 23:46:55 +00:00
Miles Gould 3aadc5d68f Deploy to different apps based on branch 2015-01-19 23:05:15 +00:00
Miles Gould 1387f381d2 Run migrations and scripts on successful build. 2015-01-19 21:52:38 +00:00
pozorvlak 7257f2e557 Merge pull request #655 from cesy/issue640mincontainer 
Issue #640 mincontainer
 2015-01-19 21:29:46 +00:00
Miles Gould 025bfdb4b0 Test deployment with Travis. 2015-01-19 21:22:07 +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
release7 		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