cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5846 commits 4 branches 1 tag 499 MiB
Commit graph

104 commits

Author SHA1 Message Date
Tom Hughes
05a69b3d25 Update rails-i18n 2013-10-05 10:44:30 +01:00
Tom Hughes
0e9e6e6f8f Upgrade to http_accept_language 2.x 2013-09-24 20:22:44 +01:00
Tom Hughes
0be82cbfb5 Revert back to the upstream oauth-plugin 2013-09-24 15:40:38 +01:00
Tom Hughes
3ba48b313a Upgrade to paperclip 3.x 2013-09-23 14:41:52 +01:00
Tom Hughes
c962b8acfc Remove commented out load of therubyracer 2013-09-22 16:06:50 +01:00
Tom Hughes
255b0b9425 Drop memcached and use dalli as the memcache client 2013-09-22 15:57:22 +01:00
Tom Hughes
0649b0ff5e Update bundle 2013-09-22 10:33:31 +01:00
Tom Hughes
984c6dc114 Update to rails 4.0.0 2013-09-21 11:35:45 +01:00
Tom Hughes
377bdbac83 Stick with bigdecimal 1.1 for ruby 1.9 compatibility 2013-06-30 22:09:33 +01:00
Tom Hughes
694ffd7281 Update bundle 2013-06-30 21:42:39 +01:00
Tom Hughes
61dd2af0a0 Update bundle 2013-05-13 21:18:40 +01:00
Andy Allan
55214bc90b Add vendorer gem to Gemfile 
It's not needed for deployment, so create a development group for it.
 2013-05-13 20:20:01 +01:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
471bc10c0c Lock iconv to version 0.1 as later ones need ruby 1.9 2013-03-24 09:52:00 +00:00
Tom Hughes
42cab8d852 Update to rails 3.2.12 2013-02-11 21:02:26 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
 2013-01-15 21:11:35 +00:00
Tom Hughes
355d62bcf8 Update to rails 3.2.11 2013-01-08 20:37:03 +00:00
Tom Hughes
6bd16d543a Stick with therubyracer 0.10.x for now 
The 0.11.x release is a complete mess, as amply documented in the github
issue tracker (https://github.com/cowboyd/therubyracer/issues/215).
 2013-01-03 11:10:32 +00:00
Tom Hughes
71255ea666 Update rails to 2.3.10 2013-01-03 10:40:32 +00:00
Tom Hughes
78f608b114 Merge branch 'master' into notes 
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
 2012-12-01 18:22:30 +00:00
Tom Hughes
9dfb2729ab Revert "Use Redcarpet::Render::XHTML instead of our custom renderer" 
This reverts commit 4bb95b3773.
 2012-11-29 22:22:22 +00:00
Tom Hughes
4bb95b3773 Use Redcarpet::Render::XHTML instead of our custom renderer 
Now that my :link_attributes patch has been merged we don't need
the custom renderer to add the rel=nofollow attributes.
 2012-11-29 18:59:43 +00:00
Tom Hughes
8f02fe8269 Update to CPK 5.0.10 and remove monkey patch 2012-11-22 09:10:04 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Tom Hughes
d68368e0d5 Rework RTL handling to keep rules together 2012-11-19 10:39:30 +00:00
Tom Hughes
dee70e8daa Update to rails 3.2.9 2012-11-12 19:13:54 +00:00
John Firebaugh
7751973871 Allow cross-origin requests to API 2012-10-22 19:11:52 +01:00
Tom Hughes
0037502426 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
John Firebaugh
14bc538681 Use ejs templates in browse JS 2012-10-13 13:01:00 +01:00
Tom Hughes
a08d6b1a4e Require version 5.0.9 of composite_primary_keys 2012-09-30 12:39:01 +01:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
 2012-09-20 16:01:24 +01:00
John Firebaugh
2e349ab51a Remove unused gem and add a comment where it was replaced 2012-08-27 20:29:56 +01:00
Tom Hughes
7ad58d1411 Switch to using i18n-js for handling translations in javascript 2012-08-27 18:00:03 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
d0db18da82 Update rails to 3.2.8 2012-08-17 22:40:52 +01:00
Tom Hughes
5bd428015a Update to rails 3.2.7 2012-07-27 12:15:55 +01:00
Tom Hughes
da109c9e6b Go back to the normal oauth-plugin now it is fixed 2012-07-13 20:00:05 +01:00
Tom Hughes
bda393e7e2 Require ruby-openid 2.2.0 or later for ruby 1.9 support 2012-07-07 20:40:04 +01:00
Tom Hughes
c8fd34b178 Update to version 5.0.8 of composite_primary_keys 2012-07-02 08:50:33 +01:00
Tom Hughes
0adb54ad86 Update to rails 3.2.6 2012-06-18 11:00:28 +01:00
Tom Hughes
652e94485f Use browser detection to decide how many features to show 
Modern browsers are quite happy showing far more than 100 features in
the data browser, so increase the limit to 2000 by default, but keep it
restricted to 500 for IE8 and 100 for older IEs.
 2012-06-05 12:59:13 +01:00
Tom Hughes
fe3eaafd3e Stick with CPK 5.0.4 for now as later versions seem to fail 2012-06-01 15:34:28 +01:00
Tom Hughes
9262667198 Update to rails 3.2.5 2012-06-01 15:17:01 +01:00
Tom Hughes
9813d9f1e4 Get all the tests passing under ruby 1.9 2012-05-27 13:51:25 +01:00
Tom Hughes
ed8c76cba2 Use openstreetmap-oauth-plugin for now 2012-05-01 10:32:12 +01:00
Tom Hughes
7f18acbd6d Revert "Install the local build of the oauth-plugin gem from git" 
This reverts commit 169a29a5d7.
 2012-04-29 22:52:28 +01:00
Tom Hughes
169a29a5d7 Install the local build of the oauth-plugin gem from git 2012-04-29 20:46:20 +01:00
Tom Hughes
c2447e5ba1 Require version 0.4.0.1 of the oauth-plugin gem 
This is special local build to fix a security issue while a new
upstream release is pending.
 2012-04-24 21:27:36 +01:00
Tom Hughes
4327daaabf Update rails-i18n to 0.6.3 2012-04-15 23:11:03 +01:00
Tom Hughes
c19d36653d Update to rails 3.2.3 2012-04-02 18:47:03 +01:00