mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 09:43:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,537 Commits 64 Branches 76 Tags
1ac35e7d4ef0fd3954eb99a1c367aea18ac2f1b1
Commit Graph

1537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
pozorvlak
6858ec3f17 Merge pull request #354 from Skud/places-name-bug 
Fixed bug with capitalisation of usernames in map popups
 2014-06-15 00:20:30 +01:00
pozorvlak
22d67083f6 Merge pull request #355 from Skud/admin-menus 
Rearranged menus to save space
 2014-06-14 23:44:35 +01:00
Skud
997186a701 Rearranged menus to save space 2014-06-12 19:27:02 -07:00
Skud
050834734f Fixed bug with capitalisation of usernames in map popups 2014-06-12 18:49:06 -07:00
pozorvlak
039eb5472a Merge pull request #352 from Skud/mapbox 
Replace cloudmade maps with mapbox
 2014-06-04 15:54:08 +01:00
Skud
d90268bd16 Added note as to why mapbox config isn't in application.yml 2014-06-02 19:00:50 -05:00
Skud
5d587af8b0 replaced cloudmade maps with mapbox 2014-06-02 18:57:03 -05:00
pozorvlak
879e94fe06 Merge pull request #351 from Skud/root-tuber-csv 
Added roots/tubers to the CSV output for crops
 2014-05-30 18:27:48 +01:00
Skud
1d71afdb2f Added roots/tubers to the CSV output 
Also rearranged their order on the planting form to put it nearer bulbs
 2014-05-30 11:05:33 -05:00
Joseph Caudle
73a0ae402c Merge pull request #350 from Skud/ruby-version 
switch from .rvmrc to .ruby-version
 2014-05-13 09:12:30 -04:00
Alex Bayley
932cbbea26 switch from .rvmrc to .ruby-version 2014-05-13 13:51:16 +10:00
Joseph Caudle
34f3c74013 Merge pull request #348 from pozorvlak/delete_rails_secret 
Delete commented-out code.
 2014-05-06 11:24:08 -04:00
pozorvlak
dcbfda02b9 Merge pull request #349 from maco/dev 
Add 'root/tuber' to 'planted from:' list, for things like potatoes
 2014-05-06 11:56:22 +01:00
Mackenzie Morgan
062add32dc Add 'root/tuber' to 'planted from:' list, for things like potatoes 2014-05-04 22:46:45 -04:00
Miles Gould
05a2c9080f Delete commented-out code. 2014-05-03 16:21:08 +01:00
pozorvlak
7da0d54487 Merge pull request #347 from Skud/devise-bug2 
revert to devise 3.0.x due to confirmable misbehaviour
 2014-05-02 10:28:21 +01:00
Skud
b489fda18e revert to devise 3.0.x due to confirmable misbehaviour 
as documented here: https://github.com/plataformatec/devise/issues/3009

also update mailer to use letter_opener and also localhost:8080 since
we're mostly using unicorn at this point.
 2014-05-01 22:48:52 +10:00
pozorvlak
f7411da5cf Merge pull request #345 from Skud/figaro 
Figaro
 2014-04-30 14:12:09 +01:00
Skud
53a4812571 oops, fixed incorrect syntax for env vars 2014-04-29 14:02:39 +10:00
Skud
9e5c5239a8 Need to put the site name in .travis.yml for tests to pass 2014-04-29 13:46:54 +10:00
Skud
ee27b3bd6a updated docs in application.yml.example 2014-04-29 13:28:44 +10:00
Skud
8384233f4d Moved RAILS_SECRET_TOKEN to figaro 
This is the last of the stuff that was in credentials.sh so I'm removing
the deprecated credentials.example at this point.
 2014-04-29 13:18:02 +10:00
Skud
72ce69ea8f moved flickr and twitter api config to figaro 2014-04-29 13:14:47 +10:00
Skud
b61bbc2170 moved mailchimp settings to figaro 2014-04-29 13:11:57 +10:00
Skud
bf6bb7f620 Moved mandrill config to figaro 2014-04-29 13:07:23 +10:00
Skud
bc36713449 Switched paypal settings to figaro 2014-04-29 13:01:04 +10:00
Skud
2cd5b1d2ed Changed one config setting (site name) over to figaro 
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
 2014-04-29 12:57:16 +10:00
Skud
923f943717 added application.yml to gitignore 2014-04-29 12:46:41 +10:00
Skud
13fcf9db4b added deprecation notice to credentials.example 2014-04-29 12:30:56 +10:00
Skud
bacbaf756e added application.yml.example 2014-04-29 12:29:28 +10:00
Skud
3f92f1fb79 Added figaro gem 2014-04-29 12:25:07 +10:00
Skud
1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search 
Conflicts:
	spec/models/crop_spec.rb
 2014-04-29 11:16:20 +10:00
Joseph Caudle
b95647e353 Merge pull request #344 from Skud/ruby2 
Ruby2
 2014-04-28 13:47:08 -04:00
Skud
c21310c4e2 tweaking less versions as heroku is complaining about later ones 2014-04-28 13:11:43 +10:00
Skud
b86014b04f attempting to fix libv8 problem occurring on heroku 2014-04-28 13:02:23 +10:00
Skud
66a7dca5ab apparently leaflet.ie isn't a thing any more? 
https://github.com/Leaflet/Leaflet/issues/2159
 2014-04-28 12:54:07 +10:00
Skud
64d96f427f update travis.yml to use 2.1.1 2014-04-28 12:44:22 +10:00
Skud
74e1e07567 tweaking secret key settings to match what heroku already has 2014-04-28 12:42:23 +10:00
Skud
28c789f85c Update to ruby 2.1.1 and various gem tweaks to go with it 2014-04-28 12:33:43 +10:00
Skud
d33d0c507b Upgrade to ruby 2.0.0 2014-04-28 12:08:13 +10:00
Skud
14318ec235 Merge pull request #342 from pozorvlak/harvest_grams 
Allow harvesting non-integer quantities.
 2014-04-28 11:02:08 +10:00
Skud
813b0da6ef Merge pull request #343 from pozorvlak/seed-transaction 
Wrap rake db:seed in a transaction.
 2014-04-28 11:01:54 +10:00
Miles Gould
79f96f5ef4 Insist that crops created by db:seed are new. 
This shaves 2s off the 22s runtime of `rake db:seed` on my machine.
 2014-01-10 18:11:27 +00:00
Miles Gould
c50f345f1c Wrap rake db:seed in a transaction. 
This gives about a 30% speedup on my machine (from 30s to 20s). See
http://stackoverflow.com/questions/1711631/how-do-i-improve-the-performance-of-sqlite
 2014-01-10 14:10:27 +00:00
Miles Gould
4b88bf80f1 Test for spec=any in harvests/new. 2014-01-05 13:20:07 +00:00