]>
git.openstreetmap.org Git - rails.git/log
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
Tom Hughes [Mon, 8 Apr 2013 20:29:41 +0000 (21:29 +0100)]
Allow a comment to be supplied when hiding a note
Tom Hughes [Mon, 8 Apr 2013 20:21:31 +0000 (21:21 +0100)]
Restriction note deletion to moderators
Tom Hughes [Mon, 8 Apr 2013 09:36:10 +0000 (10:36 +0100)]
Update Potlatch 2 to
2.3-584-g996bb4d build
Tom Hughes [Sun, 7 Apr 2013 22:09:19 +0000 (23:09 +0100)]
Fix next/previous links on diary pages properly
Tom Hughes [Sun, 7 Apr 2013 17:41:00 +0000 (18:41 +0100)]
Correct next/previous links on diary list page
Siebrand Mazeland [Sun, 7 Apr 2013 10:41:38 +0000 (10:41 +0000)]
Localisation updates from http://translatewiki.net.
Matt Amos [Mon, 1 Apr 2013 19:24:16 +0000 (20:24 +0100)]
Added database, API and GPX status to capabilities.
Tom Hughes [Mon, 1 Apr 2013 13:40:52 +0000 (14:40 +0100)]
Update bundle
Siebrand Mazeland [Mon, 1 Apr 2013 13:16:33 +0000 (14:16 +0100)]
Localisation updates from http://translatewiki.net.
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
Siebrand Mazeland [Sat, 23 Mar 2013 13:36:34 +0000 (13:36 +0000)]
Localisation updates from http://translatewiki.net.
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
Tom Hughes [Thu, 28 Mar 2013 15:58:03 +0000 (15:58 +0000)]
Test that closing and deleting notes require authentication
Tom Hughes [Thu, 28 Mar 2013 15:12:53 +0000 (15:12 +0000)]
Focus on the text field when a note is opened
Tom Hughes [Thu, 28 Mar 2013 14:43:07 +0000 (14:43 +0000)]
Fix display of updates on newly loaded notes
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