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

11 years agoUpdate bundle
Tom Hughes [Mon, 1 Apr 2013 13:40:52 +0000 (14:40 +0100)]
Update bundle

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 1 Apr 2013 13:16:33 +0000 (14:16 +0100)]
Localisation updates from http://translatewiki.net.

11 years agoMark CORS responses as uncacheable
Tom Hughes [Mon, 25 Mar 2013 21:49:25 +0000 (21:49 +0000)]
Mark CORS responses as uncacheable

11 years agoWait until after rails has initialise I18n to preload the resources
Tom Hughes [Mon, 25 Mar 2013 12:50:18 +0000 (12:50 +0000)]
Wait until after rails has initialise I18n to preload the resources

11 years agoForce translations to be preloaded during startup
Tom Hughes [Mon, 25 Mar 2013 10:49:58 +0000 (10:49 +0000)]
Force translations to be preloaded during startup

11 years agoUse changeset and user caches in Changeset#download
Tom Hughes [Sun, 24 Mar 2013 00:28:33 +0000 (00:28 +0000)]
Use changeset and user caches in Changeset#download

11 years agoAvoid reading nodes twice in WayController#full
Tom Hughes [Sat, 23 Mar 2013 18:38:49 +0000 (18:38 +0000)]
Avoid reading nodes twice in WayController#full

11 years agoOptimise database reads in DiaryEntry#list
Tom Hughes [Sat, 23 Mar 2013 17:52:56 +0000 (17:52 +0000)]
Optimise database reads in DiaryEntry#list

11 years agoImprove selection logic in DiaryEntry#rss
Tom Hughes [Sat, 23 Mar 2013 17:35:10 +0000 (17:35 +0000)]
Improve selection logic in DiaryEntry#rss

11 years agoReimplement User#is_friends_with? in a non-insane way
Tom Hughes [Sat, 23 Mar 2013 16:27:33 +0000 (16:27 +0000)]
Reimplement User#is_friends_with? in a non-insane way

11 years agoPreload sender/recipient details for messages
Tom Hughes [Sat, 23 Mar 2013 16:19:33 +0000 (16:19 +0000)]
Preload sender/recipient details for messages

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 23 Mar 2013 13:36:34 +0000 (13:36 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoAdd a new write_notes permission needed for OAuth access to notes
Tom Hughes [Thu, 28 Mar 2013 18:50:18 +0000 (18:50 +0000)]
Add a new write_notes permission needed for OAuth access to notes

11 years agoTest that closing and deleting notes require authentication
Tom Hughes [Thu, 28 Mar 2013 15:58:03 +0000 (15:58 +0000)]
Test that closing and deleting notes require authentication

11 years agoFocus on the text field when a note is opened
Tom Hughes [Thu, 28 Mar 2013 15:12:53 +0000 (15:12 +0000)]
Focus on the text field when a note is opened

11 years agoFix display of updates on newly loaded notes
Tom Hughes [Thu, 28 Mar 2013 14:43:07 +0000 (14:43 +0000)]
Fix display of updates on newly loaded notes

11 years agoDon't try and use OAuth if we don't have a token
Tom Hughes [Thu, 28 Mar 2013 14:29:38 +0000 (14:29 +0000)]
Don't try and use OAuth if we don't have a token

11 years agoTidy up javascript OAuth code
Tom Hughes [Thu, 28 Mar 2013 11:11:51 +0000 (11:11 +0000)]
Tidy up javascript OAuth code

11 years agoAdd missing padding at right hand end of greeting menu
Tom Hughes [Thu, 28 Mar 2013 00:40:07 +0000 (00:40 +0000)]
Add missing padding at right hand end of greeting menu

11 years agoMerge branch 'master' into notes
Tom Hughes [Thu, 28 Mar 2013 00:36:07 +0000 (00:36 +0000)]
Merge branch 'master' into notes

Conflicts:
Gemfile.lock

11 years agoUse OAuth for notes API calls and require authentication to close
Tom Hughes [Thu, 28 Mar 2013 00:34:23 +0000 (00:34 +0000)]
Use OAuth for notes API calls and require authentication to close

11 years agoAdd javascript OAuth support
Tom Hughes [Wed, 27 Mar 2013 20:48:15 +0000 (20:48 +0000)]
Add javascript OAuth support

11 years agoMark CORS responses as uncacheable
Tom Hughes [Mon, 25 Mar 2013 21:49:25 +0000 (21:49 +0000)]
Mark CORS responses as uncacheable

11 years agoWait until after rails has initialise I18n to preload the resources
Tom Hughes [Mon, 25 Mar 2013 12:50:18 +0000 (12:50 +0000)]
Wait until after rails has initialise I18n to preload the resources

11 years agoForce translations to be preloaded during startup
Tom Hughes [Mon, 25 Mar 2013 10:49:58 +0000 (10:49 +0000)]
Force translations to be preloaded during startup

11 years agoUse changeset and user caches in Changeset#download
Tom Hughes [Sun, 24 Mar 2013 00:28:33 +0000 (00:28 +0000)]
Use changeset and user caches in Changeset#download

11 years agoAvoid reading nodes twice in WayController#full
Tom Hughes [Sat, 23 Mar 2013 18:38:49 +0000 (18:38 +0000)]
Avoid reading nodes twice in WayController#full

11 years agoOptimise database reads in DiaryEntry#list
Tom Hughes [Sat, 23 Mar 2013 17:52:56 +0000 (17:52 +0000)]
Optimise database reads in DiaryEntry#list

11 years agoImprove selection logic in DiaryEntry#rss
Tom Hughes [Sat, 23 Mar 2013 17:35:10 +0000 (17:35 +0000)]
Improve selection logic in DiaryEntry#rss

11 years agoReimplement User#is_friends_with? in a non-insane way
Tom Hughes [Sat, 23 Mar 2013 16:27:33 +0000 (16:27 +0000)]
Reimplement User#is_friends_with? in a non-insane way

11 years agoPreload sender/recipient details for messages
Tom Hughes [Sat, 23 Mar 2013 16:19:33 +0000 (16:19 +0000)]
Preload sender/recipient details for messages

11 years agoLock iconv to version 0.1 as later ones need ruby 1.9
Tom Hughes [Wed, 20 Mar 2013 23:14:23 +0000 (23:14 +0000)]
Lock iconv to version 0.1 as later ones need ruby 1.9

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 18 Mar 2013 00:53:42 +0000 (00:53 +0000)]
Localisation updates from http://translatewiki.net.