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

159 commits

Author SHA1 Message Date
Tom Hughes
f78c703708 Simplify locale handing in notification emails 2013-05-27 10:53:14 +01:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
d53bbe53f4 Mark CORS responses as uncacheable 2013-03-25 21:50:26 +00:00
Tom Hughes
30f8e412bc Wait until after rails has initialise I18n to preload the resources 2013-03-25 12:50:18 +00:00
Tom Hughes
652b09b4d1 Force translations to be preloaded during startup 2013-03-25 10:49:58 +00:00
Tom Hughes
8090e086da Merge branch 'master' into notes 2013-02-05 19:03:28 +00:00
Tom Hughes
3374f50a5d Drop secret_token as we don't use it and it confuses people 2013-02-03 12:23:37 +00:00
Tom Hughes
ff73d12255 Make notes RSS feeds work 2013-02-02 17:48:56 +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
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
2cecfa7d01 Configure CORS to allow GET and POST to /oauth 2012-11-16 22:28:52 +00:00
Tom Hughes
9bc3196dee Monkey patch field_changed? support until CPK is updated 2012-11-12 19:15:20 +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
Tom Hughes
05b4406c14 Remove monkey patch for I18n which is no longer needed 2012-09-30 14:07:41 +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
Tom Hughes
81336c4a87 Monkey patch I18n::JS to ensure translations are in a fixed order 
Without this the result of converting the hash to JSON can vary
which causes different hashes for the result JS asset.

This is only an issue with ruby 1.8 as ruby 1.9 hashes behave like
the ActiveSupport::OrderedHash and enumerate in insertion order.
 2012-08-31 11:51:58 +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
0adb54ad86 Update to rails 3.2.6 2012-06-18 11:00:28 +01:00
Tom Hughes
f89dda9b90 Use memcache to store temporary OpenID data 
OpenID nonces and associations need to be visible across all the
servers in the production cluster, so store them in memcache where
everything can see them properly.
 2012-05-09 10:14:58 +01:00
Tom Hughes
afeee2923f Send a Content-Length header when streaming a file 2012-03-28 18:44:02 +01:00
Tom Hughes
5cae983622 Removed temporary code for promoting databases sessions to memcached 2012-03-28 10:04:56 +01:00
Tom Hughes
a48f2ac856 Update to rails-i18n 0.5.2 and remove monkey patch 2012-03-17 17:04:02 +00:00
Tom Hughes
b1cb7bb819 Drop the contents of <script> and <style> tags when we strip them 2012-03-17 16:37:01 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +00:00
Tom Hughes
4d7c3db62c Use cache store for sessions when memcached is not available 
Using cookie store is problematic because there is a limit to the
amount of session data you can store, and we sometimes overflow.
 2012-03-06 10:42:37 +00:00
Tom Hughes
c5a54b779c Add a temporary hack to suppress some broken rails translations 
See https://github.com/svenfuchs/rails-i18n/issues/194 for more
information and progress on an upstream fix.
 2012-03-06 09:21:26 +00:00
Tom Hughes
a1321f2c50 Remove translation reload that is no longer needed 
Now that we are using the rails-i18n gem the rails locales are added
to the path early on and we don't need to reload to get them.
 2012-03-04 15:10:51 +00:00
Tom Hughes
06934ad375 Update rails-i18n to 0.5.1 
This update allows us to drop our pluralization support, as rails-i18n
now takes care of that, and for a far wider range of locales.
 2012-03-02 09:19:12 +00:00
Tom Hughes
57ba7d6f0b Switch to using memcache as the session store 
As a temporary measure any session which is not found in memcache
will be looked for in the database instead.
 2012-02-27 09:01:48 +00:00
Tom Hughes
f778b61c03 Refactor memcache connection handling 2012-02-27 09:01:47 +00:00
Tom Hughes
af13c42322 Refactor session persistence code 2012-02-26 21:44:17 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
9c02133098 Don't double up newlines in the log 2012-02-19 10:52:54 +00:00
Tom Hughes
21e3047ba6 CompressedMemCacheStore has been replaced by MemCacheStore 2012-02-19 10:44:36 +00:00
Tom Hughes
478f30d69f Remove backported code now we are using mail 2.4.1 2012-02-15 17:48:16 +00:00
Tom Hughes
4de07696d5 Turn session-persistence plugin into a library 2012-02-15 17:48:15 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
29c1bab0e6 Turn output_compression plugin into a library 2012-02-15 17:48:15 +00:00
Tom Hughes
ca8e1bf188 Turn classic_pagination plugin into a library 2012-02-15 17:48:15 +00:00
Tom Hughes
10fb373e5e Switch to using http_accept_language as a gem 2012-02-15 17:48:15 +00:00
Tom Hughes
ee411e5154 Update to rails 3.2.0 2012-02-15 17:48:14 +00:00
Tom Hughes
d405637b05 Monkey patch mail to handle character encodings on ruby 1.8 2012-01-30 21:42:41 +00:00
Tom Hughes
a98a2a0213 Update CPK to 4.1.2 and drop monkey patch 2012-01-21 00:44:34 +00:00
Tom Hughes
1cc57c620f Monkey patch ActionCachePath to fix a bug 
When infer_extension is not set ActionCachePath does not set the
extension from any explicitly specified format, and hence expiry
produces cache keys which don't have any extension and don't match
the keys generated when the cache entry was created.
 2012-01-14 13:26:01 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Tom Hughes
ece52c818f Remove fallback from nb to no 
Now that we are using nb for our translations we can drop the fallback
from nb to no and just have one the other way. This also allows us to
drop the monkey patch to support mutually recursive fallbacks.
 2011-12-29 15:11:45 +00:00
Tom Hughes
d5561dd27a Use normal fallbacks to handle the no/nb confusion 
This requires (for now) a monkey patch to the i18n fallback code, which
has been offered upstream as https://github.com/svenfuchs/i18n/pull/130.
 2011-12-18 16:51:14 +00:00