]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Fri, 10 May 2013 21:38:45 +0000 (22:38 +0100)]
Beef up tests for trace#list to check tag restrictions
Tom Hughes [Fri, 10 May 2013 21:32:14 +0000 (22:32 +0100)]
Fix trace lists to correctly respect tag restrictions
Tom Hughes [Fri, 10 May 2013 20:41:19 +0000 (21:41 +0100)]
Improve tests for trace RSS feeds
Tom Hughes [Fri, 10 May 2013 20:35:00 +0000 (21:35 +0100)]
Hide deleted traces in the RSS feeds
John Firebaugh [Fri, 10 May 2013 00:08:20 +0000 (17:08 -0700)]
Update to iD 1.0.1
Tom Hughes [Fri, 10 May 2013 18:28:37 +0000 (19:28 +0100)]
Fix alignment issues with icons in browse pages
Martin Raifer [Fri, 10 May 2013 12:50:52 +0000 (14:50 +0200)]
Fix gap for iconless nodes in history view
Done by inlining icons via ::before and content: url(...) so that tag
combinations without an icon do not get any additional markup at all.
Tom Hughes [Fri, 10 May 2013 15:03:37 +0000 (16:03 +0100)]
Tidy up user preferences controller
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
Tom Hughes [Thu, 9 May 2013 23:50:24 +0000 (00:50 +0100)]
Fix a few user preferences bugs
Tom Hughes [Thu, 9 May 2013 23:50:10 +0000 (00:50 +0100)]
Improve functional tests for user preferences
Tom Hughes [Thu, 9 May 2013 21:39:12 +0000 (22:39 +0100)]
Remove unused friend controller and related test harness
Tom Hughes [Thu, 9 May 2013 21:37:44 +0000 (22:37 +0100)]
Improve export controller tests
Tom Hughes [Thu, 9 May 2013 14:05:01 +0000 (15:05 +0100)]
Fix invalid interpolation variables
Siebrand Mazeland [Thu, 9 May 2013 13:43:43 +0000 (13:43 +0000)]
Localisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 8 May 2013 21:41:33 +0000 (21:41 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Wed, 8 May 2013 21:28:41 +0000 (22:28 +0100)]
Improve locale selection for Potlatch 2 and iD
Tom Hughes [Wed, 8 May 2013 20:04:41 +0000 (21:04 +0100)]
Persist the state of the notes layer
Tom Hughes [Wed, 8 May 2013 18:21:19 +0000 (19:21 +0100)]
Fix a bug decoding certain lat/lon formats
Tom Hughes [Wed, 8 May 2013 18:20:42 +0000 (19:20 +0100)]
Tidy up geocoder tests and extend lat/lon detection tests
Tom Hughes [Tue, 7 May 2013 18:03:38 +0000 (19:03 +0100)]
Make a message pluralizable
Tom Hughes [Tue, 7 May 2013 17:59:12 +0000 (18:59 +0100)]
Fixed some "lego" messages in plain text emails
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
Tom Hughes [Tue, 7 May 2013 13:52:08 +0000 (14:52 +0100)]
Add a routing test for /id
Tom Hughes [Tue, 7 May 2013 13:50:31 +0000 (14:50 +0100)]
Rename the ugly "id_iframe" to just plain "id"
Tom Hughes [Tue, 7 May 2013 13:43:45 +0000 (14:43 +0100)]
Merge remote-tracking branch 'osmlab/id-editor-embed'
Tom Hughes [Tue, 7 May 2013 10:30:13 +0000 (11:30 +0100)]
Use CDATA for note descriptions in the RSS feed
Tom Hughes [Tue, 7 May 2013 10:23:40 +0000 (11:23 +0100)]
Fix double escaping of date markup in note feed
John Firebaugh [Mon, 6 May 2013 19:50:46 +0000 (12:50 -0700)]
Switch to stable branch
John Firebaugh [Mon, 6 May 2013 19:32:48 +0000 (12:32 -0700)]
Update to iD 1.0.0
Tom Hughes [Mon, 6 May 2013 10:09:17 +0000 (11:09 +0100)]
Replace some inline javascript with a UJS solution
Tom Hughes [Mon, 6 May 2013 09:47:49 +0000 (10:47 +0100)]
Style the "view details" link in search results
Dan Stowell [Sat, 4 May 2013 09:22:12 +0000 (10:22 +0100)]
Append "view details" link to Nominatim search results
Tom Hughes [Sun, 5 May 2013 16:28:57 +0000 (17:28 +0100)]
Show node coordinates in the right place
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.
Leo Koppelkamm [Sun, 5 May 2013 15:17:59 +0000 (17:17 +0200)]
Show icons in browse history views
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.
John Firebaugh [Fri, 3 May 2013 18:06:16 +0000 (11:06 -0700)]
Update iD, set locale
John Firebaugh [Sat, 27 Apr 2013 00:54:38 +0000 (17:54 -0700)]
Selecting relations is now supported
John Firebaugh [Mon, 22 Apr 2013 23:23:29 +0000 (16:23 -0700)]
Fix search result link behavior (systemed/iD#1329)
John Firebaugh [Fri, 19 Apr 2013 22:34:06 +0000 (15:34 -0700)]
Support maximize/minimize (systemed/iD#1327)
John Firebaugh [Fri, 19 Apr 2013 22:31:32 +0000 (15:31 -0700)]
Update iD
John Firebaugh [Fri, 19 Apr 2013 21:45:06 +0000 (14:45 -0700)]
Load search result locations in iD
John Firebaugh [Thu, 18 Apr 2013 22:40:07 +0000 (15:40 -0700)]
Fix search results display (systemed/iD#1328)
John Firebaugh [Thu, 18 Apr 2013 21:57:25 +0000 (14:57 -0700)]
Call updatelinks when map moves
Fixes systemed/iD#1330.
John Firebaugh [Thu, 18 Apr 2013 21:30:22 +0000 (14:30 -0700)]
Fix edit links on browse and changeset pages
John Firebaugh [Wed, 17 Apr 2013 23:36:09 +0000 (16:36 -0700)]
Update iD; clean up OAuth configuration
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.)
Tom Hughes [Wed, 1 May 2013 09:01:24 +0000 (10:01 +0100)]
Stop attribution control wrapping on layers with attribution text
Tom Hughes [Wed, 1 May 2013 08:26:05 +0000 (09:26 +0100)]
Make "add note" cope with base layer changes
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.
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
Tom Hughes [Mon, 29 Apr 2013 16:20:21 +0000 (17:20 +0100)]
Disable dragging of new notes once they are submitted
Tom Hughes [Mon, 29 Apr 2013 09:49:19 +0000 (10:49 +0100)]
Handle empty arguments when computing the OAuth base string
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.
Tom Hughes [Sun, 28 Apr 2013 17:37:37 +0000 (18:37 +0100)]
Remove unused CSS rule
Siebrand Mazeland [Sun, 28 Apr 2013 17:55:31 +0000 (17:55 +0000)]
Localisation updates from http://translatewiki.net.
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.
Tom Hughes [Sun, 28 Apr 2013 09:41:28 +0000 (10:41 +0100)]
Swap older and newer
Tom Hughes [Sun, 28 Apr 2013 09:39:56 +0000 (10:39 +0100)]
Update ohauth and switch to using the new headerGenerator method
Tom Hughes [Sun, 28 Apr 2013 09:36:53 +0000 (10:36 +0100)]
Add a mailmap file to normalise names/addresses
Yuki Shira [Sat, 27 Apr 2013 23:38:57 +0000 (08:38 +0900)]
Replace trace.trace_paging_nav.previous/next by older/newer
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.
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.
Tom Hughes [Sat, 27 Apr 2013 10:51:51 +0000 (11:51 +0100)]
Replace the title in the note popup with a permalink
Tom Hughes [Sat, 27 Apr 2013 10:31:02 +0000 (11:31 +0100)]
Reduce corner radius on all leaflet popups
Tom Hughes [Sat, 27 Apr 2013 10:23:58 +0000 (11:23 +0100)]
Increase whitespace between comments in the note popup
Tom Hughes [Sat, 27 Apr 2013 10:15:32 +0000 (11:15 +0100)]
Cancel any existing object load before starting a new one
Tom Hughes [Fri, 26 Apr 2013 18:35:20 +0000 (19:35 +0100)]
Remove the flatten_comment methd from the Note model
Tom Hughes [Fri, 26 Apr 2013 18:34:32 +0000 (19:34 +0100)]
Rework the generation of descriptions in the notes RSS feed
Tom Hughes [Thu, 25 Apr 2013 23:39:26 +0000 (00:39 +0100)]
Show OSM objects for Nominatim search results as map overlays
Tom Hughes [Thu, 25 Apr 2013 16:44:40 +0000 (17:44 +0100)]
Improve wrapping in the data browse on narrow windows
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().
Tom Hughes [Thu, 25 Apr 2013 16:27:01 +0000 (17:27 +0100)]
Use the correct longitude for links when browsing changesets
Tom Hughes [Wed, 24 Apr 2013 20:44:46 +0000 (21:44 +0100)]
Improve functional tests for notes#feed
Tom Hughes [Wed, 24 Apr 2013 20:38:20 +0000 (21:38 +0100)]
Improve functional tests for notes#show
Tom Hughes [Wed, 24 Apr 2013 19:26:14 +0000 (20:26 +0100)]
Adopt a consistent naming scheme fot notes functional tests
Tom Hughes [Wed, 24 Apr 2013 19:21:18 +0000 (20:21 +0100)]
Improve functional tests for notes#search
Tom Hughes [Wed, 24 Apr 2013 18:17:38 +0000 (19:17 +0100)]
Improve functional tests for notes#index
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
Tom Hughes [Wed, 24 Apr 2013 17:18:20 +0000 (18:18 +0100)]
Wrap XML notes responses in an <osm> wrapper
Tom Hughes [Wed, 24 Apr 2013 16:46:45 +0000 (17:46 +0100)]
Explicitly set text/plain as the type for error responses
Tom Hughes [Wed, 24 Apr 2013 09:51:37 +0000 (10:51 +0100)]
Call set_locale for all notes actions
Tom Hughes [Wed, 24 Apr 2013 09:20:35 +0000 (10:20 +0100)]
Fix exeption in GeoRSS formatting for notes
Tom Hughes [Wed, 24 Apr 2013 08:41:08 +0000 (09:41 +0100)]
Fix exception with XML notes#index when no notes are found
Tom Hughes [Wed, 24 Apr 2013 08:20:01 +0000 (09:20 +0100)]
Correct a couple of strings
Tom Hughes [Wed, 24 Apr 2013 08:09:15 +0000 (09:09 +0100)]
Add strings for the allow_write_notes permission
Tom Hughes [Tue, 23 Apr 2013 21:57:40 +0000 (22:57 +0100)]
Update database structure
Tom Hughes [Tue, 23 Apr 2013 21:40:21 +0000 (22:40 +0100)]
Merge branch 'notes'
Conflicts:
Vendorfile
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.
Siebrand Mazeland [Sun, 21 Apr 2013 12:37:45 +0000 (12:37 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Wed, 17 Apr 2013 21:39:40 +0000 (22:39 +0100)]
Stop text overflowing the richtext preview pane
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.
Tom Hughes [Wed, 17 Apr 2013 16:38:22 +0000 (17:38 +0100)]
Update jQuery Autogrow Textarea Plugin to v3.0
Tom Hughes [Tue, 16 Apr 2013 17:22:47 +0000 (18:22 +0100)]
Merge branch 'master' into notes
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.
Siebrand Mazeland [Sun, 14 Apr 2013 11:59:21 +0000 (11:59 +0000)]
Localisation updates from http://translatewiki.net.
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
Tom Hughes [Mon, 8 Apr 2013 20:34:38 +0000 (21:34 +0100)]
Add a "Hide" button to notes when viewed by moderators
Tom Hughes [Mon, 8 Apr 2013 20:48:06 +0000 (21:48 +0100)]
Return an updated copy of the note from the delete call