]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Fri, 1 Oct 2010 20:02:34 +0000 (21:02 +0100)]
Add monkey patch to make openid tests work with rails 2
Tom Hughes [Fri, 24 Sep 2010 10:02:41 +0000 (11:02 +0100)]
Require a specific version of the oauth plugin
It looks likely that the API will change in future versions of
the oauth plugin, so require a known working version for now.
Tom Hughes [Fri, 24 Sep 2010 09:22:53 +0000 (10:22 +0100)]
Fix errors when an existing user tries to agree to the new terms
Tom Hughes [Fri, 24 Sep 2010 09:20:37 +0000 (10:20 +0100)]
Make terms page work during OpenID based signup
Kai Krueger [Fri, 24 Sep 2010 08:56:47 +0000 (09:56 +0100)]
Yahoo appears to have changed their OpenID endpoint / discovery
Kai Krueger [Fri, 24 Sep 2010 08:50:19 +0000 (09:50 +0100)]
Add a test for openid failure during user creation
Tom Hughes [Fri, 24 Sep 2010 08:35:36 +0000 (09:35 +0100)]
Merge branch 'master' into openid
Tom Hughes [Mon, 20 Sep 2010 20:44:54 +0000 (21:44 +0100)]
Display the verifier if OAuth 1.0a is being used in OOB mode
Tom Hughes [Fri, 10 Sep 2010 09:31:44 +0000 (10:31 +0100)]
Update oauth models and controllers for OAuth 1.0a support
Tom Hughes [Fri, 10 Sep 2010 08:30:21 +0000 (09:30 +0100)]
Remove oauth-plugin from vendor and require gem version instead
Ævar Arnfjörð Bjarmason [Thu, 16 Sep 2010 15:13:15 +0000 (15:13 +0000)]
wiki_pages: Run script/misc/update-wiki-pages
Siebrand Mazeland [Thu, 16 Sep 2010 23:24:10 +0000 (01:24 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Wed, 15 Sep 2010 09:52:04 +0000 (10:52 +0100)]
Work around change in handler behaviour in OpenLayers 2.10
We need to install the endDrag routine as the "done" handler after
creating the control otherwise the control will overwrite our handler
with one of it's own.
Richard Fairhurst [Wed, 15 Sep 2010 09:32:13 +0000 (10:32 +0100)]
Remove NearMap from Potlatch options
Tom Hughes [Fri, 10 Sep 2010 16:36:55 +0000 (17:36 +0100)]
Escape ampersands in URLs when exporting HTML for embedding
Tom Hughes [Fri, 10 Sep 2010 10:43:13 +0000 (11:43 +0100)]
Make locale data for help and wiki links a bit cleaner
Tom Hughes [Fri, 10 Sep 2010 10:23:01 +0000 (11:23 +0100)]
Only display the license notice if we don't already have a notice
Tom Hughes [Fri, 10 Sep 2010 10:20:00 +0000 (11:20 +0100)]
Mention help.openstreetmap.org in the welcome message
Tom Hughes [Fri, 10 Sep 2010 10:14:00 +0000 (11:14 +0100)]
Link to help.openstreetmap.org from the sidebar
Tom Hughes [Thu, 9 Sep 2010 20:32:15 +0000 (21:32 +0100)]
Remove unused/non-functional tag searching methods
Tom Hughes [Thu, 9 Sep 2010 15:27:50 +0000 (16:27 +0100)]
Update to OpenLayers 2.10
Tom Hughes [Thu, 9 Sep 2010 08:07:13 +0000 (09:07 +0100)]
Merge branch 'master' into openid
Tom Hughes [Thu, 9 Sep 2010 08:05:25 +0000 (09:05 +0100)]
Fix typo
Tom Hughes [Thu, 9 Sep 2010 08:06:12 +0000 (09:06 +0100)]
Merge branch 'master' into openid
Tom Hughes [Thu, 9 Sep 2010 08:05:25 +0000 (09:05 +0100)]
Fix typo
Tom Hughes [Thu, 9 Sep 2010 08:05:25 +0000 (09:05 +0100)]
Fix typo
Tom Hughes [Wed, 8 Sep 2010 16:13:54 +0000 (17:13 +0100)]
Use the keyid to identify the layer to using when exporting to an
embeddable map. Fixes #3221.
Tom Hughes [Mon, 6 Sep 2010 11:49:10 +0000 (12:49 +0100)]
Merge branch 'master' into openid
Conflicts:
app/controllers/user_controller.rb
app/views/user/terms.html.erb
config/locales/en.yml
Tom Hughes [Thu, 2 Sep 2010 19:00:43 +0000 (20:00 +0100)]
Suppress deprecation warning from i18n
Tom Hughes [Thu, 2 Sep 2010 18:01:21 +0000 (19:01 +0100)]
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.
Tom Hughes [Wed, 1 Sep 2010 12:47:06 +0000 (13:47 +0100)]
Revert "We can cache the trace list for logged in users now"
This reverts commit
f30dcd1a629449c19bc75fb3e6baa2a58f57d3c5 .
Siebrand Mazeland [Mon, 30 Aug 2010 18:18:13 +0000 (20:18 +0200)]
Localisation updates from http://transatewiki.net
Siebrand Mazeland [Sun, 29 Aug 2010 11:19:34 +0000 (13:19 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Tue, 24 Aug 2010 20:32:07 +0000 (21:32 +0100)]
Set the default trace visibility on the upload form
Tom Hughes [Tue, 24 Aug 2010 20:21:02 +0000 (21:21 +0100)]
Allow uncompressed GPX traces to be fetched from the API
Tom Hughes [Sun, 15 Aug 2010 16:35:08 +0000 (17:35 +0100)]
Update cyclemap layer to use new tile server
Tom Hughes [Fri, 13 Aug 2010 21:43:31 +0000 (22:43 +0100)]
Rename application.yml to example.application.yml
Ævar Arnfjörð Bjarmason [Fri, 13 Aug 2010 14:02:53 +0000 (14:02 +0000)]
config/legales/FR.yml: Invalid YAML killed the French contributor terms
Tom Hughes [Fri, 13 Aug 2010 09:30:53 +0000 (10:30 +0100)]
Add french version of text for when there is no decline button
Tom Hughes [Thu, 12 Aug 2010 23:09:41 +0000 (00:09 +0100)]
Don't process overlay layers in old-style layer configurations
There are no overlay layers that we actually want to be persistent, and
the removal of the maplint layer means that old configurations generally
open the wrong overlays now anyway.
Tom Hughes [Thu, 12 Aug 2010 23:05:02 +0000 (00:05 +0100)]
Use normal notice system to display login banner
Matt Amos [Thu, 12 Aug 2010 22:18:50 +0000 (23:18 +0100)]
Added login banner letting users more aware of the license change
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
Tom Hughes [Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)]
Merge branch 'master' into openid
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 15:29:18 +0000 (16:29 +0100)]
Merge branch 'master' into openid
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