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

1454 commits

Author SHA1 Message Date
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
Siebrand Mazeland
75aa771498 Localisation updates from http://transatewiki.net 2010-08-30 20:18:13 +02:00
Siebrand Mazeland
da24a83748 Localisation updates from http://translatewiki.net 2010-08-29 13:19:34 +02:00
Tom Hughes
2ce394118d Allow uncompressed GPX traces to be fetched from the API 2010-08-24 21:21:02 +01:00
Tom Hughes
b17523c893 Rename application.yml to example.application.yml 2010-08-13 22:50:18 +01:00
Ævar Arnfjörð Bjarmason
bf2149cfcb config/legales/FR.yml: Invalid YAML killed the French contributor terms 2010-08-13 15:13:31 +01:00
Tom Hughes
dbfb7c1e1d Add french version of text for when there is no decline button 2010-08-13 15:13:30 +01:00
Matt Amos
047027c95d Added login banner letting users more aware of the license change 2010-08-13 15:13:30 +01:00
Tom Hughes
6c2089da2d Don't refer to the decline button when there isn't one 2010-08-12 18:09:36 +01:00
Grant Slater
5857871924 CT Intro text amend. 2010-08-11 15:23:40 +01:00
Tom Hughes
027312fa7e Reorder routes so correct one is selected 2010-08-11 15:23:40 +01:00
Grant Slater
292975b1d5 Change consider_pd_why_url to OSMF site. 2010-08-11 15:23:37 +01:00
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms 
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
 2010-08-10 18:08:11 +01:00
Siebrand Mazeland
13c60137c2 Localisation updates from http://translatewiki.net 2010-08-07 20:12:55 +02:00
Tom Hughes
f7ebb905f1 Put global changeset list route after more specific ones 2010-08-06 11:15:27 +01:00
Tom Hughes
2edd80f465 More reordering routes to put more specific ones first 2010-08-06 11:13:21 +01:00
Tom Hughes
c5b35406a6 More fixed to trace redirection 
Redirect to list on a delete, not view. Also reorder the routes so
the more specific ones are first.
 2010-08-06 10:31:20 +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
Siebrand Mazeland
50b42628f1 Localisation updates from http://translatewiki.net 2010-07-30 11:50:18 +02:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Siebrand Mazeland
5494b9610c Localisation updates from http://translatewiki.net 2010-07-28 22:08:08 +02:00
Tom Hughes
9f83acfb44 Move the trace upload form from the list to a create trace page 2010-07-22 21:00:39 +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
f7aeff3dd6 Revert "Add advert for SOTM 2010 to sidebar" 
This reverts commit 3590335221.

Conflicts:

	app/views/layouts/site.html.erb
	config/locales/en.yml
 2010-07-12 22:40:46 +01:00
Tom Hughes
a00b472ac4 Disable SQL sessions in database readonly mode 2010-07-02 09:59:50 +01:00
Siebrand Mazeland
1ed609ef52 Localisation updates from translatewiki.net 2010-07-01 19:12:08 +02:00
Tom Hughes
2038cd52c6 Include an [OpenStreetMap] prefix on the subject of message notifications 
Put back the [OpenStreetMap] prefix to the subject line of email
notifications of messages, but strip it again from any incoming
email replies.
 2010-06-29 09:43:30 +01:00
Tom Hughes
81f5c72c76 Merge branch 'master' into openid 2010-06-27 16:29:18 +01:00
Tom Hughes
98d73aead1 Remove unused routes 2010-06-27 14:45:04 +01:00
Tom Hughes
eefb42334f Use the message title as the subject of notification mails 
Make message notification mails use the message title as the subject
so that it is properly perserved when replying by email. Closes #3051.
 2010-06-26 16:03:47 +01:00
Siebrand Mazeland
b5db57bfc1 Localisation updates from http://translatewiki.net 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-06-22 18:45:12 +02:00
Dan Karran
0bcc7ae6fc Improve working of PD question 
Public Domain agreement could be mistaken to be an 'I accept' type box. It
should be clarified that this is in addition to the ODbL agreement.
 2010-06-20 18:49:07 +01:00
Ævar Arnfjörð Bjarmason
4e809b868f wiki_pages: Grab a very long "Isle of Man" tag from the wiki 
This funky line wrapping is actually not a YAML syntax error:

    $ ruby -ryaml -rpp -e 'x = YAML.load(File.read("config/wiki_pages.yml")); pp x'|grep -B1 'Isle of'
         "source=Isle_of_Man_Government_aerial_imagery_(2001)"=>
          "Tag:source=Isle of Man Government aerial imagery (2001)",
    --
         "source=Isle_of_Man_Government_1:25000_map_(2007)"=>
          "Tag:source=Isle of Man Government 1:25000 map (2007)",

Abandon all hope ye who use YAML.
 2010-06-17 13:17:51 +00:00
Ævar Arnfjörð Bjarmason
76e53b8264 wiki_pages: Run script/misc/update-wiki-pages 2010-06-17 13:16:07 +00:00
Ævar Arnfjörð Bjarmason
408f2ba580 wiki_pages: The Japanese moved from Ja: to JA: 2010-06-17 13:14:46 +00:00
Siebrand Mazeland
057817d0de Localisation updates from http://translatewiki.net 2010-06-17 00:26:09 +02: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
f973bee52b Make database offline work in production 2010-06-15 10:40:47 +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
180228b7e3 Rename layouts.sotm resource to avoid using stale translations 2010-06-08 18:01:21 +01:00