]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoDon't redirect from user#terms to login if the user is logged in
Tom Hughes [Sun, 29 Sep 2013 14:43:34 +0000 (15:43 +0100)]
Don't redirect from user#terms to login if the user is logged in

11 years agoMake sure the "terms seen" tests actually run
Tom Hughes [Sun, 29 Sep 2013 14:43:16 +0000 (15:43 +0100)]
Make sure the "terms seen" tests actually run

11 years agoUpdate to iD v1.2.0
John Firebaugh [Thu, 26 Sep 2013 17:21:36 +0000 (10:21 -0700)]
Update to iD v1.2.0

11 years agoAdd glow to search box
Nicholas Ingalls [Tue, 24 Sep 2013 22:21:44 +0000 (19:21 -0300)]
Add glow to search box

11 years agoUpdate install instructions - ruby 1.9 is now required
Dan Stowell [Tue, 17 Sep 2013 06:48:30 +0000 (07:48 +0100)]
Update install instructions - ruby 1.9 is now required

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 26 Sep 2013 13:20:55 +0000 (13:20 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUpgrade to http_accept_language 2.x
Tom Hughes [Tue, 24 Sep 2013 19:22:44 +0000 (20:22 +0100)]
Upgrade to http_accept_language 2.x

11 years agoRemove debugging code
Tom Hughes [Tue, 24 Sep 2013 16:14:40 +0000 (17:14 +0100)]
Remove debugging code

11 years agoRevert back to the upstream oauth-plugin
Tom Hughes [Tue, 24 Sep 2013 14:40:38 +0000 (15:40 +0100)]
Revert back to the upstream oauth-plugin

11 years agoUse image_url instead of nasty hacks
Tom Hughes [Tue, 24 Sep 2013 09:46:32 +0000 (10:46 +0100)]
Use image_url instead of nasty hacks

11 years agoFixup the paperclip asset URL handling for rails 4 support
Tom Hughes [Tue, 24 Sep 2013 09:46:00 +0000 (10:46 +0100)]
Fixup the paperclip asset URL handling for rails 4 support

11 years agoDouble quote strings that need to be interpolated
Tom Hughes [Tue, 24 Sep 2013 08:59:04 +0000 (09:59 +0100)]
Double quote strings that need to be interpolated

11 years agoFix translation lookups in text version of note comment notification
Tom Hughes [Tue, 24 Sep 2013 08:52:31 +0000 (09:52 +0100)]
Fix translation lookups in text version of note comment notification

11 years agoAdd HOT layer to the main page
Tom Hughes [Mon, 23 Sep 2013 16:50:06 +0000 (17:50 +0100)]
Add HOT layer to the main page

11 years agoZoom out when switching to a layer with a lower maxZoom
Tom Hughes [Mon, 23 Sep 2013 16:29:07 +0000 (17:29 +0100)]
Zoom out when switching to a layer with a lower maxZoom

11 years agoUpgrade to paperclip 3.x
Tom Hughes [Mon, 23 Sep 2013 13:41:52 +0000 (14:41 +0100)]
Upgrade to paperclip 3.x

11 years agoSet a size for the user description text area
Tom Hughes [Mon, 23 Sep 2013 13:16:02 +0000 (14:16 +0100)]
Set a size for the user description text area

11 years agoFix routing of changeset feed
Tom Hughes [Mon, 23 Sep 2013 12:58:59 +0000 (13:58 +0100)]
Fix routing of changeset feed

11 years agoAllow GET as well as POST for oauth#request_token and oauth#access_token
Tom Hughes [Mon, 23 Sep 2013 12:47:05 +0000 (13:47 +0100)]
Allow GET as well as POST for oauth#request_token and oauth#access_token

11 years agoIgnore exceptions from old sessions
Tom Hughes [Mon, 23 Sep 2013 11:36:53 +0000 (12:36 +0100)]
Ignore exceptions from old sessions

11 years agoAvoid "unknown OID" warnings from Postgres driver
Tom Hughes [Mon, 23 Sep 2013 10:41:35 +0000 (11:41 +0100)]
Avoid "unknown OID" warnings from Postgres driver

11 years agoFix routing of RSS feeds
Tom Hughes [Mon, 23 Sep 2013 10:05:35 +0000 (11:05 +0100)]
Fix routing of RSS feeds

11 years agoConfigure page caching in the production environment
Tom Hughes [Mon, 23 Sep 2013 09:39:11 +0000 (10:39 +0100)]
Configure page caching in the production environment

11 years agoConfigure the page cache
Tom Hughes [Mon, 23 Sep 2013 09:07:23 +0000 (10:07 +0100)]
Configure the page cache

11 years agoFix typo in session store configuration
Tom Hughes [Mon, 23 Sep 2013 08:58:31 +0000 (09:58 +0100)]
Fix typo in session store configuration

11 years agoAlloe GET as well as POST for oauth#revoke and oauth#authorize
Tom Hughes [Sun, 22 Sep 2013 17:33:26 +0000 (18:33 +0100)]
Alloe GET as well as POST for oauth#revoke and oauth#authorize

11 years agoRemove commented out load of therubyracer
Tom Hughes [Sun, 22 Sep 2013 15:06:50 +0000 (16:06 +0100)]
Remove commented out load of therubyracer

11 years agoDrop memcached and use dalli as the memcache client
Tom Hughes [Sun, 22 Sep 2013 14:57:22 +0000 (15:57 +0100)]
Drop memcached and use dalli as the memcache client

11 years agoFix some Leaflet asset loading issues
Tom Hughes [Sun, 22 Sep 2013 10:47:45 +0000 (11:47 +0100)]
Fix some Leaflet asset loading issues

11 years agoRails no longer gives textareas a default size
Tom Hughes [Sun, 22 Sep 2013 09:14:50 +0000 (10:14 +0100)]
Rails no longer gives textareas a default size

11 years agoUpdate bundle
Tom Hughes [Sat, 21 Sep 2013 13:09:02 +0000 (14:09 +0100)]
Update bundle

11 years agoIgnore exceptions clearing sessions
Tom Hughes [Mon, 9 Sep 2013 10:49:00 +0000 (11:49 +0100)]
Ignore exceptions clearing sessions

Rails 3 sessions can't be loaded by rails 4 but reset_session also
fails because it tries to clear the session, which tries to load it
in to clear it.

So monkey patch the session to ignore exceptions during clear so
that out normal reset-on-exception logic will reset the session.

11 years agoAllow iD and Potlatch 2 to load assets outside the asset pipeline
Tom Hughes [Fri, 16 Aug 2013 16:04:13 +0000 (17:04 +0100)]
Allow iD and Potlatch 2 to load assets outside the asset pipeline

11 years agoPrecompile various vendor assets
Tom Hughes [Thu, 15 Aug 2013 17:20:22 +0000 (18:20 +0100)]
Precompile various vendor assets

11 years agoAvoid singleton serialisation errors
Tom Hughes [Wed, 7 Aug 2013 16:35:10 +0000 (17:35 +0100)]
Avoid singleton serialisation errors

11 years agoFix rails 4 compatibility issues in migrations
Tom Hughes [Tue, 6 Aug 2013 22:11:31 +0000 (23:11 +0100)]
Fix rails 4 compatibility issues in migrations

11 years agoAlways allow %{attribute} in model validation error messages
Tom Hughes [Tue, 6 Aug 2013 20:36:54 +0000 (21:36 +0100)]
Always allow %{attribute} in model validation error messages

11 years agoSet hostname for signed requests correctly
Tom Hughes [Tue, 6 Aug 2013 17:50:43 +0000 (18:50 +0100)]
Set hostname for signed requests correctly

11 years agoDetect test environment correctly
Tom Hughes [Tue, 6 Aug 2013 17:50:00 +0000 (18:50 +0100)]
Detect test environment correctly

11 years agoRemove deprecated assert_blank and assert_present from tests
Tom Hughes [Mon, 5 Aug 2013 22:04:31 +0000 (23:04 +0100)]
Remove deprecated assert_blank and assert_present from tests

11 years agoRemove format specifier from RSS feed route tests
Tom Hughes [Mon, 5 Aug 2013 19:10:15 +0000 (20:10 +0100)]
Remove format specifier from RSS feed route tests

11 years agoRoutingError is now UrlGenerationError
Tom Hughes [Mon, 5 Aug 2013 18:09:50 +0000 (19:09 +0100)]
RoutingError is now UrlGenerationError

11 years agoReplace deprecated finder methods
Tom Hughes [Mon, 8 Jul 2013 22:02:26 +0000 (23:02 +0100)]
Replace deprecated finder methods

11 years agoIntegrationTest is now in ActionDispatch not ActionController
Tom Hughes [Mon, 8 Jul 2013 21:57:53 +0000 (22:57 +0100)]
IntegrationTest is now in ActionDispatch not ActionController

11 years agoRails now defaults to using PATCH for updates
Tom Hughes [Sun, 7 Jul 2013 18:24:18 +0000 (19:24 +0100)]
Rails now defaults to using PATCH for updates

11 years agoReplace deprecated `scoped` method with `all`
Tom Hughes [Sun, 7 Jul 2013 16:58:15 +0000 (17:58 +0100)]
Replace deprecated `scoped` method with `all`

11 years agoEliminate deprecated scope and association arguments
Tom Hughes [Wed, 26 Jun 2013 23:35:56 +0000 (00:35 +0100)]
Eliminate deprecated scope and association arguments

11 years agoReplace attr_accessible with strong parameters
Tom Hughes [Wed, 26 Jun 2013 21:53:50 +0000 (22:53 +0100)]
Replace attr_accessible with strong parameters

11 years agoRemove multiline regular expression anchors from validations
Tom Hughes [Wed, 26 Jun 2013 21:42:02 +0000 (22:42 +0100)]
Remove multiline regular expression anchors from validations

11 years agoMonkey patch PostgreSQLAdapter to make enums work
Tom Hughes [Thu, 27 Jun 2013 17:09:28 +0000 (18:09 +0100)]
Monkey patch PostgreSQLAdapter to make enums work

11 years agoUpdate to rails 4.0.0
Tom Hughes [Wed, 26 Jun 2013 21:41:10 +0000 (22:41 +0100)]
Update to rails 4.0.0

11 years agoUse a view to build the trace RSS feed and get rid of OSM::GeoRSS
Tom Hughes [Wed, 18 Sep 2013 17:23:03 +0000 (18:23 +0100)]
Use a view to build the trace RSS feed and get rid of OSM::GeoRSS

11 years agoMake the timestamp for a diary comment into a permalink for it
Tom Hughes [Sun, 15 Sep 2013 15:22:48 +0000 (16:22 +0100)]
Make the timestamp for a diary comment into a permalink for it

11 years agoStop default layer flickering when notes or data are shown
Tom Hughes [Fri, 13 Sep 2013 15:07:51 +0000 (16:07 +0100)]
Stop default layer flickering when notes or data are shown

11 years agoFix sizing of scale control
Tom Hughes [Fri, 13 Sep 2013 15:02:38 +0000 (16:02 +0100)]
Fix sizing of scale control

11 years agoTighten white space usage for geocode "View details" link
Paul Sladen [Wed, 11 Sep 2013 00:20:26 +0000 (01:20 +0100)]
Tighten white space usage for geocode "View details" link

11 years agoAdd additional icon tags to the HTML header
Tom Hughes [Tue, 10 Sep 2013 20:35:25 +0000 (21:35 +0100)]
Add additional icon tags to the HTML header

11 years agoRemove banner ad section
Paul Sladen [Tue, 10 Sep 2013 18:38:54 +0000 (19:38 +0100)]
Remove banner ad section

11 years agoFix openid "remember me" label
Andy Allan [Tue, 10 Sep 2013 16:40:26 +0000 (17:40 +0100)]
Fix openid "remember me" label

It was targeting the wrong checkbox.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 9 Sep 2013 18:54:21 +0000 (18:54 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoMake sure we always have a base layer
Tom Hughes [Mon, 9 Sep 2013 17:30:27 +0000 (18:30 +0100)]
Make sure we always have a base layer

11 years agoImprove installation documentation and add contributor instructions
Andy Allan [Mon, 9 Sep 2013 15:42:11 +0000 (16:42 +0100)]
Improve installation documentation and add contributor instructions

11 years agoReturn GPX traces as application/gpx+xml instead of text/xml
Tom Hughes [Mon, 9 Sep 2013 15:23:38 +0000 (16:23 +0100)]
Return GPX traces as application/gpx+xml instead of text/xml

11 years agoDon't bother verifying an email address that hasn't changed
Tom Hughes [Mon, 9 Sep 2013 15:05:16 +0000 (16:05 +0100)]
Don't bother verifying an email address that hasn't changed

11 years agoCentre editors correctly when note=N is specified
Tom Hughes [Mon, 9 Sep 2013 14:44:53 +0000 (15:44 +0100)]
Centre editors correctly when note=N is specified

11 years agoNotice, and act on, changes to the layer parameter in the URL bar
Tom Hughes [Mon, 9 Sep 2013 14:17:09 +0000 (15:17 +0100)]
Notice, and act on, changes to the layer parameter in the URL bar

11 years agoAdd data-editor to the main edit tab
Tom Hughes [Mon, 9 Sep 2013 11:53:22 +0000 (12:53 +0100)]
Add data-editor to the main edit tab

This ensures that the if the user's default editor is remote edit
then it will be triggered without a page reload.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 2 Sep 2013 20:10:45 +0000 (20:10 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 2 Sep 2013 19:00:39 +0000 (19:00 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUpdate to iD v1.1.6
John Firebaugh [Sat, 24 Aug 2013 16:23:14 +0000 (09:23 -0700)]
Update to iD v1.1.6

11 years agoAdd support triggering a piwik goal when a map layer is selected
Tom Hughes [Sat, 24 Aug 2013 11:55:29 +0000 (12:55 +0100)]
Add support triggering a piwik goal when a map layer is selected

11 years agoRework piwik configuration
Tom Hughes [Sat, 24 Aug 2013 11:38:14 +0000 (12:38 +0100)]
Rework piwik configuration

11 years agoRemove unnecessary z-index for sidebar headings
Tom Hughes [Sat, 24 Aug 2013 09:20:26 +0000 (10:20 +0100)]
Remove unnecessary z-index for sidebar headings

11 years agoBuild an asset manifest for iD
Tom Hughes [Fri, 16 Aug 2013 20:02:25 +0000 (21:02 +0100)]
Build an asset manifest for iD

11 years agoUpdate to iD v1.1.5
John Firebaugh [Fri, 23 Aug 2013 18:56:46 +0000 (11:56 -0700)]
Update to iD v1.1.5

11 years agoMerge remote-tracking branch 'osmlab/id-default'
Tom Hughes [Fri, 23 Aug 2013 16:41:09 +0000 (17:41 +0100)]
Merge remote-tracking branch 'osmlab/id-default'

11 years agoMerge remote-tracking branch 'osmlab/user-display'
Tom Hughes [Fri, 23 Aug 2013 16:40:57 +0000 (17:40 +0100)]
Merge remote-tracking branch 'osmlab/user-display'

11 years agoConsistent title case
John Firebaugh [Thu, 22 Aug 2013 00:26:50 +0000 (17:26 -0700)]
Consistent title case

11 years agoDrop role and aria attributes
John Firebaugh [Thu, 22 Aug 2013 00:18:03 +0000 (17:18 -0700)]
Drop role and aria attributes

11 years agoPare menu down to basics
John Firebaugh [Thu, 15 Aug 2013 23:28:39 +0000 (16:28 -0700)]
Pare menu down to basics

11 years agoUse user_thumbnail_tiny
John Firebaugh [Thu, 15 Aug 2013 23:26:27 +0000 (16:26 -0700)]
Use user_thumbnail_tiny

11 years agoSpecify width and height for image
John Firebaugh [Thu, 15 Aug 2013 16:51:48 +0000 (09:51 -0700)]
Specify width and height for image

User-uploaded images don't get automatically scaled
like Gravatar images do.

11 years agoConvert edit menus to bootstrap dropdown
John Firebaugh [Wed, 14 Aug 2013 17:58:57 +0000 (10:58 -0700)]
Convert edit menus to bootstrap dropdown

11 years agoCompact user menu
John Firebaugh [Tue, 16 Jul 2013 23:37:58 +0000 (16:37 -0700)]
Compact user menu

11 years agoRemove Donate Ad Banner
Grant Slater [Wed, 21 Aug 2013 14:40:43 +0000 (15:40 +0100)]
Remove Donate Ad Banner

11 years agoFix test to make sure it picks up the right token
Tom Hughes [Tue, 20 Aug 2013 21:46:53 +0000 (22:46 +0100)]
Fix test to make sure it picks up the right token

11 years agoUpdate Potlatch 2 to 2.3-605-gbec0ea7 build
Tom Hughes [Tue, 20 Aug 2013 12:10:52 +0000 (13:10 +0100)]
Update Potlatch 2 to 2.3-605-gbec0ea7 build

11 years agoUpdate Potlatch 2 to 2.3-603-gebdfa12 build
Tom Hughes [Tue, 20 Aug 2013 11:30:54 +0000 (12:30 +0100)]
Update Potlatch 2 to 2.3-603-gebdfa12 build

11 years agoAdd nominatim translation for historic=tomb
Tom Hughes [Mon, 19 Aug 2013 09:34:59 +0000 (10:34 +0100)]
Add nominatim translation for historic=tomb

11 years agoMerge remote-tracking branch 'osmlab/welcome-2'
Tom Hughes [Sun, 18 Aug 2013 13:50:36 +0000 (14:50 +0100)]
Merge remote-tracking branch 'osmlab/welcome-2'

11 years agoAdd french translation of new welcome page
Vincent de Phily [Thu, 15 Aug 2013 18:43:58 +0000 (20:43 +0200)]
Add french translation of new welcome page

11 years agoUpdate to iD 1.1.4
John Firebaugh [Sat, 17 Aug 2013 19:59:22 +0000 (12:59 -0700)]
Update to iD 1.1.4

11 years agoTurn off autocomplete on user settings form
John Firebaugh [Fri, 16 Aug 2013 00:14:58 +0000 (17:14 -0700)]
Turn off autocomplete on user settings form

This prevents annoying/useless autocompletion of the
"New Email Address" and "Password" fields.

11 years agoImprove tests for user details API responses
Tom Hughes [Fri, 16 Aug 2013 20:35:54 +0000 (21:35 +0100)]
Improve tests for user details API responses

11 years agoAdd messages count to API response for logged in user details
Simon Poole [Fri, 16 Aug 2013 18:54:38 +0000 (20:54 +0200)]
Add messages count to API response for logged in user details

Allows external editors to alert the user to the fact that they
have unread messages on the OSM site.

11 years agoMake iD default editor
John Firebaugh [Thu, 15 Aug 2013 23:36:08 +0000 (16:36 -0700)]
Make iD default editor

Make iD the default editor for all users that have not specified
a preferred editor, except fall back to P2 on IE.

11 years agoUpdate to iD v1.1.3
John Firebaugh [Thu, 15 Aug 2013 22:05:51 +0000 (15:05 -0700)]
Update to iD v1.1.3

11 years agoNeed to preventDefault on href='#' links
John Firebaugh [Thu, 15 Aug 2013 16:21:12 +0000 (09:21 -0700)]
Need to preventDefault on href='#' links

Fixes https://trac.openstreetmap.org/ticket/4947

11 years agoUpdate Nominatim description terms
Sarah Hoffmann [Wed, 14 Aug 2013 20:38:14 +0000 (22:38 +0200)]
Update Nominatim description terms

11 years agoDanish translation of the welcome page
Nils Emil Larsen [Wed, 14 Aug 2013 16:27:02 +0000 (10:27 -0600)]
Danish translation of the welcome page