]>
git.openstreetmap.org Git - rails.git/log
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
Tom Hughes [Thu, 28 Mar 2013 11:11:51 +0000 (11:11 +0000)]
Tidy up javascript OAuth code
Tom Hughes [Thu, 28 Mar 2013 00:40:07 +0000 (00:40 +0000)]
Add missing padding at right hand end of greeting menu
Tom Hughes [Thu, 28 Mar 2013 00:36:07 +0000 (00:36 +0000)]
Merge branch 'master' into notes
Conflicts:
Gemfile.lock
Tom Hughes [Thu, 28 Mar 2013 00:34:23 +0000 (00:34 +0000)]
Use OAuth for notes API calls and require authentication to close
Tom Hughes [Wed, 27 Mar 2013 20:48:15 +0000 (20:48 +0000)]
Add javascript OAuth support
Tom Hughes [Mon, 25 Mar 2013 21:49:25 +0000 (21:49 +0000)]
Mark CORS responses as uncacheable
Tom Hughes [Mon, 25 Mar 2013 12:50:18 +0000 (12:50 +0000)]
Wait until after rails has initialise I18n to preload the resources
Tom Hughes [Mon, 25 Mar 2013 10:49:58 +0000 (10:49 +0000)]
Force translations to be preloaded during startup
Tom Hughes [Sun, 24 Mar 2013 00:28:33 +0000 (00:28 +0000)]
Use changeset and user caches in Changeset#download
Tom Hughes [Sat, 23 Mar 2013 18:38:49 +0000 (18:38 +0000)]
Avoid reading nodes twice in WayController#full
Tom Hughes [Sat, 23 Mar 2013 17:52:56 +0000 (17:52 +0000)]
Optimise database reads in DiaryEntry#list
Tom Hughes [Sat, 23 Mar 2013 17:35:10 +0000 (17:35 +0000)]
Improve selection logic in DiaryEntry#rss
Tom Hughes [Sat, 23 Mar 2013 16:27:33 +0000 (16:27 +0000)]
Reimplement User#is_friends_with? in a non-insane way
Tom Hughes [Sat, 23 Mar 2013 16:19:33 +0000 (16:19 +0000)]
Preload sender/recipient details for messages
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
Siebrand Mazeland [Mon, 18 Mar 2013 00:53:42 +0000 (00:53 +0000)]
Localisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 11 Mar 2013 04:56:47 +0000 (04:56 +0000)]
Localisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 4 Mar 2013 11:46:14 +0000 (11:46 +0000)]
Localisation updates from http://translatewiki.net.
Eric Theise [Sun, 3 Mar 2013 19:33:15 +0000 (19:33 +0000)]
Extend geocoder to support additional lat/lon formats
Tom Hughes [Mon, 25 Feb 2013 09:58:45 +0000 (09:58 +0000)]
Map Serbian locales to Potlatch 2 correctly
Tom Hughes [Sun, 24 Feb 2013 19:48:00 +0000 (19:48 +0000)]
Correct interpolation variables
Siebrand Mazeland [Sun, 24 Feb 2013 16:57:32 +0000 (16:57 +0000)]
Localisation updates from http://translatewiki.net.
Sarah Hoffmann [Sun, 17 Feb 2013 12:50:47 +0000 (13:50 +0100)]
Add description for mountain passes
Siebrand Mazeland [Sat, 16 Feb 2013 05:20:17 +0000 (05:20 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Tue, 12 Feb 2013 10:31:38 +0000 (10:31 +0000)]
Remove use of jQuery toggle() function
Tom Hughes [Tue, 12 Feb 2013 10:04:55 +0000 (10:04 +0000)]
Update "new note" messaging to provide more guidance
Tom Hughes [Tue, 12 Feb 2013 10:01:25 +0000 (10:01 +0000)]
Clear the note cache when the note layer is turned off
Tom Hughes [Mon, 11 Feb 2013 21:02:26 +0000 (21:02 +0000)]
Update to rails 3.2.12
Siebrand Mazeland [Sun, 10 Feb 2013 19:31:44 +0000 (19:31 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Fri, 8 Feb 2013 19:19:59 +0000 (19:19 +0000)]
Correctly report which OAuth signature algorithms are supported
Tom Hughes [Fri, 8 Feb 2013 19:18:36 +0000 (19:18 +0000)]
Update imagery definitions for Potlatch 2
Tom Hughes [Tue, 5 Feb 2013 21:54:03 +0000 (21:54 +0000)]
Reject attempts to create notes with no comment text
Tom Hughes [Tue, 5 Feb 2013 19:18:37 +0000 (19:18 +0000)]
Separate the links in the bottom right map corner better
Tom Hughes [Tue, 5 Feb 2013 19:03:28 +0000 (19:03 +0000)]
Merge branch 'master' into notes
Tom Hughes [Tue, 5 Feb 2013 19:03:13 +0000 (19:03 +0000)]
Stop newly added notes disappearing
Tom Hughes [Tue, 5 Feb 2013 18:56:59 +0000 (18:56 +0000)]
Change "Close" button to "Resolve" in notes popup
Tom Hughes [Tue, 5 Feb 2013 18:46:41 +0000 (18:46 +0000)]
Reject note comments with no text
Tom Hughes [Tue, 5 Feb 2013 18:08:42 +0000 (18:08 +0000)]
Make the API reject changes to closed notes
Tom Hughes [Tue, 5 Feb 2013 17:43:43 +0000 (17:43 +0000)]
Pass parameters to APIAlreadyDeletedError correctly
Tom Hughes [Tue, 5 Feb 2013 17:42:08 +0000 (17:42 +0000)]
Remove redundant return
Tom Hughes [Tue, 5 Feb 2013 17:32:44 +0000 (17:32 +0000)]
Avoid javascript warning
Tom Hughes [Tue, 5 Feb 2013 00:30:58 +0000 (00:30 +0000)]
Remove the "new note" marker when the user clicks somewhere else
Tom Hughes [Mon, 4 Feb 2013 09:10:34 +0000 (09:10 +0000)]
Expire special m- and c- reply addresses after a month
Tom Hughes [Sun, 3 Feb 2013 18:03:25 +0000 (18:03 +0000)]
Disable "Add Note" button when there is no text
Tom Hughes [Sun, 3 Feb 2013 17:58:37 +0000 (17:58 +0000)]
Enable the "add note" link after a new note is created
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
Tom Hughes [Sun, 3 Feb 2013 16:50:59 +0000 (16:50 +0000)]
Make titles in note popups link to the 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
Tom Hughes [Sun, 3 Feb 2013 16:18:06 +0000 (16:18 +0000)]
Disable the "add note" link while a note is being added
Tom Hughes [Sun, 3 Feb 2013 16:07:47 +0000 (16:07 +0000)]
Avoid making the map scroll when adding a new note
Tom Hughes [Sun, 3 Feb 2013 15:50:09 +0000 (15:50 +0000)]
Add a test for commenting on diary entries
Tom Hughes [Sun, 3 Feb 2013 14:35:02 +0000 (14:35 +0000)]
Add a test for diary entry creation
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.
Tom Hughes [Sun, 3 Feb 2013 12:52:51 +0000 (12:52 +0000)]
Ajaxify message deletion
Tom Hughes [Sun, 3 Feb 2013 12:29:18 +0000 (12:29 +0000)]
Remove unused messages
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
Tom Hughes [Sun, 3 Feb 2013 11:10:24 +0000 (11:10 +0000)]
Improve date display in user notes list
Tom Hughes [Sun, 3 Feb 2013 11:07:01 +0000 (11:07 +0000)]
Only show each note once is the user notes view
Tom Hughes [Sun, 3 Feb 2013 11:06:34 +0000 (11:06 +0000)]
Touch notes when new comments are added
Tom Hughes [Sat, 2 Feb 2013 17:48:56 +0000 (17:48 +0000)]
Make notes RSS feeds work
Tom Hughes [Sat, 2 Feb 2013 16:34:49 +0000 (16:34 +0000)]
Show anonymous user warning in data browser note view
Tom Hughes [Sat, 2 Feb 2013 16:18:35 +0000 (16:18 +0000)]
Add anonymous comment warning to note popup
Tom Hughes [Sat, 2 Feb 2013 14:29:45 +0000 (14:29 +0000)]
Improve styling of the per-user notes list view
Tom Hughes [Sat, 2 Feb 2013 13:04:27 +0000 (13:04 +0000)]
Improve display of anonymous note comments
Tom Hughes [Sat, 2 Feb 2013 12:21:53 +0000 (12:21 +0000)]
Tweak sizing of note popups
Tom Hughes [Sat, 2 Feb 2013 12:11:46 +0000 (12:11 +0000)]
Localise dates and times in notes popups
Tom Hughes [Sat, 2 Feb 2013 11:22:11 +0000 (11:22 +0000)]
Improve comment descriptions in note popups
Tom Hughes [Sat, 2 Feb 2013 11:00:46 +0000 (11:00 +0000)]
Merge branch 'master' into notes
Tom Hughes [Sat, 2 Feb 2013 10:58:32 +0000 (10:58 +0000)]
Update Potlatch 2 translations
Paweł Paprota [Fri, 1 Feb 2013 12:04:43 +0000 (13:04 +0100)]
Missing aerodrome symbol (referenced in browse.css.scss).
Tom Hughes [Wed, 30 Jan 2013 18:17:04 +0000 (18:17 +0000)]
Show the header block on slim layout pages
Siebrand Mazeland [Sun, 27 Jan 2013 19:47:32 +0000 (19:47 +0000)]
Localisation updates from http://translatewiki.net.
Saman Bemel-Benrud [Sat, 26 Jan 2013 00:53:15 +0000 (19:53 -0500)]
Allow non-square user images
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.
Tom Hughes [Thu, 24 Jan 2013 14:31:14 +0000 (14:31 +0000)]
Remove redundant CSS rule - table headings are already bold
Tom Hughes [Thu, 24 Jan 2013 14:29:27 +0000 (14:29 +0000)]
Compute size of rich text preview pane correctly
Tom Hughes [Thu, 24 Jan 2013 14:18:18 +0000 (14:18 +0000)]
Put some white space back to make things readable
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.
Saman Bemel-Benrud [Tue, 22 Jan 2013 16:23:47 +0000 (11:23 -0500)]
Fix overflow on login page on mobile
Saman Bemel-Benrud [Tue, 22 Jan 2013 16:09:23 +0000 (11:09 -0500)]
Fix mobile map and other minor mobile adjustments
Tom Hughes [Tue, 22 Jan 2013 15:16:55 +0000 (15:16 +0000)]
Remove asset pipeline overrides for unused images in embedded maps
Siebrand Mazeland [Tue, 22 Jan 2013 06:16:27 +0000 (06:16 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Mon, 21 Jan 2013 22:59:06 +0000 (22:59 +0000)]
Use U+25BC instead of U+25BE for the menu indicator
Tom Hughes [Mon, 21 Jan 2013 22:50:08 +0000 (22:50 +0000)]
Remove asset pipeline overrides for now unused images
Tom Hughes [Mon, 21 Jan 2013 21:42:44 +0000 (21:42 +0000)]
Correct vertical position of map controls in small screen layout
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.
Tom Hughes [Sat, 19 Jan 2013 11:29:12 +0000 (11:29 +0000)]
Make maximising work properly again in Potlatch
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
Tom Hughes [Fri, 18 Jan 2013 09:19:01 +0000 (09:19 +0000)]
Fix formating of way and relation redaction messages as well
Tom Hughes [Fri, 18 Jan 2013 00:37:44 +0000 (00:37 +0000)]
Improve testing of the trace list view
Tom Hughes [Thu, 17 Jan 2013 17:44:10 +0000 (17:44 +0000)]
Update to Leaflet 0.5
Tom Hughes [Thu, 17 Jan 2013 00:12:59 +0000 (00:12 +0000)]
Remove style rules that are no longer needed
Tom Hughes [Wed, 16 Jan 2013 23:28:08 +0000 (23:28 +0000)]
Mark hide rules as important
Tom Hughes [Wed, 16 Jan 2013 23:05:09 +0000 (23:05 +0000)]
Fix formatting of redaction messages on browse history pages
Tom Hughes [Wed, 16 Jan 2013 21:27:11 +0000 (21:27 +0000)]
Highlight the history tab correctly
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.
Tom Hughes [Wed, 16 Jan 2013 18:45:55 +0000 (18:45 +0000)]
Remove messages which have been copied from english
Tom Hughes [Wed, 16 Jan 2013 18:39:26 +0000 (18:39 +0000)]
Fixup test failure
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.