mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 14:26:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,331 Commits 60 Branches 82 Tags
8a203deb19e60d44c8d90e5dc61ae1992705fe21
Commit Graph

83 Commits

Author SHA1 Message Date
Miles Gould
0bb482d181 Use Leaflet marker clusters. 
Doesn't work - clusters don't spiderfy at max zoom, show their
boundaries on hover or split when you get close to them.
 2013-09-05 13:40:20 +01:00
Miles Gould
4701bd1b2e Merge branch 'dev' into places2 
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
 2013-08-31 15:49:30 +01:00
Miles Gould
c955504ad7 Reinstate Geocoder lookup 
Direct Nominatim lookups were playing badly with "nearby" method in
testing. The slowness is largely fixed in the HEAD revision of Geocoder.
 2013-08-28 12:00:58 +01:00
Skud
f747db7518 newsletter subscription/unsubscription via Mailchimp API 2013-08-27 22:45:18 +10:00
Ryan Clark
fe00146f22 Added map to places/index 2013-08-06 19:38:11 -07:00
Skud
3a96cd96df removed tradable boolean field 
we're now relying just on the "tradable_to" field, which is clearer.
 2013-07-22 15:47:25 +10:00
Miles Gould
5b061877ff Upgrade debugger to 1.6.0 
This should now include the headers for Ruby 1.9.3-p429 whose absence
was causing our builds to fail. Better late than never...
 2013-06-26 12:09:39 +01:00
Miles Gould
24af32970c Remove watchr continuous-testing gem. 
Nobody was using it :-(
 2013-06-26 11:50:09 +01:00
Miles Gould
756ebd3025 Use unicorn instead of Thin webserver 
This is in the name of eliminating unnecessary differences between
development and production. You must invoke unicorn with `unicorn`
rather than `rails s`. By default it listens on port 8080.
 2013-06-26 10:50:28 +01:00
Miles Gould
9ee0e03277 Remove explicit load of diff-lcs. 
It's a dependency of rspec-expectations.
 2013-06-26 10:50:28 +01:00
Miles Gould
efb5515b0f Remove unused gems; don't load assets group in CI. 2013-06-26 10:50:28 +01:00
pozorvlak
7257a786fe Merge pull request #234 from Skud/bootstrap-middleclick 
Use github version of twitter-bootstrap-rails to fix firefox new tab pro...
 2013-06-16 06:24:40 -07:00
Skud
4b9bd4b5de added specific commit to twitter-bootstrap-rails in Gemfile 2013-06-13 07:58:54 +10:00
Miles Gould
66a6f53ae7 Set up Coveralls integration for test coverage. 2013-06-12 13:03:05 +01:00
Skud
a70a19871a Use github version of twitter-bootstrap-rails to fix firefox new tab problem 2013-06-12 09:07:41 +10:00
Skud
dc0b6fa9cb added memcachier gem 2013-06-07 18:11:50 +10:00
Skud
903f0c808c cache recent_posts and recent_plantings partials 2013-06-07 17:52:31 +10:00
Skud
89a5a777e6 Merge branch 'dev' into payments-new 
Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb
 2013-06-04 19:42:00 +10:00
Miles Gould
20eeec43ca Merge branch 'dev' into photos 
Conflicts:
	db/schema.rb
 2013-05-31 11:24:19 +01:00
Skud
08c3ec7dec Vendored the activemerchant gem to help with testing 
We needed a bogus paypal gateway as per
http://infotrope.net/2013/05/31/testing-paypal-express-with-activemerchants-bogusgateway-and-how-to-make-it-work/

Tests now pass usefully.
 2013-05-31 12:15:23 +10:00
Skud
89b62e18df Roughly got Paypal working, after much messing around. 
Still need more tests for the orders_controller, and to store the token
when it's returned.
 2013-05-28 16:37:44 +10:00
Skud
c227c11794 Added flickr icon, updated twitter icon 2013-05-14 22:33:55 +10:00
Skud
cc6d6633cc Rough attempt at showing photos from flickr. 
You can see a list of your recently uploaded Flickr photos at
/photos/new, which is nice!  However the tests are broken and there's a
lot of mess that should be in the model instead of the controller.
Committing as-is because I'm tired.
 2013-05-08 22:01:09 +10:00
Skud
d006854a6c added omniauth-flickr gem 2013-04-30 22:55:40 +10:00
Miles Gould
89d8390a6f Added authbuttons-rails gem 
Provides pretty icons for Twitter, FB, GitHub, etc. No Flickr :-(
 2013-04-09 16:50:09 +01:00
Miles Gould
e6e8398038 Install omniauth-twitter 
You lied to us, RailsCasts! You lied!

Specifically, http://asciicasts.com/episodes/235-omniauth-part-1 lied to
us about which gem we needed to install. See also
https://github.com/intridea/omniauth/issues/641 for the issues this
caused.
 2013-04-04 18:35:34 +01:00
Miles Gould
25130fcb7f Install Omniauth 2013-04-04 18:17:01 +01:00
Miles Gould
abaa38aad2 Install bootstrap-datepicker-rails Gem. 2013-03-26 19:27:45 +11:00
Cesy Avon
c586990329 Merge branch 'paginate' of https://github.com/phazel/growstuff into dev 
Conflicts:
	Gemfile.lock
 2013-03-21 05:17:14 -07:00
Skud
17309723d5 show markdown help on post and comment pages 2013-03-20 22:08:09 +11:00
gnattery
be1034a50d paginate crops 2013-03-20 14:50:16 +11:00
Skud
e04a38ac9f Merge branch 'dev' of https://github.com/Growstuff/growstuff into newrelic 
Conflicts:
	Gemfile.lock
 2013-03-19 15:33:34 +11:00
Skud
a221c42ab0 setting up NewRelic for performance monitoring 2013-03-19 15:22:59 +11:00
Skud
e04f5660cc upgrade rails to 3.2.13 - security patch 2013-03-19 15:09:56 +11:00
Skud
b66632717f Use unicorn for concurrency on heroku 2013-03-19 14:10:06 +11:00
Miles Gould
16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Skud
0aab5286f0 General prettification and making it look nice. 
Also upgraded Bootstrap, just for the hell of it.
 2013-02-20 15:42:44 +11:00
Skud
fcbabf52f1 Merge pull request #109 from Skud/geolocation 
Geolocation
 2013-02-12 16:25:51 -08:00
Miles Gould
6f104b0eeb Death to Spork! Death! Death! 2013-02-12 13:17:14 +00:00
Miles Gould
3d37f35457 Upgrade to Rails 3.2.12, after *another* security flaw. 
https://groups.google.com/forum/?hl=en&fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8
 2013-02-12 12:49:52 +00:00
Skud
8c367f713d added geocoder gem 2013-02-12 11:17:02 +11:00
Amy
fd37e437d7 Update json for security fix 2013-02-11 18:51:35 -05:00
Skud
a4938eba23 rack upgrade to 1.4.5 2013-02-09 10:26:51 +11:00
Skud
71760a4369 added cancan gem 2013-02-01 10:24:37 +11:00
Amy
887d9c03f7 Specify recent version of rspec-rails 2013-01-28 19:34:55 -05:00
Joseph Caudle
a6cf755cb6 Add debugger gem 
In order to facilitate future debugging, we are adding the debugger gem
to the project. As this is in the Gemfile generated by Rails, all that
was required to add it was uncomment the line in question and run
bundler.

[#41633207]
 2013-01-14 22:15:16 -05:00
Skud
fe24802790 added factorygirl, using it for one test so far 2013-01-11 11:01:34 +11:00
Skud
89ab3fc347 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-01-09 15:45:37 +11:00
Skud
f5f5e35853 Switched from WebRick to thin for a couple of reasons 
- webrick spits out spurious warnings when serving assets
- heroku recomments thin, and we're working on using heroku a bit
 2013-01-09 11:09:58 +11:00
Skud
bd17546635 and now rails 3.2.11 because of another security patch 2013-01-09 11:05:44 +11:00