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

1279 commits

Author SHA1 Message Date
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01: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
Tom Hughes
3590335221 Add advert for SOTM 2010 to sidebar 2010-06-08 17:09:21 +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
406b46e49b Revert "Switch to using oauth-plugin as a gem" 
This reverts commit 41a123334b.
 2010-06-07 16:01:04 +01:00
Siebrand Mazeland
fa11baf5c3 Localisation updates from http://translatewiki.net 2010-06-04 01:33:00 +02: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
Siebrand Mazeland
27c812505d Localisation updates from http://translatewiki.net 2010-05-25 16:06:17 +02:00
Tom Hughes
41a123334b Switch to using oauth-plugin as a gem 
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
 2010-05-24 12:58:27 +01:00
Siebrand Mazeland
337c06d4f4 Localisation updates from http://translatewiki.net 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-05-23 19:36:40 +02:00
Tom Hughes
cf682f49b3 Add a timeout to the change list pages 2010-05-21 20:21:41 +01:00
Siebrand Mazeland
09763ab129 Localisation updates from http://translatewiki.net 2010-05-18 23:13:25 +02:00
Tom Hughes
7f8ed822da Resource whose value starts with a colon need to be quoted 
Stop resources looking like symbols when they start with a colon by
quoting them.
 2010-05-18 15:07:46 +01:00
Andrzej Zaborowski
058b94df09 Fix a typo in the native copyright text 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 2010-05-18 13:45:06 +00:00
Andrzej Zaborowski
3dacce23da Add "UMP-pcPL" as CC-BY-SA source in the list of attributions. 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 2010-05-18 13:44:20 +00:00
Tom Hughes
9f0ea60679 Merge branch 'master' into openid 2010-05-18 00:16:47 +01:00
Tom Hughes
798cdc1d19 Tweak resource names to make them fit the normal naming scheme 2010-05-18 00:09:29 +01:00
Ævar Arnfjörð Bjarmason
0fd4a61759 Allow for formatting of the nominatim prefix in the i18n system 
It's a pain to translate nominatim as-is because the context forces me
to translate things in the accusative case. Now I can change
"{{name}}" into "{{name}}:" and translate things in the nominative
case.

Not putting the message in search_osm_nominatim so I don't infringe
upon its namespace.
 2010-05-18 00:06:43 +01:00
Tom Hughes
362f237e91 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-17 00:30:43 +01:00
Ævar Arnfjörð Bjarmason
fe8a330fd6 user.login.account suspended so translators don't have to type out anchors 2010-05-17 00:10:41 +01:00
Ævar Arnfjörð Bjarmason
2a2818d055 Change user.suspended.body so translators don't have to type out anchors 2010-05-17 00:10:27 +01:00
Ævar Arnfjörð Bjarmason
71b9bee07c Remove user.terms.legale_button. Added in 9a9e13af but since removed 2010-05-16 17:23:49 +01:00
Siebrand Mazeland
400080ecdb Localisation updates from translatewiki.net 2010-05-16 17:50:01 +02:00
Tom Hughes
23d88a6274 Don't require ruby-openid as the plugin pulls in the required gem(s) 2010-05-16 12:06:59 +01:00
Tom Hughes
a108e9290c Update OpenID authentication plugin to latest version 2010-05-16 10:41:23 +01:00
Tom Hughes
9b10cbccb6 Merge branch 'master' into openid 
Conflicts:
	config/locales/is.yml
 2010-05-14 22:50:17 +01:00
Ævar Arnfjörð Bjarmason
407ba399da Bump config/wiki_pages.yml with script/misc/update-wiki-pages 2010-05-14 14:22:14 +00:00