]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 12 Aug 2010 17:09:36 +0000 (18:09 +0100)]
Don't refer to the decline button when there isn't one
Frederik Ramm [Thu, 12 Aug 2010 15:21:01 +0000 (17:21 +0200)]
Add new <contributor-terms> element to user details
Grant Slater [Wed, 11 Aug 2010 14:14:48 +0000 (15:14 +0100)]
CT Intro text amend.
Tom Hughes [Tue, 10 Aug 2010 23:36:33 +0000 (00:36 +0100)]
Reorder routes so correct one is selected
Grant Slater [Tue, 10 Aug 2010 23:18:45 +0000 (00:18 +0100)]
Change consider_pd_why_url to OSMF site.
Grant Slater [Tue, 10 Aug 2010 23:17:24 +0000 (00:17 +0100)]
Fix OpenLayers 404 image URL to not redirect
Grant Slater [Mon, 2 Aug 2010 14:25:02 +0000 (15:25 +0100)]
Set zero Openlayers Buffer to test influence on server.
Tom Hughes [Tue, 10 Aug 2010 17:13:34 +0000 (18:13 +0100)]
Fix spelling of referer
Tom Hughes [Tue, 10 Aug 2010 17:08:11 +0000 (18:08 +0100)]
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.
Tom Hughes [Mon, 9 Aug 2010 12:47:21 +0000 (13:47 +0100)]
Don't allow paging of the changeset atom feed
Make any request for a changeset feed with a page argument redirect
to the version with no page argument and ensure that any RSS links on
the HTML version of the changeset list don't have a page argument.
Matt Amos [Sun, 8 Aug 2010 14:47:55 +0000 (15:47 +0100)]
Fixed AMF controller to validate changeset comments
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
Siebrand Mazeland [Sat, 7 Aug 2010 18:12:55 +0000 (20:12 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Fri, 6 Aug 2010 10:15:27 +0000 (11:15 +0100)]
Put global changeset list route after more specific ones
Tom Hughes [Fri, 6 Aug 2010 10:13:21 +0000 (11:13 +0100)]
More reordering routes to put more specific ones first
Tom Hughes [Fri, 6 Aug 2010 09:40:00 +0000 (10:40 +0100)]
Make sure the trace tab always links to the global trace list
Tom Hughes [Fri, 6 Aug 2010 09:31:20 +0000 (10:31 +0100)]
More fixed to trace redirection
Redirect to list on a delete, not view. Also reorder the routes so
the more specific ones are first.
Tom Hughes [Fri, 6 Aug 2010 08:59:11 +0000 (09:59 +0100)]
Really fix the redirect on trace deletion
Tom Hughes [Fri, 6 Aug 2010 08:56:49 +0000 (09:56 +0100)]
Fix redirect on deleting a trace
Tom Hughes [Fri, 6 Aug 2010 08:53:53 +0000 (09:53 +0100)]
Fix redirect after a trace is uploaded
Tom Hughes [Wed, 4 Aug 2010 23:14:58 +0000 (00:14 +0100)]
Allow the root directory for data for file columns to be configured
Tom Hughes [Wed, 4 Aug 2010 23:10:44 +0000 (00:10 +0100)]
Move configuration of GPX file locations to application.yml
Tom Hughes [Wed, 4 Aug 2010 21:06:05 +0000 (22:06 +0100)]
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.
Tom Hughes [Wed, 4 Aug 2010 18:47:10 +0000 (19:47 +0100)]
Bring configuration files ino sync with current rails default ones
Siebrand Mazeland [Fri, 30 Jul 2010 09:50:18 +0000 (11:50 +0200)]
Localisation updates from http://translatewiki.net
Siebrand Mazeland [Wed, 28 Jul 2010 20:08:08 +0000 (22:08 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Thu, 22 Jul 2010 23:53:36 +0000 (00:53 +0100)]
Fix scoping of reverse geocode result
Tom Hughes [Thu, 22 Jul 2010 20:00:39 +0000 (21:00 +0100)]
Move the trace upload form from the list to a create trace page
Tom Hughes [Thu, 22 Jul 2010 18:54:46 +0000 (19:54 +0100)]
We can cache the trace list for logged in users now
Tom Hughes [Thu, 22 Jul 2010 18:53:11 +0000 (19:53 +0100)]
Don't cache actions with a page number
Tom Hughes [Wed, 21 Jul 2010 23:33:07 +0000 (00:33 +0100)]
Remove use of wildcard cache expiry
Instead of doing wildcard cache expiry, just iterate over the
available locales, expiring the requested entry in each locale.
Tom Hughes [Wed, 21 Jul 2010 23:27:35 +0000 (00:27 +0100)]
Remove the user type from cache keys
Tom Hughes [Wed, 21 Jul 2010 23:20:31 +0000 (00:20 +0100)]
Present "too many pending traces" message as a warning box
Tom Hughes [Wed, 21 Jul 2010 20:48:32 +0000 (21:48 +0100)]
Convert trace views to use CSS based user specific components
Tom Hughes [Wed, 21 Jul 2010 20:11:52 +0000 (21:11 +0100)]
Convert diary views to use CSS based user specific components
Tom Hughes [Wed, 21 Jul 2010 20:00:26 +0000 (21:00 +0100)]
Add support for CSS based control of user specific components
Define some helper routines which can be used to make page elements
only display when the logged in user matches certain conditions and
add style rules to the layout to trigger those elements based on the
logged in user.
Tom Hughes [Wed, 21 Jul 2010 13:49:09 +0000 (14:49 +0100)]
Fix short links to drop the layers param for the default layer
Tom Hughes [Wed, 21 Jul 2010 08:07:38 +0000 (09:07 +0100)]
Don't change the visibility of layers with no code
When parsing a layer state ignore any layers with no code
attached rather than turning them off - this ensures that
the marker layer remains enabled and any markers can be
displayed.
Tom Hughes [Tue, 20 Jul 2010 17:21:54 +0000 (18:21 +0100)]
Remove maplint layer fron the map
Remove the maplint layer from the map and change the way layers are
encoded in URLs to make links more robust when the available layers
are changed.
Tom Hughes [Tue, 20 Jul 2010 07:55:08 +0000 (08:55 +0100)]
Make the suspended user view work again
The suspended user view was broken in
2a2818d so it threw an error
instead of rendering a friendyish message.
Tom Hughes [Mon, 19 Jul 2010 17:15:40 +0000 (18:15 +0100)]
Don't put MemoryLimit class in the OSM module as it breaks autoloading
Tom Hughes [Mon, 19 Jul 2010 17:01:42 +0000 (18:01 +0100)]
Make memory limits configurable and make them work with passenger
Tom Hughes [Mon, 19 Jul 2010 11:36:30 +0000 (12:36 +0100)]
Fix typo that stopped monkey patch working
Tom Hughes [Mon, 19 Jul 2010 11:23:19 +0000 (12:23 +0100)]
Correct some exception names
Tom Hughes [Mon, 12 Jul 2010 21:40:46 +0000 (22:40 +0100)]
Revert "Add advert for SOTM 2010 to sidebar"
This reverts commit
3590335221807ed06e3fa705b8c4366f99a1b25e .
Conflicts:
app/views/layouts/site.html.erb
config/locales/en.yml
Dan Karran [Sun, 11 Jul 2010 15:13:01 +0000 (17:13 +0200)]
Indent relations as well as nodes and ways
Tom Hughes [Wed, 7 Jul 2010 20:23:00 +0000 (21:23 +0100)]
Really get the subject extraction right this time
Tom Hughes [Sat, 3 Jul 2010 06:44:11 +0000 (07:44 +0100)]
Remove maintenance notice
Tom Hughes [Fri, 2 Jul 2010 08:58:41 +0000 (09:58 +0100)]
Disable SQL sessions in database readonly mode
Siebrand Mazeland [Thu, 1 Jul 2010 17:12:08 +0000 (19:12 +0200)]
Localisation updates from translatewiki.net
Tom Hughes [Wed, 30 Jun 2010 12:34:20 +0000 (13:34 +0100)]
Extract the mail subject correctly
Tom Hughes [Wed, 30 Jun 2010 11:51:22 +0000 (12:51 +0100)]
Add a notice about the downtime
Tom Hughes [Tue, 29 Jun 2010 14:19:54 +0000 (15:19 +0100)]
Use the correct name for the interpolation variable
Tom Hughes [Tue, 29 Jun 2010 08:43:30 +0000 (09:43 +0100)]
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.
Tom Hughes [Mon, 28 Jun 2010 16:47:05 +0000 (17:47 +0100)]
Reject leading and trailing whitespace in display names
Tom Hughes [Sun, 27 Jun 2010 13:45:04 +0000 (14:45 +0100)]
Remove unused routes
Tom Hughes [Sun, 27 Jun 2010 13:42:47 +0000 (14:42 +0100)]
Make changeset browser show an error when the database is offline
Tom Hughes [Sat, 26 Jun 2010 15:35:25 +0000 (16:35 +0100)]
Add language codes to diary bodies
Wrap diary bodies in a div with the correct language code for the
entry set on the div. Closes #2572.
Tom Hughes [Sat, 26 Jun 2010 15:03:47 +0000 (16:03 +0100)]
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.
Tom Hughes [Sat, 26 Jun 2010 14:41:37 +0000 (15:41 +0100)]
Add version number based ids to browser history pages
Siebrand Mazeland [Tue, 22 Jun 2010 16:45:12 +0000 (18:45 +0200)]
Localisation updates from http://translatewiki.net
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Dan Karran [Sun, 20 Jun 2010 17:32:07 +0000 (18:32 +0100)]
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.
Tom Hughes [Sat, 19 Jun 2010 06:51:46 +0000 (07:51 +0100)]
Add timeout to describe_location and handle exceptions
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:33:01 +0000 (13:33 +0000)]
browse_helper: Correctly link to wiki pages whose keys or values contain spaces
The update-wiki-pages script normalizes " " to "_" (since MediaWiki
does it by design), but I didn't normalize it back in the
browse_helper.
Consequently objects with tags like "source=Isle of Man Government
aerial imagery (2001)" were never linked to the wiki correctly.
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:17:51 +0000 (13:17 +0000)]
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.
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:16:07 +0000 (13:16 +0000)]
wiki_pages: Run script/misc/update-wiki-pages
Ævar Arnfjörð Bjarmason [Thu, 17 Jun 2010 13:14:46 +0000 (13:14 +0000)]
wiki_pages: The Japanese moved from Ja: to JA:
Siebrand Mazeland [Wed, 16 Jun 2010 22:26:09 +0000 (00:26 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Wed, 16 Jun 2010 20:16:42 +0000 (21:16 +0100)]
Link SOTM advert to the landing page
Tom Hughes [Tue, 15 Jun 2010 16:12:55 +0000 (17:12 +0100)]
Correct name of ActiveRecord
Tom Hughes [Tue, 15 Jun 2010 09:40:47 +0000 (10:40 +0100)]
Make database offline work in production
Tom Hughes [Tue, 15 Jun 2010 09:07:39 +0000 (10:07 +0100)]
Make database offline mode work
Tom Hughes [Mon, 14 Jun 2010 12:00:49 +0000 (13:00 +0100)]
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.
Tom Hughes [Mon, 14 Jun 2010 11:43:39 +0000 (12:43 +0100)]
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.
Tom Hughes [Tue, 8 Jun 2010 17:01:21 +0000 (18:01 +0100)]
Rename layouts.sotm resource to avoid using stale translations
Tom Hughes [Tue, 8 Jun 2010 16:09:21 +0000 (17:09 +0100)]
Add advert for SOTM 2010 to sidebar
Dan Karran [Sun, 30 May 2010 22:48:02 +0000 (23:48 +0100)]
Re-using service icon for pedestrian roads
Dan Karran [Sun, 30 May 2010 19:10:33 +0000 (20:10 +0100)]
Using generic place_of_worship icon instead of Christian one
Dan Karran [Sat, 29 May 2010 13:46:35 +0000 (14:46 +0100)]
Adding health related icons
Dan Karran [Sat, 29 May 2010 13:27:15 +0000 (14:27 +0100)]
More historic and tourist-related icons
Dan Karran [Sat, 29 May 2010 13:15:58 +0000 (14:15 +0100)]
A few more icons
Dan Karran [Sat, 29 May 2010 12:57:39 +0000 (13:57 +0100)]
Add strikethrough style to browser when objects are deleted
Dan Karran [Fri, 28 May 2010 22:16:29 +0000 (23:16 +0100)]
Adding more shop icons
Dan Karran [Fri, 28 May 2010 21:57:11 +0000 (22:57 +0100)]
Add service road and bike parking icons and update the bike rental one
Dan Karran [Sun, 23 May 2010 13:03:01 +0000 (14:03 +0100)]
Adding highway _link icons like their main counterparts
Tom Hughes [Mon, 7 Jun 2010 15:01:04 +0000 (16:01 +0100)]
Revert "Switch to using oauth-plugin as a gem"
This reverts commit
41a123334bc75d17335e3f242b0243ddfd3e6389 .
Siebrand Mazeland [Thu, 3 Jun 2010 23:33:00 +0000 (01:33 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Wed, 26 May 2010 18:54:10 +0000 (19:54 +0100)]
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.
Siebrand Mazeland [Tue, 25 May 2010 14:06:17 +0000 (16:06 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Mon, 24 May 2010 11:56:23 +0000 (12:56 +0100)]
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
eff06faf46c8f0cc4d92a16f6b2daa22eabb4893 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.
Tom Hughes [Mon, 24 May 2010 11:10:46 +0000 (12:10 +0100)]
Pull in some upstream updates to http_accept_language
Siebrand Mazeland [Sun, 23 May 2010 17:36:40 +0000 (19:36 +0200)]
Localisation updates from http://translatewiki.net
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Tom Hughes [Fri, 21 May 2010 19:21:41 +0000 (20:21 +0100)]
Add a timeout to the change list pages
Tom Hughes [Fri, 21 May 2010 18:51:30 +0000 (19:51 +0100)]
Convert lat and lon values to integers
Make sure the lat and lon values in changeset bounding box queries
are integers or Postgres will refuse to use the index.
Siebrand Mazeland [Tue, 18 May 2010 21:13:25 +0000 (23:13 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Tue, 18 May 2010 14:07:46 +0000 (15:07 +0100)]
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.
Andrzej Zaborowski [Wed, 12 May 2010 22:32:07 +0000 (00:32 +0200)]
Fix a typo in the native copyright text
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Andrzej Zaborowski [Wed, 12 May 2010 22:32:07 +0000 (00:32 +0200)]
Add "UMP-pcPL" as CC-BY-SA source in the list of attributions.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Tom Hughes [Mon, 17 May 2010 23:09:29 +0000 (00:09 +0100)]
Tweak resource names to make them fit the normal naming scheme
Ævar Arnfjörð Bjarmason [Sun, 16 May 2010 15:54:11 +0000 (15:54 +0000)]
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.
Ævar Arnfjörð Bjarmason [Sun, 16 May 2010 16:39:16 +0000 (16:39 +0000)]
user.login.account suspended so translators don't have to type out anchors