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

99 commits

Author SHA1 Message Date
Tom Hughes
58381bbfd4 Stick with dalli 2.6.x for now until ruby-openid is updated 
https://github.com/openid/ruby-openid/pull/67
https://github.com/mperham/dalli/issues/424
 2014-01-18 16:54:20 +00:00
Tom Hughes
d35403f1c7 Load soap4r so IP geolocation works 2014-01-17 19:57:20 +00:00
Tom Hughes
a8e04f018a Update bundle 2013-12-23 20:28:53 +00:00
Tom Hughes
9326c7e402 Update bundle 2013-12-19 17:32:23 +00:00
Tom Hughes
4bd573b0ae Require i18n-js 3.0.0.rc5.3 for proper dependency on configuration 2013-12-09 10:18:31 +00:00
Tom Hughes
9e8cf3ea71 Update i18n to fix bogus deprecation warning 2013-12-04 19:31:03 +00:00
Tom Hughes
cc4bca22b0 Update to rails 4.0.2 2013-12-03 21:09:10 +00:00
Tom Hughes
d375caf7a3 Update to CPK 6.0.1 and drop monkey patch 2013-11-30 10:28:41 +00:00
Tom Hughes
312bc4e72c Drop ejs as we aren't using it anymore 2013-11-24 16:43:06 +00:00
Tom Hughes
21d713005f Update to rails 4.0.1 2013-11-01 22:34:18 +00:00
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
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
Tom Hughes
7f598ab412 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/diary_entry/list.html.erb
 2013-04-08 22:34:37 +01:00
Tom Hughes
10a7e1a5f0 Update bundle 2013-04-01 14:40:52 +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
Tom Hughes
752423a04a Update bundle 2012-10-22 19:11:52 +01: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