mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-22 08:17:52 -05:00
Code Issues Packages Projects Releases Wiki Activity
791 Commits 58 Branches 76 Tags
c2ef94de8a60a1f3e9c30ebd63b503f2cb6c257a
Commit Graph

60 Commits

Author SHA1 Message Date
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
Miles Gould
075fbae086 Fix version of cape 
Upgrading to 1.6.0 was breaking deployments.
 2013-01-04 13:01:09 +00:00
Miles Gould
26f8367430 Fix version of Twitter bootstrap to avoid dependency hell. 
Bootstrap 2.1.9 depends on therubyracer 0.11 which depends on native v8
which requires root access.
 2013-01-04 12:45:00 +00:00
Miles Gould
03fd77b03e Upgrade to Rails 3.2.10 
- there was a SQL injection bug in 3.2.8
 - also fixed the version of therubyracer, to avoid dependency on native
   v8.
 - we need therubyracer to build bootstrap stuff.
 2013-01-04 12:33:22 +00:00
Skud
d52911c836 added gravatars for users. 2012-12-16 21:11:36 +11:00
Skud
d95f034677 Tweaked the gemfile so that 'rake' would run cleanly. 
(Was anyone else having that problem with rake versions?)
 2012-12-05 16:02:35 +11:00
Miles Gould
26e4699812 Merged "bootstrap". 2012-11-15 23:22:40 +00:00
Miles Gould
02fbae0cfc Use Markdown to display updates 2012-11-09 12:06:18 +00:00
Skud
4e3c47a82f Showing scientific names on the crop page 2012-11-07 13:19:59 +11:00
Skud
3b72a9ed17 Set up friendly IDs for crops aka slugs (eww!) 2012-10-27 15:08:30 +11:00
Maia Sauren
2273e28992 added 'development site' to header 2012-10-25 22:23:22 +11:00
Skud
58d3f91b9d Deploy to staging environment 
as per http://cjohansen.no/en/rails/multi_staging_environment_for_rails_using_capistrano_and_mod_rails
 2012-10-06 21:33:08 +01:00
Miles Gould
79a98d6225 Only use Postgres in production. 2012-10-03 20:04:56 +01:00
Skud
7452d7ae39 Switched to postgres instead of sqlite3 2012-10-02 21:44:01 +01:00
Miles Gould
1d9c1b14fc Generate scaffold for Crops; refactor tests 
Add link to Crops page from index
Refactored index/application tests to better reflect where things are.
 2012-10-02 11:32:56 +01:00
Skud
43570e5e8e fixed merge problems in Gemfile 2012-09-16 23:20:19 +01:00
Skud
4f40588435 fixed broken tests (mea culpa) 2012-09-15 11:41:32 +01:00
Skud
927dc45147 i think i've got foundation working. maybe. 2012-09-15 11:12:04 +01:00
Skud
6e0c7cf02c installed zurb, ran various rails g scripts from http://foundation.zurb.com/docs/gem-install.php#simple2 2012-09-15 11:11:11 +01:00
Skud
8cdd477745 fixing merge from upstream dev branch 2012-09-15 10:24:56 +01:00
Skud
e2751a488c using cape to run rake tasks on dev server 2012-09-15 10:22:51 +01:00
Skud
bc9f6eea52 added compass to gemfile 2012-09-12 09:41:30 +01:00
Miles Gould
bb3516b19c Use spork to run spec tests. 
Spork initialises rails once and thereafter uses that copy of rails to
run spec tests, leading to much faster test runs. On my machine, testing
index.html.haml takes 2s instead of 7s after this change, and `rake`
takes ~9s instead of ~18s.

Instructions once again taken from
http://www.rubyinside.com/how-to-rails-3-and-rspec-2-4336.html, though I
didn't copy any code for this commit.
 2012-09-10 14:54:55 +01:00
Miles Gould
abcca8071c Add watchr to dev setup. 
Watchr is an automatic testing program, which runs relevant tests every
time you save a file.
 2012-09-10 14:01:35 +01:00