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

170 commits

Author SHA1 Message Date
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
Tom Hughes
5f0868bd49 Monkey patch in an upstream fix for I18n::Backend::Fallbacks 
This can be removed when a new i18n gem release happens. It also allows
us to remvoe an old monkey patch that worked around the problem for one
specific translation key.
 2011-12-18 15:54:38 +00:00
Tom Hughes
11cc7ebaa7 Use I18n::Backend::Simple.include directly 2011-12-18 15:49:21 +00:00
Tom Hughes
3f5374901e Allow generic URIs to use the registry format 
This should stop OAuth complaining when it tries to parse a mapzen
callback URI of the form mapzen://osm_callback
 2011-12-13 10:45:40 +00:00
Tom Hughes
d74cb34e1e Remove old unused monkey patch 2011-11-26 16:06:41 +00:00
Tom Hughes
ae8a114069 Make query cache disabling work again 2011-11-26 16:01:57 +00:00
Tom Hughes
0d6a51d74e Monkey patch CPK to fix problems with polymorphic has_many 2011-11-18 10:21:37 +00:00
Tom Hughes
56ddd1a21f Only apply the hard memory limit when running under passenger 2011-11-15 09:17:07 +00:00
Tom Hughes
69f535af32 Reinstate memory limits now we're not using rhino 2011-11-14 19:06:11 +00:00
Tom Hughes
49f4a78240 Disable hard memory limits 2011-11-14 09:42:58 +00:00
Tom Hughes
2cac555019 Force an I18n reload to work around ordering problem 
Unfortunately the rails-i18n-updater plugin adds the rails translations
to the load path after rails has already loaded the translations, so we
have to force a reload to get the translated versions.
 2011-11-14 09:42:57 +00:00
Tom Hughes
96c22b169a Get OAuth working, including a hack for Potlatch 2011-11-14 09:42:55 +00:00
Tom Hughes
93fded9641 Drop the sql_session_store plugin 
The sql_session_store plugin doesn't work with rails 3 and doesn't
seem to be supported anymore, so drop it in favour of the builtin
database backed session storage.
 2011-11-14 09:42:55 +00:00
Tom Hughes
c0fe77fd02 Make hack for file streaming work with rails 3.1.0 2011-11-14 09:42:52 +00:00
Tom Hughes
8acdba8bdd Upgrade to rails 3.1.0 2011-11-14 09:42:52 +00:00
Tom Hughes
6d59a122ea Update to rails 3.0.5, arel 2.0.9 and composite_primary_keys 3.1.4 2011-11-14 09:42:48 +00:00
Tom Hughes
b89486eab0 Rework AMF controller's streaming output for rails 3 2011-11-14 09:42:46 +00:00
Tom Hughes
09e5528ecd Don't allow STARTTLS to be used when sending mail 
Ruby's mail library seems to be very picky about the certificate
validity if STARTTLS is used, so disable it.
 2011-11-14 09:42:42 +00:00
Tom Hughes
56df4f3813 Update notifiers to use new ActionMailer API 2011-11-14 09:42:41 +00:00
Tom Hughes
e1213a4651 Use Rails.xxx instead of RAILS_XXX 2011-11-14 09:42:40 +00:00
Tom Hughes
c9fa49c994 Update to rails 3 2011-11-14 09:42:40 +00:00
Tom Hughes
7c98b41cc8 Merge branch 'master' into openstreetbugs 2011-06-22 22:36:43 +01:00
Tom Hughes
c20b31b54e Merge branch 'master' into openstreetbugs 2011-05-31 19:20:42 +01:00
Tom Hughes
652dbf5044 Merge branch 'master' into openid 
Conflicts:
	config/locales/en.yml
 2011-05-31 19:10:31 +01:00
Tom Hughes
beeb77721f Update to Rails 2.3.11 
Update the site to use Rails 2.3.11 which also required switching to
the new syntax for interpolated variables in translation strings.
 2011-05-31 18:11:31 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Tom Hughes
cc311ff301 Get returning of bugs as GPX files working 2011-05-07 14:54:22 +01:00
Tom Hughes
2fd52ddf60 Add memcache support 2011-04-17 18:56:50 +01:00
Tom Hughes
10033fded1 Switch to i18n version 0.5.0 but keep old style interpolation 
It's impossible to stop rails 2 loading a newer i18n gem if it is
installed, so go with the flow and use the latest one but override
the interpolation pattern for now.
 2011-04-06 20:39:20 +01:00
Tom Hughes
1171bd3d8d Spell adapter correctly 2011-04-03 18:22:22 +01:00
Tom Hughes
a9e8f14e6d Monkey patch postgres adapter for postgres 9 support 2011-04-03 17:39:06 +01:00
Tom Hughes
11aff90f63 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	public/stylesheets/common.css
 2011-02-10 14:10:19 +00:00
Tom Hughes
7d900f15dc Use the normal rails asset tagging mechanisms for the SWF files 2011-01-14 22:51:02 +00:00
Tom Hughes
a491174efa Only shut down the current process when the memory limit is reached 
Contrary to what the ruby documentation says, sending a signal
to PID 0 actually signals the whole process group, not just the
current process. So use Process.pid to make sure we only signal
the current process.
 2010-12-19 00:15:24 +00:00
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
 2010-09-06 12:49:10 +01:00
Tom Hughes
6669253f9c Suppress deprecation warning from i18n 2010-09-02 20:00:43 +01:00
Tom Hughes
782ddc9c3e Require i18n version 0.4.1 and fix monkey patch to work with it 
Rails 3 pulls in i18n version 0.4.1 as a separate gem which then
breaks our code if it is running on a machine with rails 3 installed
as it tries to monkey patch i18n and fails, so this fix allows us
to run on a machine with rails 3 installed.
 2010-09-02 19:01:21 +01:00
Tom Hughes
37795719e8 Allow the root directory for data for file columns to be configured 2010-08-05 00:14:58 +01:00
Tom Hughes
f660d1e7e3 Move configuration of GPX file locations to application.yml 2010-08-05 00:10:44 +01:00
Tom Hughes
f07819d81a Rework application configuration 
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
 2010-08-04 22:06:05 +01:00