Merge branch 'master' into notes

Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/site/index.html.erb
2012-10-13 15:55:34 +01:00 · 2012-10-13 15:55:34 +01:00 · 0037502426
commit 0037502426
parent 4377418d53 14bc538681
190 changed files with 3488 additions and 2999 deletions
--- a/vendor/assets/openlayers/OpenLayers.js
+++ b/vendor/assets/openlayers/OpenLayers.js
--- a/vendor/assets/potlatch2/potlatch2.swf
+++ b/vendor/assets/potlatch2/potlatch2.swf
--- a/vendor/assets/potlatch2/potlatch2/assets.zip
+++ b/vendor/assets/potlatch2/potlatch2/assets.zip
--- a/vendor/assets/potlatch2/potlatch2/locales/ar.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ar.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ast.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ast.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/br.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/br.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ca.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ca.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/da.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/da.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/diq.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/diq.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/el.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/el.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/et.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/et.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/fa.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/fa.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/fi.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/fi.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ga.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ga.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/gl.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/gl.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/he.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/he.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/hu.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/hu.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ia.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ia.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ka.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ka.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ko.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ko.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/lb.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/lb.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/lt.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/lt.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/lv.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/lv.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/mk.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/mk.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ms.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ms.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ro.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ro.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ru.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ru.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/rue.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/rue.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/sk.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/sk.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/sl.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/sl.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/sq.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/sq.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/ta.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/ta.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/tl.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/tl.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/tr.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/tr.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/uk.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/uk.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf
--- a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf
+++ b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf