]> git.openstreetmap.org Git - rails.git/log
rails.git
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

11 years agoGerman translation of the welcome page
Kai Krueger [Tue, 13 Aug 2013 22:50:11 +0000 (16:50 -0600)]
German translation of the welcome page

11 years agoTweak layer levels
Grant Slater [Thu, 8 Aug 2013 13:46:51 +0000 (14:46 +0100)]
Tweak layer levels

11 years agoAdd an og:image meta tag
John Firebaugh [Tue, 13 Aug 2013 23:03:48 +0000 (16:03 -0700)]
Add an og:image meta tag

Without this, links to OpenStreetMap.org shared via Facebook
default to the ad image.

Fixes systemed/iD#1644

11 years agoUpgrade passwords to the latest hashing scheme on login
Tom Hughes [Tue, 13 Aug 2013 23:13:49 +0000 (00:13 +0100)]
Upgrade passwords to the latest hashing scheme on login

11 years agoStrengthen password hashing algorithm
Tom Hughes [Tue, 13 Aug 2013 22:07:41 +0000 (23:07 +0100)]
Strengthen password hashing algorithm

11 years agoUpdate tests with new URL for mapnik exports
Tom Hughes [Mon, 12 Aug 2013 23:34:05 +0000 (00:34 +0100)]
Update tests with new URL for mapnik exports

11 years agoSet longitude correctly in "where am I" lookups from the edit page
Tom Hughes [Mon, 12 Aug 2013 22:58:34 +0000 (23:58 +0100)]
Set longitude correctly in "where am I" lookups from the edit page

11 years agoSupport background hash parameter for iD
John Firebaugh [Mon, 12 Aug 2013 17:09:22 +0000 (10:09 -0700)]
Support background hash parameter for iD

Fixes systemed/iD#1590
Fixes systemed/iD#1682

11 years agoFix small-screen layout issues
John Firebaugh [Mon, 12 Aug 2013 21:19:26 +0000 (14:19 -0700)]
Fix small-screen layout issues

11 years agoUpdate to iD v1.1.2
John Firebaugh [Mon, 12 Aug 2013 20:20:46 +0000 (13:20 -0700)]
Update to iD v1.1.2

11 years agoFix referer params for welcome page
John Firebaugh [Thu, 8 Aug 2013 23:34:10 +0000 (16:34 -0700)]
Fix referer params for welcome page

11 years agoRedirect /edit and /export with old-style edit params
John Firebaugh [Thu, 8 Aug 2013 23:31:01 +0000 (16:31 -0700)]
Redirect /edit and /export with old-style edit params

11 years agoClean up tests
John Firebaugh [Thu, 8 Aug 2013 23:00:54 +0000 (16:00 -0700)]
Clean up tests

11 years agoHandle expired confirmation tokens
John Firebaugh [Thu, 8 Aug 2013 21:57:39 +0000 (14:57 -0700)]
Handle expired confirmation tokens

11 years agoAdd manual fallback for "Start Mapping" button
John Firebaugh [Wed, 7 Aug 2013 23:14:15 +0000 (16:14 -0700)]
Add manual fallback for "Start Mapping" button

11 years agoInterpolate URL
John Firebaugh [Tue, 6 Aug 2013 18:25:45 +0000 (11:25 -0700)]
Interpolate URL

11 years agoFix note icon CSS
John Firebaugh [Tue, 6 Aug 2013 18:24:16 +0000 (11:24 -0700)]
Fix note icon CSS

11 years agoUpdate with hash permalinks
John Firebaugh [Tue, 6 Aug 2013 18:20:05 +0000 (11:20 -0700)]
Update with hash permalinks

11 years agoFix padding
John Firebaugh [Mon, 5 Aug 2013 21:48:48 +0000 (14:48 -0700)]
Fix padding

11 years agoreplace pad with inner
Saman Bemel-Benrud [Mon, 5 Aug 2013 16:29:00 +0000 (11:29 -0500)]
replace pad with inner

11 years agoreworking terms page + replacing pad classes with inner classes.
Saman Bemel-Benrud [Mon, 5 Aug 2013 16:02:12 +0000 (11:02 -0500)]
reworking terms page + replacing pad classes with inner classes.

11 years agoPass editing params through to welcome page
John Firebaugh [Fri, 2 Aug 2013 21:36:38 +0000 (14:36 -0700)]
Pass editing params through to welcome page

11 years agoUse new design on terms page
John Firebaugh [Fri, 2 Aug 2013 01:26:04 +0000 (18:26 -0700)]
Use new design on terms page

11 years agoRemove "antispam alert"
John Firebaugh [Fri, 2 Aug 2013 00:39:46 +0000 (17:39 -0700)]
Remove "antispam alert"

The advanced users whom this affects will be aware of
the problem. It can only confuse the other 99%.

11 years agoHook up user confirmation page
John Firebaugh [Thu, 1 Aug 2013 19:38:15 +0000 (12:38 -0700)]
Hook up user confirmation page

11 years agoInline validation errors on sign up page
John Firebaugh [Thu, 1 Aug 2013 19:02:12 +0000 (12:02 -0700)]
Inline validation errors on sign up page

11 years agoClean up
John Firebaugh [Thu, 1 Aug 2013 18:22:29 +0000 (11:22 -0700)]
Clean up

11 years agoRemove unnecessary div/class/css
John Firebaugh [Thu, 1 Aug 2013 18:06:14 +0000 (11:06 -0700)]
Remove unnecessary div/class/css

11 years agoFix CSS for /user/new on validation error
John Firebaugh [Thu, 1 Aug 2013 17:35:24 +0000 (10:35 -0700)]
Fix CSS for /user/new on validation error

11 years agoReplace changeset definition with tag
John Firebaugh [Thu, 1 Aug 2013 00:25:05 +0000 (17:25 -0700)]
Replace changeset definition with tag

11 years agoreplace changeset icon with tag icon
Saman Bemel-Benrud [Wed, 31 Jul 2013 22:05:58 +0000 (18:05 -0400)]
replace changeset icon with tag icon

11 years agobring back icon for help questions section.:
Saman Bemel-Benrud [Wed, 31 Jul 2013 18:57:02 +0000 (14:57 -0400)]
bring back icon for help questions section.:
gi

11 years agobutton to login page from verify form.
Saman Bemel-Benrud [Wed, 31 Jul 2013 15:54:28 +0000 (11:54 -0400)]
button to login page from verify form.

11 years agofix problem with verify illustration.
Saman Bemel-Benrud [Wed, 31 Jul 2013 15:52:29 +0000 (11:52 -0400)]
fix problem with verify illustration.

11 years agoadding new verify page, updating graphics.
Saman Bemel-Benrud [Wed, 31 Jul 2013 15:41:48 +0000 (11:41 -0400)]
adding new verify page, updating graphics.

11 years agotouch-ups to icons & layout of welcome page.
Saman Bemel-Benrud [Wed, 31 Jul 2013 14:37:13 +0000 (10:37 -0400)]
touch-ups to icons & layout of welcome page.

11 years agobasic cleanup of welcome osm page.
Saman Bemel-Benrud [Tue, 30 Jul 2013 23:08:24 +0000 (19:08 -0400)]
basic cleanup of welcome osm page.

11 years agomaking sign-up page fun.
Saman Bemel-Benrud [Tue, 30 Jul 2013 21:36:36 +0000 (17:36 -0400)]
making sign-up page fun.

11 years agoreworking new page.
Saman Bemel-Benrud [Tue, 30 Jul 2013 19:34:44 +0000 (15:34 -0400)]
reworking new page.

11 years agorefine grid + remove styling attributes from content id
Saman Bemel-Benrud [Tue, 30 Jul 2013 18:12:47 +0000 (14:12 -0400)]
refine grid + remove styling attributes from content id

11 years agoMove pre-sign up content to sign up page
John Firebaugh [Thu, 25 Jul 2013 02:01:15 +0000 (19:01 -0700)]
Move pre-sign up content to sign up page

11 years agoCombine and refine third and sixth section
John Firebaugh [Sun, 21 Jul 2013 22:17:50 +0000 (15:17 -0700)]
Combine and refine third and sixth section

11 years agoWordsmithing
John Firebaugh [Sat, 20 Jul 2013 20:03:55 +0000 (13:03 -0700)]
Wordsmithing

11 years agoUpdate names, pick via random sample
John Firebaugh [Fri, 19 Jul 2013 20:14:06 +0000 (13:14 -0700)]
Update names, pick via random sample

11 years agoUpdate note instructions for new map UI
John Firebaugh [Fri, 19 Jul 2013 19:41:48 +0000 (12:41 -0700)]
Update note instructions for new map UI

11 years agoFix help icon in sprite
John Firebaugh [Thu, 18 Jul 2013 18:12:07 +0000 (11:12 -0700)]
Fix help icon in sprite

11 years agoMake all names translatable
John Firebaugh [Thu, 18 Jul 2013 00:00:08 +0000 (17:00 -0700)]
Make all names translatable

11 years agoMore wordsmithing
John Firebaugh [Wed, 17 Jul 2013 22:50:27 +0000 (15:50 -0700)]
More wordsmithing

11 years agoAdd a "Start Mapping" button
John Firebaugh [Wed, 17 Jul 2013 20:29:05 +0000 (13:29 -0700)]
Add a "Start Mapping" button

Position is determined in one of two ways: lat/lon query
parameters (with helpful text from a nominatim reverse
geocode), or HTML5 geolocation.

11 years agoCopy updates
John Firebaugh [Wed, 17 Jul 2013 18:08:55 +0000 (11:08 -0700)]
Copy updates

* Less !!!
* Discourage copying from other sources
* Don't mention creating a profile page
* Don't explicitly instruct users to ask questions
* Cut editor list
* Refine note instructions

11 years agoAdjust whitespace and color
John Firebaugh [Tue, 16 Jul 2013 17:25:59 +0000 (10:25 -0700)]
Adjust whitespace and color

11 years agoReduce welcome email to minimal text
John Firebaugh [Tue, 16 Jul 2013 00:53:03 +0000 (17:53 -0700)]
Reduce welcome email to minimal text

Instead, redirect newly-confirmed users to the welcome
page. If confirmation is not required, redirect immediately
and don't send an email.

11 years agoAdd welcome page based on http://osmlab.github.io/welcome-osm/
John Firebaugh [Tue, 16 Jul 2013 00:38:42 +0000 (17:38 -0700)]
Add welcome page based on http://osmlab.github.io/welcome-osm/

11 years agoUse render.openstreetmap.org for mapnik exports
Tom Hughes [Mon, 12 Aug 2013 16:50:06 +0000 (17:50 +0100)]
Use render.openstreetmap.org for mapnik exports

11 years agoFix detection of timeouts
Tom Hughes [Mon, 12 Aug 2013 16:33:18 +0000 (17:33 +0100)]
Fix detection of timeouts

11 years agoFix "view larger map" link in HTML sharing
Tom Hughes [Sun, 11 Aug 2013 23:24:32 +0000 (00:24 +0100)]
Fix "view larger map" link in HTML sharing

11 years agoFix "where am I" on the edit page
Tom Hughes [Sun, 11 Aug 2013 14:58:42 +0000 (15:58 +0100)]
Fix "where am I" on the edit page

11 years agoiD 1.1.1
John Firebaugh [Fri, 9 Aug 2013 21:59:50 +0000 (14:59 -0700)]
iD 1.1.1

11 years agoUse full page width when editing with iD
John Firebaugh [Wed, 31 Jul 2013 18:46:32 +0000 (11:46 -0700)]
Use full page width when editing with iD

11 years agoiD 1.1.0
John Firebaugh [Tue, 30 Jul 2013 22:40:16 +0000 (15:40 -0700)]
iD 1.1.0

11 years agoRemove session cleanup code from cleanup script
Tom Hughes [Fri, 9 Aug 2013 16:39:00 +0000 (17:39 +0100)]
Remove session cleanup code from cleanup script

11 years agoReapply patch
John Firebaugh [Thu, 8 Aug 2013 21:26:36 +0000 (14:26 -0700)]
Reapply patch

11 years agoUpdate leaflet.locate (fixes #438)
John Firebaugh [Thu, 8 Aug 2013 21:06:18 +0000 (14:06 -0700)]
Update leaflet.locate (fixes #438)

11 years agoPreserve location hash in referer
John Firebaugh [Thu, 8 Aug 2013 18:54:53 +0000 (11:54 -0700)]
Preserve location hash in referer

11 years agoAdd a hash if one isn't already present
John Firebaugh [Thu, 8 Aug 2013 18:51:13 +0000 (11:51 -0700)]
Add a hash if one isn't already present

11 years agoAdd copyright in attribution control
John Firebaugh [Tue, 16 Jul 2013 21:30:27 +0000 (14:30 -0700)]
Add copyright in attribution control

11 years agoAdjust tooltip style
John Firebaugh [Wed, 7 Aug 2013 23:13:55 +0000 (16:13 -0700)]
Adjust tooltip style

11 years agoTooltips for map controls
John Firebaugh [Wed, 7 Aug 2013 19:18:33 +0000 (12:18 -0700)]
Tooltips for map controls

11 years agoWork around browser inconsistency in iframe URL resolution
John Firebaugh [Wed, 7 Aug 2013 21:16:03 +0000 (14:16 -0700)]
Work around browser inconsistency in iframe URL resolution

Fixes systemed/iD#1672

11 years agoFix the "Where am I?" link
Tom Hughes [Wed, 7 Aug 2013 07:42:57 +0000 (08:42 +0100)]
Fix the "Where am I?" link

11 years agoAdd README links for other components
Paul Norman [Tue, 6 Aug 2013 22:18:55 +0000 (15:18 -0700)]
Add README links for other components

Add links for Osmosis and CGImap

11 years agoHide search marker/object when closing sidebar
John Firebaugh [Tue, 6 Aug 2013 17:32:38 +0000 (10:32 -0700)]
Hide search marker/object when closing sidebar

Fixes #417

11 years agoRefactor search JS
John Firebaugh [Tue, 6 Aug 2013 17:32:12 +0000 (10:32 -0700)]
Refactor search JS

11 years agoFix "Edit area" links
John Firebaugh [Tue, 6 Aug 2013 18:52:05 +0000 (11:52 -0700)]
Fix "Edit area" links

11 years agoWrap marker coordinates in URLs
John Firebaugh [Tue, 6 Aug 2013 17:41:15 +0000 (10:41 -0700)]
Wrap marker coordinates in URLs