mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 19:54:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 101 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Landreaux 1a50566328 modify test, still needs work 2015-01-19 11:14:36 -05:00
Marlena Compton 6d8817d1fe fixing tests but some of them are green and render is working 2015-01-19 07:34:15 -08: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
Shiho Takagi 79e1835216 use elasticsearch for auto-suggest 2015-01-19 15:45:59 +11:00
Robert Landreaux e4072fb395 write 'crop_wrangling_button_spec.rb', fix previous issue 2015-01-18 23:25:38 -05:00
Shiho Takagi 666d6dac48 adding elasticsearch service to Travis 2015-01-19 15:24:11 +11: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
Rocky Jaiswal 534c299383 Show friendly message to unregistered users who view posts. 
https://github.com/Growstuff/growstuff/issues/625
 2015-01-18 20:28:00 +01:00
Shiho Takagi 99eb33ccbb clearning up the code 2015-01-18 12:23:54 +11:00
Robert Landreaux 760e5ca74e remove failing line and add '- if can? :wrangle, Crop' 2015-01-17 12:21:01 -05:00
Shiho Takagi cd57c9cd34 updated test so elasticsearch index is deleted before every test 2015-01-18 00:24:51 +11:00
Shiho Takagi 2a184bcb2e updated test spec for improved elasticsearch syncing method 2015-01-18 00:20:50 +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
Shiho Takagi 8221d5b441 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-17 19:16:04 +11:00
Shiho Takagi ad7cfdabd0 cleaning up the code 2015-01-17 19:11:07 +11:00
Shiho Takagi 4237dfb269 cleaning up the code 2015-01-17 18:28:45 +11:00
Robert Landreaux c512b079fa add wrangle crop button to browse crops page 2015-01-17 00:20:11 -05:00
Shiho Takagi b4cd151a03 merge from upstream 2015-01-17 14:09:45 +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
Shiho Takagi 6451077d1d Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-17 00:40:02 +11:00
Shiho Takagi ce265e281a cleaning up the code 2015-01-17 00:37:37 +11:00
Shiho Takagi f4511c79e6 cleaning up the code 2015-01-17 00:35:57 +11:00
Shiho Takagi 06c7703628 auto-suggest to use existing search 2015-01-17 00:31:01 +11:00
Shiho Takagi 619e8590c8 updated test spec for view change 2015-01-17 00:29:11 +11:00
Shiho Takagi 88efcf4da6 updated test spec for view change 2015-01-17 00:25:34 +11:00
Shiho Takagi 556ba33172 updated crop search view 2015-01-17 00:09:39 +11:00
Skud 9d7b939d42 got rid of all img-rounded classes 2015-01-16 23:24:54 +11:00
Shiho Takagi 0bea278c5c Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 23:10:28 +11:00
Shiho Takagi 65814f1ef6 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 23:10:08 +11:00
Skud 1a7fc57f66 Merge pull request #643 from Growstuff/dev 
Production push: release 7
release7 		2015-01-16 22:24:08 +11:00
Shiho Takagi db0eb3e4da Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 22:20:36 +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
Shiho Takagi 323f635b7b Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 22:03:01 +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
Shiho Takagi 729dba8e0b Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 10:30:15 +11:00
Shiho Takagi 85c3e74cdd Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 10:29:39 +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