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

86 commits

Author SHA1 Message Date
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
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
Tom Hughes
8b9cacd3c2 Bring configuration files ino sync with current rails default ones 2010-08-04 19:47:10 +01:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
723cb57e6d Don't put MemoryLimit class in the OSM module as it breaks autoloading 2010-07-19 18:15:40 +01:00
Tom Hughes
5e2b8d087c Make memory limits configurable and make them work with passenger 2010-07-19 18:01:42 +01:00
Tom Hughes
8abe7ec6ed Fix typo that stopped monkey patch working 2010-07-19 12:36:30 +01:00
Tom Hughes
6a3cadb52d Merge branch 'master' into openid 2010-06-16 21:18:44 +01:00
Tom Hughes
c38de8027f Correct name of ActiveRecord 2010-06-15 17:12:55 +01:00
Tom Hughes
8af14faa49 Make database offline mode work 2010-06-15 10:07:39 +01:00
Tom Hughes
f980e7e4a6 Completely replace rails' version of pk_and_sequence_for 
Falling back to the rails code for pk_and_sequence_for doesn't work
because we still wind up retrying the slow version of the query for
tables with no primary key. So just replace it instead.
 2010-06-14 13:00:49 +01:00
Tom Hughes
a0af70cfb4 Monkey patch rails to make system table query efficient 
Rails tries to query the system tables to find the primary key
and it's controlling sequence, but it doesn't specify that it is
looking for objects of class "pg_class" so the pg_depend table
has to be sequentially scanned instead of being accessed using
the index.

Tests on the production database show that the time taken for
this query drops from 3.5s to 15ms if the index is used.
 2010-06-14 12:43:39 +01:00
Tom Hughes
dc35b597a2 Merge branch 'master' into openid 
Conflicts:
	config/locales/is.yml
 2010-06-07 22:24:24 +01:00
Tom Hughes
d516198bbe Update to rails 2.3.8 
Update site to use rails 2.3.8 which also allows us to drop the
globalize2 plugin as the core rails i18n code can now do fallback
and pluralization.
 2010-05-26 19:54:10 +01:00
Tom Hughes
a108e9290c Update OpenID authentication plugin to latest version 2010-05-16 10:41:23 +01:00
Tom Hughes
691f759da4 Update various files to match current rails versions 2010-05-13 10:54:16 +01:00
Tom Hughes
546250f60b Load wiki link data at startup and shorten some file names 2010-04-20 21:05:22 +01:00
Tom Hughes
aa90ace7b4 Add placeholder file for nb translations and arrange to merge nb and 
no translations at startup.
 2010-03-18 22:33:05 +00:00
Tom Hughes
94f19ce3b3 Use a better HTML sanitizer that makes sure the HTML is well formed and 
can add rel="nofollow" to links.
 2010-03-06 15:38:13 +00:00
Tom Hughes
07172166da Monkey patch rails to work around stupid I18n bug where it looks up 
time.formats in the locale and then looks for the requested format in
that hash, thereby not doing fallback correctly. To make things worse
it then defaults to just using the requested format name as the format...
 2010-03-01 00:55:27 +00:00
Tom Hughes
ee5735d550 Fixed warning. 2010-01-13 13:41:13 +00:00
Tom Hughes
70bb55b35e Handle Timeout::Error exceptions which are caught by ActiveRecord. 2010-01-11 09:55:55 +00:00
Tom Hughes
6af3f93761 Update the :en and :sl pluralizers to default to :other if a more 
specific key does not exist. This then allows r16613 to be reverted
as there is no need to distinguish the cases. Fixes #2087.
 2009-07-21 20:23:07 +00:00
Tom Hughes
9830cb27e1 Add custom pluralizer for Slovenian. Fixes #2049. 2009-07-13 08:47:59 +00:00
Tom Hughes
c82fedb0d6 Remove asset tag monkey patch as it is no longer having any effect 
due to rails changes.
 2009-06-26 13:08:36 +00:00
Tom Hughes
983dbb5353 Removed patch for rails 2.2 bug. 2009-06-04 09:22:31 +00:00
Tom Hughes
0bb18dd2be Removed available_locales monkey patch as rails 2.3 has it already. 2009-06-04 08:56:40 +00:00
Tom Hughes
a493d3676d Log missing translations. 2009-05-31 17:10:03 +00:00
Tom Hughes
5294e4d989 Send notification messages in the target user's language. 2009-05-31 16:10:53 +00:00
Tom Hughes
3d906fe8c6 Merge 15165:15373 from trunk. 2009-05-31 11:32:32 +00:00
Shaun McDonald
ae70ea2858 Remove the languages hash since we are now storing the languages in a table. Translated the posted by line in diary entry list. 2009-05-27 15:50:55 +00:00
Tom Hughes
68eeaabb9d Altered to match rails 2.3.2 implementation. 2009-05-22 23:49:08 +00:00
Shaun McDonald
6fe22d41a9 Reverting config file that shouldn't have been committed. 2009-05-22 18:41:33 +00:00
Shaun McDonald
53b4d645d8 First stage of i18n. Some migrations and extra plugins. 2009-05-22 18:36:17 +00:00
Matt Amos
95c6974763 Disabled automatic parsing of XML to a hash in request bodies for a modest 15% speedup. 2009-05-21 23:48:34 +00:00
Tom Hughes
4f6dc55683 Check for wrapped timeout errors properly. 2009-05-21 21:55:30 +00:00