]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoTidy up user preferences controller
Tom Hughes [Fri, 10 May 2013 15:03:37 +0000 (16:03 +0100)]
Tidy up user preferences controller

11 years agoOnly leave space for icons on links with the node/way/relation class
Tom Hughes [Fri, 10 May 2013 08:24:12 +0000 (09:24 +0100)]
Only leave space for icons on links with the node/way/relation class

11 years agoFix a few user preferences bugs
Tom Hughes [Thu, 9 May 2013 23:50:24 +0000 (00:50 +0100)]
Fix a few user preferences bugs

11 years agoImprove functional tests for user preferences
Tom Hughes [Thu, 9 May 2013 23:50:10 +0000 (00:50 +0100)]
Improve functional tests for user preferences

11 years agoRemove unused friend controller and related test harness
Tom Hughes [Thu, 9 May 2013 21:39:12 +0000 (22:39 +0100)]
Remove unused friend controller and related test harness

11 years agoImprove export controller tests
Tom Hughes [Thu, 9 May 2013 21:37:44 +0000 (22:37 +0100)]
Improve export controller tests

11 years agoFix invalid interpolation variables
Tom Hughes [Thu, 9 May 2013 14:05:01 +0000 (15:05 +0100)]
Fix invalid interpolation variables

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 9 May 2013 13:43:43 +0000 (13:43 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 8 May 2013 21:41:33 +0000 (21:41 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoImprove locale selection for Potlatch 2 and iD
Tom Hughes [Wed, 8 May 2013 21:28:41 +0000 (22:28 +0100)]
Improve locale selection for Potlatch 2 and iD

11 years agoPersist the state of the notes layer
Tom Hughes [Wed, 8 May 2013 20:04:41 +0000 (21:04 +0100)]
Persist the state of the notes layer

11 years agoFix a bug decoding certain lat/lon formats
Tom Hughes [Wed, 8 May 2013 18:21:19 +0000 (19:21 +0100)]
Fix a bug decoding certain lat/lon formats

11 years agoTidy up geocoder tests and extend lat/lon detection tests
Tom Hughes [Wed, 8 May 2013 18:20:42 +0000 (19:20 +0100)]
Tidy up geocoder tests and extend lat/lon detection tests

11 years agoMake a message pluralizable
Tom Hughes [Tue, 7 May 2013 18:03:38 +0000 (19:03 +0100)]
Make a message pluralizable

11 years agoFixed some "lego" messages in plain text emails
Tom Hughes [Tue, 7 May 2013 17:59:12 +0000 (18:59 +0100)]
Fixed some "lego" messages in plain text emails

11 years agoDon't cast object type and ID to string in case they are nil
Tom Hughes [Tue, 7 May 2013 16:39:11 +0000 (17:39 +0100)]
Don't cast object type and ID to string in case they are nil

11 years agoAdd a routing test for /id
Tom Hughes [Tue, 7 May 2013 13:52:08 +0000 (14:52 +0100)]
Add a routing test for /id

11 years agoRename the ugly "id_iframe" to just plain "id"
Tom Hughes [Tue, 7 May 2013 13:50:31 +0000 (14:50 +0100)]
Rename the ugly "id_iframe" to just plain "id"

11 years agoMerge remote-tracking branch 'osmlab/id-editor-embed'
Tom Hughes [Tue, 7 May 2013 13:43:45 +0000 (14:43 +0100)]
Merge remote-tracking branch 'osmlab/id-editor-embed'

11 years agoUse CDATA for note descriptions in the RSS feed
Tom Hughes [Tue, 7 May 2013 10:30:13 +0000 (11:30 +0100)]
Use CDATA for note descriptions in the RSS feed

11 years agoFix double escaping of date markup in note feed
Tom Hughes [Tue, 7 May 2013 10:23:40 +0000 (11:23 +0100)]
Fix double escaping of date markup in note feed

11 years agoSwitch to stable branch
John Firebaugh [Mon, 6 May 2013 19:50:46 +0000 (12:50 -0700)]
Switch to stable branch

11 years agoUpdate to iD 1.0.0
John Firebaugh [Mon, 6 May 2013 19:32:48 +0000 (12:32 -0700)]
Update to iD 1.0.0

11 years agoReplace some inline javascript with a UJS solution
Tom Hughes [Mon, 6 May 2013 10:09:17 +0000 (11:09 +0100)]
Replace some inline javascript with a UJS solution

11 years agoStyle the "view details" link in search results
Tom Hughes [Mon, 6 May 2013 09:47:49 +0000 (10:47 +0100)]
Style the "view details" link in search results

11 years agoAppend "view details" link to Nominatim search results
Dan Stowell [Sat, 4 May 2013 09:22:12 +0000 (10:22 +0100)]
Append "view details" link to Nominatim search results

11 years agoShow node coordinates in the right place
Tom Hughes [Sun, 5 May 2013 16:28:57 +0000 (17:28 +0100)]
Show node coordinates in the right place

11 years agoFix browse view display issues in medium width windows
Leo Koppelkamm [Sun, 5 May 2013 15:52:12 +0000 (17:52 +0200)]
Fix browse view display issues in medium width windows

Floats are evil - using inline-block instead makes the whole thing
easier and more stable.

11 years agoShow icons in browse history views
Leo Koppelkamm [Sun, 5 May 2013 15:17:59 +0000 (17:17 +0200)]
Show icons in browse history views

11 years agoShow object icons in the margin on data browers pages
Leo Koppelkamm [Sun, 5 May 2013 15:07:47 +0000 (17:07 +0200)]
Show object icons in the margin on data browers pages

Avoids indenting the text which looks odd, especially for things
which don't have an icon.

11 years agoUpdate iD, set locale
John Firebaugh [Fri, 3 May 2013 18:06:16 +0000 (11:06 -0700)]
Update iD, set locale

11 years agoSelecting relations is now supported
John Firebaugh [Sat, 27 Apr 2013 00:54:38 +0000 (17:54 -0700)]
Selecting relations is now supported

11 years agoFix search result link behavior (systemed/iD#1329)
John Firebaugh [Mon, 22 Apr 2013 23:23:29 +0000 (16:23 -0700)]
Fix search result link behavior (systemed/iD#1329)

11 years agoSupport maximize/minimize (systemed/iD#1327)
John Firebaugh [Fri, 19 Apr 2013 22:34:06 +0000 (15:34 -0700)]
Support maximize/minimize (systemed/iD#1327)

11 years agoUpdate iD
John Firebaugh [Fri, 19 Apr 2013 22:31:32 +0000 (15:31 -0700)]
Update iD

11 years agoLoad search result locations in iD
John Firebaugh [Fri, 19 Apr 2013 21:45:06 +0000 (14:45 -0700)]
Load search result locations in iD

11 years agoFix search results display (systemed/iD#1328)
John Firebaugh [Thu, 18 Apr 2013 22:40:07 +0000 (15:40 -0700)]
Fix search results display (systemed/iD#1328)

11 years agoCall updatelinks when map moves
John Firebaugh [Thu, 18 Apr 2013 21:57:25 +0000 (14:57 -0700)]
Call updatelinks when map moves

Fixes systemed/iD#1330.

11 years agoFix edit links on browse and changeset pages
John Firebaugh [Thu, 18 Apr 2013 21:30:22 +0000 (14:30 -0700)]
Fix edit links on browse and changeset pages

11 years agoUpdate iD; clean up OAuth configuration
John Firebaugh [Wed, 17 Apr 2013 23:36:09 +0000 (16:36 -0700)]
Update iD; clean up OAuth configuration

11 years agoAdd iD editor
Tom MacWright [Mon, 1 Apr 2013 21:19:15 +0000 (17:19 -0400)]
Add iD editor

iD sources live in vendor/assets/iD, and are managed with
vendorer, using the "rewrite" functionality to replace relative
paths in the CSS with <%= asset_path(…) %> directives.

To avoid needing to namespace all of its CSS classes, iD
is embedded via an iframe.

To setup, edit application.yml to include an `id_key` key.
(It can use the same consumer key as P2 if you like.)

11 years agoStop attribution control wrapping on layers with attribution text
Tom Hughes [Wed, 1 May 2013 09:01:24 +0000 (10:01 +0100)]
Stop attribution control wrapping on layers with attribution text

11 years agoMake "add note" cope with base layer changes
Tom Hughes [Wed, 1 May 2013 08:26:05 +0000 (09:26 +0100)]
Make "add note" cope with base layer changes

11 years agoFix note formatting
Tom MacWright [Mon, 29 Apr 2013 20:12:16 +0000 (16:12 -0400)]
Fix note formatting

Prevents note coordinates from falling to the next line on the browse page.

11 years agoMake the notification mails for notes show when a note is resolved
Tom Hughes [Mon, 29 Apr 2013 18:26:03 +0000 (19:26 +0100)]
Make the notification mails for notes show when a note is resolved

11 years agoDisable dragging of new notes once they are submitted
Tom Hughes [Mon, 29 Apr 2013 16:20:21 +0000 (17:20 +0100)]
Disable dragging of new notes once they are submitted

11 years agoHandle empty arguments when computing the OAuth base string
Tom Hughes [Mon, 29 Apr 2013 09:49:19 +0000 (10:49 +0100)]
Handle empty arguments when computing the OAuth base string

11 years agoReset Leaflet styles so that the OSM color scheme is more uniform.
Tom MacWright [Sun, 28 Apr 2013 16:45:12 +0000 (11:45 -0500)]
Reset Leaflet styles so that the OSM color scheme is more uniform.

Also makes note input fields shorter - 100px tall - by default.

11 years agoRemove unused CSS rule
Tom Hughes [Sun, 28 Apr 2013 17:37:37 +0000 (18:37 +0100)]
Remove unused CSS rule

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 28 Apr 2013 17:55:31 +0000 (17:55 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoRedesign notes permalink
Tom MacWright [Sat, 27 Apr 2013 22:53:28 +0000 (17:53 -0500)]
Redesign notes permalink

This adds a small permalink icon to the sprite and updates the CSS for
the permalink. The text is hidden by default and shown on hover.

11 years agoSwap older and newer
Tom Hughes [Sun, 28 Apr 2013 09:41:28 +0000 (10:41 +0100)]
Swap older and newer

11 years agoUpdate ohauth and switch to using the new headerGenerator method
Tom Hughes [Sun, 28 Apr 2013 09:39:56 +0000 (10:39 +0100)]
Update ohauth and switch to using the new headerGenerator method

11 years agoAdd a mailmap file to normalise names/addresses
Tom Hughes [Sun, 28 Apr 2013 09:36:53 +0000 (10:36 +0100)]
Add a mailmap file to normalise names/addresses

11 years agoReplace trace.trace_paging_nav.previous/next by older/newer
Yuki Shira [Sat, 27 Apr 2013 23:38:57 +0000 (08:38 +0900)]
Replace trace.trace_paging_nav.previous/next by older/newer

11 years agoTone down the anonymous edit warning for notes
Tom Hughes [Sat, 27 Apr 2013 15:47:25 +0000 (16:47 +0100)]
Tone down the anonymous edit warning for notes

Increase the saturation of our standard warning colour a little so
that it is more visible, and then switch notes to using the warning
colour instead of the error colour.

11 years agoEncode parameters correctly when building an OAuth base string
Tom Hughes [Sat, 27 Apr 2013 11:20:16 +0000 (12:20 +0100)]
Encode parameters correctly when building an OAuth base string

Parameter key and value escaping needs to use the extended algorithm
from the OAuth specification, not the standard URI escaping algorithm
so we need to escape !, ', *, ( and ) characters.

11 years agoReplace the title in the note popup with a permalink
Tom Hughes [Sat, 27 Apr 2013 10:51:51 +0000 (11:51 +0100)]
Replace the title in the note popup with a permalink

11 years agoReduce corner radius on all leaflet popups
Tom Hughes [Sat, 27 Apr 2013 10:31:02 +0000 (11:31 +0100)]
Reduce corner radius on all leaflet popups

11 years agoIncrease whitespace between comments in the note popup
Tom Hughes [Sat, 27 Apr 2013 10:23:58 +0000 (11:23 +0100)]
Increase whitespace between comments in the note popup

11 years agoCancel any existing object load before starting a new one
Tom Hughes [Sat, 27 Apr 2013 10:15:32 +0000 (11:15 +0100)]
Cancel any existing object load before starting a new one

11 years agoRemove the flatten_comment methd from the Note model
Tom Hughes [Fri, 26 Apr 2013 18:35:20 +0000 (19:35 +0100)]
Remove the flatten_comment methd from the Note model

11 years agoRework the generation of descriptions in the notes RSS feed
Tom Hughes [Fri, 26 Apr 2013 18:34:32 +0000 (19:34 +0100)]
Rework the generation of descriptions in the notes RSS feed

11 years agoShow OSM objects for Nominatim search results as map overlays
Tom Hughes [Thu, 25 Apr 2013 23:39:26 +0000 (00:39 +0100)]
Show OSM objects for Nominatim search results as map overlays

11 years agoImprove wrapping in the data browse on narrow windows
Tom Hughes [Thu, 25 Apr 2013 16:44:40 +0000 (17:44 +0100)]
Improve wrapping in the data browse on narrow windows

11 years agoFix P2 interaction with search links
John Firebaugh [Thu, 18 Apr 2013 22:59:25 +0000 (15:59 -0700)]
Fix P2 interaction with search links

Need to prevent the default action so that the page isn't
reloaded.

Also, since the click event binding uses delegation, it isn't
necessary to wrap it in $(document).ready().

11 years agoUse the correct longitude for links when browsing changesets
Tom Hughes [Thu, 25 Apr 2013 16:27:01 +0000 (17:27 +0100)]
Use the correct longitude for links when browsing changesets

11 years agoImprove functional tests for notes#feed
Tom Hughes [Wed, 24 Apr 2013 20:44:46 +0000 (21:44 +0100)]
Improve functional tests for notes#feed

11 years agoImprove functional tests for notes#show
Tom Hughes [Wed, 24 Apr 2013 20:38:20 +0000 (21:38 +0100)]
Improve functional tests for notes#show

11 years agoAdopt a consistent naming scheme fot notes functional tests
Tom Hughes [Wed, 24 Apr 2013 19:26:14 +0000 (20:26 +0100)]
Adopt a consistent naming scheme fot notes functional tests

11 years agoImprove functional tests for notes#search
Tom Hughes [Wed, 24 Apr 2013 19:21:18 +0000 (20:21 +0100)]
Improve functional tests for notes#search

11 years agoImprove functional tests for notes#index
Tom Hughes [Wed, 24 Apr 2013 18:17:38 +0000 (19:17 +0100)]
Improve functional tests for notes#index

11 years agoFix exception with GPX and RSS notes#index when no notes are found
Tom Hughes [Wed, 24 Apr 2013 18:17:13 +0000 (19:17 +0100)]
Fix exception with GPX and RSS notes#index when no notes are found

11 years agoWrap XML notes responses in an <osm> wrapper
Tom Hughes [Wed, 24 Apr 2013 17:18:20 +0000 (18:18 +0100)]
Wrap XML notes responses in an <osm> wrapper

11 years agoExplicitly set text/plain as the type for error responses
Tom Hughes [Wed, 24 Apr 2013 16:46:45 +0000 (17:46 +0100)]
Explicitly set text/plain as the type for error responses

11 years agoCall set_locale for all notes actions
Tom Hughes [Wed, 24 Apr 2013 09:51:37 +0000 (10:51 +0100)]
Call set_locale for all notes actions

11 years agoFix exeption in GeoRSS formatting for notes
Tom Hughes [Wed, 24 Apr 2013 09:20:35 +0000 (10:20 +0100)]
Fix exeption in GeoRSS formatting for notes

11 years agoFix exception with XML notes#index when no notes are found
Tom Hughes [Wed, 24 Apr 2013 08:41:08 +0000 (09:41 +0100)]
Fix exception with XML notes#index when no notes are found

11 years agoCorrect a couple of strings
Tom Hughes [Wed, 24 Apr 2013 08:20:01 +0000 (09:20 +0100)]
Correct a couple of strings

11 years agoAdd strings for the allow_write_notes permission
Tom Hughes [Wed, 24 Apr 2013 08:09:15 +0000 (09:09 +0100)]
Add strings for the allow_write_notes permission

11 years agoUpdate database structure
Tom Hughes [Tue, 23 Apr 2013 21:57:40 +0000 (22:57 +0100)]
Update database structure

11 years agoMerge branch 'notes'
Tom Hughes [Tue, 23 Apr 2013 21:40:21 +0000 (22:40 +0100)]
Merge branch 'notes'

Conflicts:
Vendorfile

11 years agoDon't display empty changeset comments
John Firebaugh [Mon, 22 Apr 2013 18:26:58 +0000 (11:26 -0700)]
Don't display empty changeset comments

See systemed/iD#1360. We will also change iD to omit empty comments.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 21 Apr 2013 12:37:45 +0000 (12:37 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoStop text overflowing the richtext preview pane
Tom Hughes [Wed, 17 Apr 2013 21:39:40 +0000 (22:39 +0100)]
Stop text overflowing the richtext preview pane

11 years agoAllowing wrapping inside the content of a richtext editor
Tom Hughes [Wed, 17 Apr 2013 21:36:19 +0000 (22:36 +0100)]
Allowing wrapping inside the content of a richtext editor

We disable wrapping on the container to keep the editor and the
help on the same line, but need to turn it back on again inside
the editor so that autogrow can work.

11 years agoUpdate jQuery Autogrow Textarea Plugin to v3.0
Tom Hughes [Wed, 17 Apr 2013 16:38:22 +0000 (17:38 +0100)]
Update jQuery Autogrow Textarea Plugin to v3.0

11 years agoMerge branch 'master' into notes
Tom Hughes [Tue, 16 Apr 2013 17:22:47 +0000 (18:22 +0100)]
Merge branch 'master' into notes

11 years agoDiary cleanup
Saman Bemel-Benrud [Sun, 17 Mar 2013 20:44:45 +0000 (20:44 +0000)]
Diary cleanup

This commit includes a few basic changes to make the user diaries
friendlier and easier to read. I adjusted the text styles and added
a maximum width, to keep the line length under control.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 14 Apr 2013 11:59:21 +0000 (11:59 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoMerge branch 'master' into notes
Tom Hughes [Mon, 8 Apr 2013 21:34:37 +0000 (22:34 +0100)]
Merge branch 'master' into notes

Conflicts:
Gemfile.lock
app/views/diary_entry/list.html.erb

11 years agoAdd a "Hide" button to notes when viewed by moderators
Tom Hughes [Mon, 8 Apr 2013 20:34:38 +0000 (21:34 +0100)]
Add a "Hide" button to notes when viewed by moderators

11 years agoReturn an updated copy of the note from the delete call
Tom Hughes [Mon, 8 Apr 2013 20:48:06 +0000 (21:48 +0100)]
Return an updated copy of the note from the delete call

11 years agoAllow a comment to be supplied when hiding a note
Tom Hughes [Mon, 8 Apr 2013 20:29:41 +0000 (21:29 +0100)]
Allow a comment to be supplied when hiding a note

11 years agoRestriction note deletion to moderators
Tom Hughes [Mon, 8 Apr 2013 20:21:31 +0000 (21:21 +0100)]
Restriction note deletion to moderators

11 years agoUpdate Potlatch 2 to 2.3-584-g996bb4d build
Tom Hughes [Mon, 8 Apr 2013 09:36:10 +0000 (10:36 +0100)]
Update Potlatch 2 to 2.3-584-g996bb4d build

11 years agoFix next/previous links on diary pages properly
Tom Hughes [Sun, 7 Apr 2013 22:09:19 +0000 (23:09 +0100)]
Fix next/previous links on diary pages properly

11 years agoCorrect next/previous links on diary list page
Tom Hughes [Sun, 7 Apr 2013 17:41:00 +0000 (18:41 +0100)]
Correct next/previous links on diary list page

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 7 Apr 2013 10:41:38 +0000 (10:41 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoAdded database, API and GPX status to capabilities.
Matt Amos [Mon, 1 Apr 2013 19:24:16 +0000 (20:24 +0100)]
Added database, API and GPX status to capabilities.