Shiho Takagi
2c4e768a3a
fixing wrong file name
2015-01-26 22:30:19 +11:00
Shiho Takagi
04d61bd040
deployment sript
2015-01-25 16:18:26 +11:00
Shiho Takagi
5a96b7efd6
adding a rake task to generate elasticsearch index
2015-01-25 15:47:40 +11:00
Shiho Takagi
684a3d2229
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-21 16:50:45 +11:00
Shiho Takagi
3d738e1b7c
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-21 16:50:21 +11:00
Shiho Takagi
a5daa156ab
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-21 16:48:59 +11:00
Shiho Takagi
018b2b4711
elasticsearch to be turned off as a default in dev and test
2015-01-21 16:47:22 +11:00
Shiho Takagi
d12ec968c4
elasticsearch to be turned off as a default in dev and test
2015-01-21 16:44:59 +11:00
Shiho Takagi
f541261e43
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-20 13:20:56 +11:00
Shiho Takagi
f910fdfa73
use elasticsearch for auto-suggest
2015-01-20 13:20:13 +11:00
Shiho Takagi
79e1835216
use elasticsearch for auto-suggest
2015-01-19 15:45:59 +11:00
Shiho Takagi
666d6dac48
adding elasticsearch service to Travis
2015-01-19 15:24:11 +11:00
Shiho Takagi
99eb33ccbb
clearning up the code
2015-01-18 12:23:54 +11: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
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
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
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
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
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
Shiho Takagi
f9cec41360
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-15 21:44:57 +11:00
Shiho Takagi
19dcf6f3d5
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-15 21:44:04 +11:00
Taylor Griffin
d5aef16860
add comment
2015-01-15 21:35:10 +11:00
Shiho Takagi
1d28c30680
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
2015-01-15 21:33:22 +11:00
Shiho Takagi
9a3c4e69e8
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
...
Conflicts:
app/models/crop.rb
2015-01-15 21:32:46 +11:00
Shiho Takagi