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

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 11 Mar 2013 04:56:47 +0000 (04:56 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 4 Mar 2013 11:46:14 +0000 (11:46 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoExtend geocoder to support additional lat/lon formats
Eric Theise [Sun, 3 Mar 2013 19:33:15 +0000 (19:33 +0000)]
Extend geocoder to support additional lat/lon formats

11 years agoMap Serbian locales to Potlatch 2 correctly
Tom Hughes [Mon, 25 Feb 2013 09:58:45 +0000 (09:58 +0000)]
Map Serbian locales to Potlatch 2 correctly

11 years agoCorrect interpolation variables
Tom Hughes [Sun, 24 Feb 2013 19:48:00 +0000 (19:48 +0000)]
Correct interpolation variables

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 24 Feb 2013 16:57:32 +0000 (16:57 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoAdd description for mountain passes
Sarah Hoffmann [Sun, 17 Feb 2013 12:50:47 +0000 (13:50 +0100)]
Add description for mountain passes

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 16 Feb 2013 05:20:17 +0000 (05:20 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoRemove use of jQuery toggle() function
Tom Hughes [Tue, 12 Feb 2013 10:31:38 +0000 (10:31 +0000)]
Remove use of jQuery toggle() function

11 years agoUpdate "new note" messaging to provide more guidance
Tom Hughes [Tue, 12 Feb 2013 10:04:55 +0000 (10:04 +0000)]
Update "new note" messaging to provide more guidance

11 years agoClear the note cache when the note layer is turned off
Tom Hughes [Tue, 12 Feb 2013 10:01:25 +0000 (10:01 +0000)]
Clear the note cache when the note layer is turned off

11 years agoUpdate to rails 3.2.12
Tom Hughes [Mon, 11 Feb 2013 21:02:26 +0000 (21:02 +0000)]
Update to rails 3.2.12

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 10 Feb 2013 19:31:44 +0000 (19:31 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoCorrectly report which OAuth signature algorithms are supported
Tom Hughes [Fri, 8 Feb 2013 19:19:59 +0000 (19:19 +0000)]
Correctly report which OAuth signature algorithms are supported

11 years agoUpdate imagery definitions for Potlatch 2
Tom Hughes [Fri, 8 Feb 2013 19:18:36 +0000 (19:18 +0000)]
Update imagery definitions for Potlatch 2

11 years agoReject attempts to create notes with no comment text
Tom Hughes [Tue, 5 Feb 2013 21:54:03 +0000 (21:54 +0000)]
Reject attempts to create notes with no comment text

11 years agoSeparate the links in the bottom right map corner better
Tom Hughes [Tue, 5 Feb 2013 19:18:37 +0000 (19:18 +0000)]
Separate the links in the bottom right map corner better

11 years agoMerge branch 'master' into notes
Tom Hughes [Tue, 5 Feb 2013 19:03:28 +0000 (19:03 +0000)]
Merge branch 'master' into notes

11 years agoStop newly added notes disappearing
Tom Hughes [Tue, 5 Feb 2013 19:03:13 +0000 (19:03 +0000)]
Stop newly added notes disappearing

11 years agoChange "Close" button to "Resolve" in notes popup
Tom Hughes [Tue, 5 Feb 2013 18:56:59 +0000 (18:56 +0000)]
Change "Close" button to "Resolve" in notes popup

11 years agoReject note comments with no text
Tom Hughes [Tue, 5 Feb 2013 18:46:41 +0000 (18:46 +0000)]
Reject note comments with no text

11 years agoMake the API reject changes to closed notes
Tom Hughes [Tue, 5 Feb 2013 18:08:42 +0000 (18:08 +0000)]
Make the API reject changes to closed notes

11 years agoPass parameters to APIAlreadyDeletedError correctly
Tom Hughes [Tue, 5 Feb 2013 17:43:43 +0000 (17:43 +0000)]
Pass parameters to APIAlreadyDeletedError correctly

11 years agoRemove redundant return
Tom Hughes [Tue, 5 Feb 2013 17:42:08 +0000 (17:42 +0000)]
Remove redundant return

11 years agoAvoid javascript warning
Tom Hughes [Tue, 5 Feb 2013 17:32:44 +0000 (17:32 +0000)]
Avoid javascript warning

11 years agoRemove the "new note" marker when the user clicks somewhere else
Tom Hughes [Tue, 5 Feb 2013 00:30:58 +0000 (00:30 +0000)]
Remove the "new note" marker when the user clicks somewhere else

11 years agoExpire special m- and c- reply addresses after a month
Tom Hughes [Mon, 4 Feb 2013 09:10:34 +0000 (09:10 +0000)]
Expire special m- and c- reply addresses after a month

11 years agoDisable "Add Note" button when there is no text
Tom Hughes [Sun, 3 Feb 2013 18:03:25 +0000 (18:03 +0000)]
Disable "Add Note" button when there is no text

11 years agoEnable the "add note" link after a new note is created
Tom Hughes [Sun, 3 Feb 2013 17:58:37 +0000 (17:58 +0000)]
Enable the "add note" link after a new note is created

11 years agoAdd link to show a note on the map to the note browser page
Tom Hughes [Sun, 3 Feb 2013 17:44:05 +0000 (17:44 +0000)]
Add link to show a note on the map to the note browser page

11 years agoMake titles in note popups link to the note
Tom Hughes [Sun, 3 Feb 2013 16:50:59 +0000 (16:50 +0000)]
Make titles in note popups link to the note

11 years agoAllow a note=N parameter in the URL to zoom to and open a note
Tom Hughes [Sun, 3 Feb 2013 16:47:30 +0000 (16:47 +0000)]
Allow a note=N parameter in the URL to zoom to and open a note

11 years agoDisable the "add note" link while a note is being added
Tom Hughes [Sun, 3 Feb 2013 16:18:06 +0000 (16:18 +0000)]
Disable the "add note" link while a note is being added

11 years agoAvoid making the map scroll when adding a new note
Tom Hughes [Sun, 3 Feb 2013 16:07:47 +0000 (16:07 +0000)]
Avoid making the map scroll when adding a new note

11 years agoAdd a test for commenting on diary entries
Tom Hughes [Sun, 3 Feb 2013 15:50:09 +0000 (15:50 +0000)]
Add a test for commenting on diary entries

11 years agoAdd a test for diary entry creation
Tom Hughes [Sun, 3 Feb 2013 14:35:02 +0000 (14:35 +0000)]
Add a test for diary entry creation

11 years agoMove the note popups up slightly
Tom Hughes [Sun, 3 Feb 2013 13:04:14 +0000 (13:04 +0000)]
Move the note popups up slightly

The default position makes it hard to grab the marker and move it
when adding a note, so move themm up a few pixels.

11 years agoAjaxify message deletion
Tom Hughes [Sun, 3 Feb 2013 12:52:51 +0000 (12:52 +0000)]
Ajaxify message deletion

11 years agoRemove unused messages
Tom Hughes [Sun, 3 Feb 2013 12:29:18 +0000 (12:29 +0000)]
Remove unused messages

11 years agoDrop secret_token as we don't use it and it confuses people
Tom Hughes [Sun, 3 Feb 2013 12:23:37 +0000 (12:23 +0000)]
Drop secret_token as we don't use it and it confuses people

11 years agoImprove date display in user notes list
Tom Hughes [Sun, 3 Feb 2013 11:10:24 +0000 (11:10 +0000)]
Improve date display in user notes list

11 years agoOnly show each note once is the user notes view
Tom Hughes [Sun, 3 Feb 2013 11:07:01 +0000 (11:07 +0000)]
Only show each note once is the user notes view

11 years agoTouch notes when new comments are added
Tom Hughes [Sun, 3 Feb 2013 11:06:34 +0000 (11:06 +0000)]
Touch notes when new comments are added

11 years agoMake notes RSS feeds work
Tom Hughes [Sat, 2 Feb 2013 17:48:56 +0000 (17:48 +0000)]
Make notes RSS feeds work

11 years agoShow anonymous user warning in data browser note view
Tom Hughes [Sat, 2 Feb 2013 16:34:49 +0000 (16:34 +0000)]
Show anonymous user warning in data browser note view

11 years agoAdd anonymous comment warning to note popup
Tom Hughes [Sat, 2 Feb 2013 16:18:35 +0000 (16:18 +0000)]
Add anonymous comment warning to note popup

11 years agoImprove styling of the per-user notes list view
Tom Hughes [Sat, 2 Feb 2013 14:29:45 +0000 (14:29 +0000)]
Improve styling of the per-user notes list view

11 years agoImprove display of anonymous note comments
Tom Hughes [Sat, 2 Feb 2013 13:04:27 +0000 (13:04 +0000)]
Improve display of anonymous note comments

11 years agoTweak sizing of note popups
Tom Hughes [Sat, 2 Feb 2013 12:21:53 +0000 (12:21 +0000)]
Tweak sizing of note popups

11 years agoLocalise dates and times in notes popups
Tom Hughes [Sat, 2 Feb 2013 12:11:46 +0000 (12:11 +0000)]
Localise dates and times in notes popups

11 years agoImprove comment descriptions in note popups
Tom Hughes [Sat, 2 Feb 2013 11:22:11 +0000 (11:22 +0000)]
Improve comment descriptions in note popups

11 years agoMerge branch 'master' into notes
Tom Hughes [Sat, 2 Feb 2013 11:00:46 +0000 (11:00 +0000)]
Merge branch 'master' into notes

11 years agoUpdate Potlatch 2 translations
Tom Hughes [Sat, 2 Feb 2013 10:58:32 +0000 (10:58 +0000)]
Update Potlatch 2 translations

11 years agoMissing aerodrome symbol (referenced in browse.css.scss).
Paweł Paprota [Fri, 1 Feb 2013 12:04:43 +0000 (13:04 +0100)]
Missing aerodrome symbol (referenced in browse.css.scss).

11 years agoShow the header block on slim layout pages
Tom Hughes [Wed, 30 Jan 2013 18:17:04 +0000 (18:17 +0000)]
Show the header block on slim layout pages

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 27 Jan 2013 19:47:32 +0000 (19:47 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoAllow non-square user images
Saman Bemel-Benrud [Sat, 26 Jan 2013 00:53:15 +0000 (19:53 -0500)]
Allow non-square user images

11 years agoFix lists in rich text to display properly
Tom Hughes [Thu, 24 Jan 2013 14:54:26 +0000 (14:54 +0000)]
Fix lists in rich text to display properly

Add a "richtext" class to anything which contains text rendered
by our rich text library, and move styles which were only being
applied to diary entries to apply to all rich text.

11 years agoRemove redundant CSS rule - table headings are already bold
Tom Hughes [Thu, 24 Jan 2013 14:31:14 +0000 (14:31 +0000)]
Remove redundant CSS rule - table headings are already bold

11 years agoCompute size of rich text preview pane correctly
Tom Hughes [Thu, 24 Jan 2013 14:29:27 +0000 (14:29 +0000)]
Compute size of rich text preview pane correctly

11 years agoPut some white space back to make things readable
Tom Hughes [Thu, 24 Jan 2013 14:18:18 +0000 (14:18 +0000)]
Put some white space back to make things readable

11 years agoWrap longitude values explicitly
Tom Hughes [Tue, 22 Jan 2013 22:29:50 +0000 (22:29 +0000)]
Wrap longitude values explicitly

Leaflet 0.5 no longer wraps longitude values, so we need to do it.

11 years agoFix overflow on login page on mobile
Saman Bemel-Benrud [Tue, 22 Jan 2013 16:23:47 +0000 (11:23 -0500)]
Fix overflow on login page on mobile

11 years agoFix mobile map and other minor mobile adjustments
Saman Bemel-Benrud [Tue, 22 Jan 2013 16:09:23 +0000 (11:09 -0500)]
Fix mobile map and other minor mobile adjustments

11 years agoRemove asset pipeline overrides for unused images in embedded maps
Tom Hughes [Tue, 22 Jan 2013 15:16:55 +0000 (15:16 +0000)]
Remove asset pipeline overrides for unused images in embedded maps

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 22 Jan 2013 06:16:27 +0000 (06:16 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUse U+25BC instead of U+25BE for the menu indicator
Tom Hughes [Mon, 21 Jan 2013 22:59:06 +0000 (22:59 +0000)]
Use U+25BC instead of U+25BE for the menu indicator

11 years agoRemove asset pipeline overrides for now unused images
Tom Hughes [Mon, 21 Jan 2013 22:50:08 +0000 (22:50 +0000)]
Remove asset pipeline overrides for now unused images

11 years agoCorrect vertical position of map controls in small screen layout
Tom Hughes [Mon, 21 Jan 2013 21:42:44 +0000 (21:42 +0000)]
Correct vertical position of map controls in small screen layout

11 years agoRename historic=ruins tag symbol to match the CSS rule in browse.css.
Paweł Paprota [Sun, 20 Jan 2013 12:11:07 +0000 (13:11 +0100)]
Rename historic=ruins tag symbol to match the CSS rule in browse.css.

11 years agoMake maximising work properly again in Potlatch
Tom Hughes [Sat, 19 Jan 2013 11:29:12 +0000 (11:29 +0000)]
Make maximising work properly again in Potlatch

11 years agoDetach the permalink from the DOM so only one copy is shown
Tom Hughes [Fri, 18 Jan 2013 13:50:37 +0000 (13:50 +0000)]
Detach the permalink from the DOM so only one copy is shown

11 years agoFix formating of way and relation redaction messages as well
Tom Hughes [Fri, 18 Jan 2013 09:19:01 +0000 (09:19 +0000)]
Fix formating of way and relation redaction messages as well

11 years agoImprove testing of the trace list view
Tom Hughes [Fri, 18 Jan 2013 00:37:44 +0000 (00:37 +0000)]
Improve testing of the trace list view

11 years agoUpdate to Leaflet 0.5
Tom Hughes [Thu, 17 Jan 2013 17:44:10 +0000 (17:44 +0000)]
Update to Leaflet 0.5

11 years agoRemove style rules that are no longer needed
Tom Hughes [Thu, 17 Jan 2013 00:12:59 +0000 (00:12 +0000)]
Remove style rules that are no longer needed

11 years agoMark hide rules as important
Tom Hughes [Wed, 16 Jan 2013 23:28:08 +0000 (23:28 +0000)]
Mark hide rules as important

11 years agoFix formatting of redaction messages on browse history pages
Tom Hughes [Wed, 16 Jan 2013 23:05:09 +0000 (23:05 +0000)]
Fix formatting of redaction messages on browse history pages

11 years agoHighlight the history tab correctly
Tom Hughes [Wed, 16 Jan 2013 21:27:11 +0000 (21:27 +0000)]
Highlight the history tab correctly

11 years agoCleanup followup
Saman Bemel-Benrud [Wed, 16 Jan 2013 18:43:25 +0000 (18:43 +0000)]
Cleanup followup

Tighter copy on node list for to decrease the chance of an ugly line
break (need better fix here so the line break is smoother). Just changed
also part of way %{related_ways} to part of way %{related_ways}. This
needs a better fix to make line breaks indent properly, but this should
at least help a little (issue #185).

Properly positioned 'nearby users' block on user page to be in the left
column (issue #184).

Removed deemphasized class from search results (issue #181) lighter
highlight yellow on changesets page.

11 years agoRemove messages which have been copied from english
Tom Hughes [Wed, 16 Jan 2013 18:45:55 +0000 (18:45 +0000)]
Remove messages which have been copied from english

11 years agoFixup test failure
Tom Hughes [Wed, 16 Jan 2013 18:39:26 +0000 (18:39 +0000)]
Fixup test failure

11 years agoMake user markers display correctly
Tom Hughes [Wed, 16 Jan 2013 18:27:56 +0000 (18:27 +0000)]
Make user markers display correctly

Instead of putting the data on a bogus <td> element that will be deleted
by the browser, put it on the <div> wrapper instead.

11 years agoAvoid wrapping an <li> in a <span>
Tom Hughes [Wed, 16 Jan 2013 18:13:52 +0000 (18:13 +0000)]
Avoid wrapping an <li> in a <span>

11 years agoDisplay trace descriptions properly
Tom Hughes [Wed, 16 Jan 2013 09:53:39 +0000 (09:53 +0000)]
Display trace descriptions properly

11 years agoFix notes page in data browser to match new site style
Tom Hughes [Tue, 15 Jan 2013 22:02:53 +0000 (22:02 +0000)]
Fix notes page in data browser to match new site style