Skud
aeba4acf0d
Merge pull request #372 from Skud/brandfix
...
fixed broken brand link in navbar
2014-07-18 16:34:59 +10:00
Skud
90c43336ca
fixed broken brand link in navbar
...
the "float:none" was causing trouble; removing it doesn't seem to change
the display at all.
2014-07-18 16:34:07 +10:00
Skud
0fd10643ce
Merge pull request #369 from sabreuse/dev
...
Fix an issue with menu item layout at small screen sizes
2014-07-14 12:00:59 +10:00
Amy Hendrix
10af60f30d
Cleanup crops.js.erb
2014-07-13 21:46:33 -04:00
Amy Hendrix
191363402a
Replace crops.js.erb
2014-07-13 21:45:19 -04:00
Amy Hendrix
0714c2a38c
Menu items should be block, not inline-block, at mobile screen sizes
2014-07-13 21:30:08 -04:00
Amy Hendrix
bf1821f8ce
Force bootstrap overrides into sync with upstream/dev
2014-07-13 21:26:07 -04:00
Amy Hendrix
c2435cfb8a
catch up with upstream
2014-07-13 21:08:44 -04:00
Amy Hendrix
21d5156137
Merge branch 'master' of https://github.com/Growstuff/growstuff into dev
2014-07-10 19:43:47 -04:00
Skud
8ee1499a07
Merge pull request #367 from Skud/new-contributors
...
added a few recent contributors
2014-07-10 10:53:17 +10:00
Skud
0558d854af
added a few recent contributors
2014-07-10 10:52:20 +10:00
Joseph Caudle
c89e1ec096
Merge pull request #365 from Skud/case-insensitive-search
...
Case insensitive search
2014-07-08 16:22:37 -04:00
Joseph Caudle
95130bda67
Merge pull request #366 from Skud/wrangler-rake-task
...
Added rake task to add new crop wranglers
2014-07-08 16:20:40 -04:00
Skud
e560258b39
install pg in all environments
2014-07-06 21:40:10 +10:00
Skud
60b407986d
One more try to get travis working with postgres
2014-07-06 21:34:23 +10:00
Skud
cf41a9b866
don't install production gems in test
2014-07-06 21:30:20 +10:00
Skud
c2f7cf08ca
trying to revert to the simplest travis config
2014-07-06 21:25:12 +10:00
Skud
0718b5818a
looks like we needed that postgres creation line after all
2014-07-06 20:52:42 +10:00
Skud
5744499182
Added rake task to add new crop wranglers
...
Also changed code for admin and crop wrangler to assume we already have
those roles set up, as they're part of db/seeds.rb
2014-07-06 20:37:54 +10:00
Skud
0174202ef0
Remove travis environment
...
We had this special environment because we wanted travis to be different
to our test environment -- specifically, to use postgres, while we used
sqlite in dev/test. We now use postgres in dev/test so this is no
longer necessary.
2014-07-06 20:27:35 +10:00
Skud
77d2b0e950
make crop search case insensitive
2014-07-06 20:16:59 +10:00
Skud
8897e5149d
switch to using postgres in dev and test
2014-07-06 20:14:12 +10:00
Skud
dd381378f1
Merge pull request #364 from Skud/crop-map3
...
Finally got crop maps AND community map working
2014-07-04 11:42:17 +10:00
Skud
34c45c8935
Fixed bug with specific place map
...
(it was still referring to div#map not #placesmap)
also changed the headings a bit on that page
2014-07-04 11:17:04 +10:00
Skud
99c473ab40
Changed headings on places maps to match new menu ('Community map')
2014-07-04 11:13:35 +10:00
Skud
0dac36df74
fixed tests to pass with new map div ids
2014-07-04 11:08:13 +10:00
Skud
828e9d318a
check that map exists on page before drawing it
2014-07-04 11:02:23 +10:00
Skud
890a21ddb2
small refactoring to clean up js
2014-07-04 10:49:52 +10:00
Skud
c8dbdbe298
Rename map on /places to #placesmap
...
The way the javascript is compiled means it's a good idea to make sure
everything is as distinct as possible.
2014-07-04 10:47:50 +10:00
Skud
9f1a7aad63
Merge pull request #363 from Skud/crop-map2
...
fixed error with crop map on staging
2014-07-04 10:39:34 +10:00
Skud
f28ddaded1
renamed div#map to #cropmap on crop page
...
this prevents confusion when assets are compiled (i.e. it worked in dev
but not on staging; this fixes the problem.)
2014-07-04 10:38:37 +10:00
pozorvlak
ec9bd2bd7b
Merge pull request #361 from Skud/crop-map
...
Crop map
2014-07-03 10:44:01 +01:00
Skud
67dae650bc
Merge pull request #362 from Skud/navbar-visual-tweaks
...
Navbar visual tweaks
2014-07-02 07:33:17 +12:00
Amelia Greenhall
a5e4b0816c
fix centering on top nav
2014-07-02 07:16:22 +12:00
Amelia Greenhall
adb275737f
update the navbar and footer to more modern design and colors
2014-07-02 07:16:22 +12:00
Amelia Greenhall
c489c6ac70
remove 1px wide black line on borders
2014-07-02 07:16:22 +12:00
Skud
fea7da3546
rearranged crop page headings and added tests
2014-06-30 12:14:06 -07:00
Skud
f8cb7248b7
Reduced cluster radius for maps
...
on both crops and places pages
Did this because the clusters were annoyingly over-general, eg. showing
164 people in the eastern part of North America. Cluster radius of 20px
is about the radius of the cluster icon itself. Seems to work better
eg. for separating Melbourne from Sydney on the world map.
2014-06-30 11:56:46 -07:00
Skud
4972127957
Display crop plantings on a map
2014-06-30 11:51:01 -07:00
Skud
3abaca3136
Tweak what's emitted as JSON
...
(let's just emit plantings for now, as that's all we're using)
2014-06-30 11:48:58 -07:00
Skud
8eb644fc66
Add map, move info to sidebar
2014-06-30 11:48:13 -07:00
Skud
2f8e060b49
added plantings, seeds, and harvests to the crops JSON
2014-06-30 10:56:58 -07:00
pozorvlak
cdb146c7d7
Merge pull request #360 from Skud/crop-images
...
Crop images
2014-06-28 20:04:52 +01:00
Skud
1ac35e7d4e
Darkened text background for readability
2014-06-28 11:29:51 -07:00
Skud
0560172565
Fixed incorrect env variable
2014-06-28 11:28:21 -07:00
Skud
343e7963f2
Use the latest omniauth-flickr
...
Something seems to have chagned in the API (requiring https?) which was
breaking things.
2014-06-28 11:27:45 -07:00
Skud
d10c9d96f1
Fixed whitespace issues and tests
2014-06-28 11:27:26 -07:00
Barbara Natali
174b98b118
Improve display of images on crop page
2014-06-18 21:54:30 -07:00
Skud
b2948b4367
Merge pull request #357 from Growstuff/dev
...
Production push: improved navbar, fixed maps bug
2014-06-18 21:02:02 -07:00
Skud
6e1101576e
Merge pull request #356 from ameliagreenhall/smallsearch
...
Smallsearch
2014-06-18 20:49:57 -07:00
