]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoImprove the user image selection UI
Tom Hughes [Wed, 17 Oct 2012 12:05:05 +0000 (13:05 +0100)]
Improve the user image selection UI

12 years agoImplemented Gravatar support
Paweł Paprota [Fri, 12 Oct 2012 05:35:19 +0000 (07:35 +0200)]
Implemented Gravatar support

12 years agoRecover properly from a failed notes load
Tom Hughes [Tue, 16 Oct 2012 12:09:52 +0000 (13:09 +0100)]
Recover properly from a failed notes load

Patch OpenLayers so that it doesn't consider an area as loaded if
the HTTP request fails, so that it will try and load the area when
you zoom back in again.

12 years agoDisable buttons while form submission is in progress
Tom Hughes [Tue, 16 Oct 2012 11:23:27 +0000 (12:23 +0100)]
Disable buttons while form submission is in progress

12 years agoUpdate list of filtered methods in notes controller
Tom Hughes [Tue, 16 Oct 2012 11:15:37 +0000 (12:15 +0100)]
Update list of filtered methods in notes controller

12 years agoMerge branch 'master' into notes
Tom Hughes [Mon, 15 Oct 2012 21:38:13 +0000 (22:38 +0100)]
Merge branch 'master' into notes

12 years agoReplace htmlize call by rich text to_html call
Tom Hughes [Mon, 15 Oct 2012 21:36:52 +0000 (22:36 +0100)]
Replace htmlize call by rich text to_html call

12 years agoReturn the body of a note comment as a rich text object
Tom Hughes [Mon, 15 Oct 2012 21:34:55 +0000 (22:34 +0100)]
Return the body of a note comment as a rich text object

12 years agoFix links to user notes
Tom Hughes [Mon, 15 Oct 2012 21:24:39 +0000 (22:24 +0100)]
Fix links to user notes

12 years agoUpdate Potlatch 2 to 2.3-500-g740307e build
Tom Hughes [Mon, 15 Oct 2012 18:28:30 +0000 (19:28 +0100)]
Update Potlatch 2 to 2.3-500-g740307e build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 15 Oct 2012 18:28:09 +0000 (19:28 +0100)]
Potlatch 2 localisation updates

12 years agoRemove SOTM US advert
Tom Hughes [Mon, 15 Oct 2012 18:15:10 +0000 (19:15 +0100)]
Remove SOTM US advert

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Oct 2012 11:10:25 +0000 (11:10 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoCorrect field name
Tom Hughes [Sun, 14 Oct 2012 15:27:21 +0000 (16:27 +0100)]
Correct field name

12 years agoFix up issues with notes in the data browser
Tom Hughes [Sun, 14 Oct 2012 14:58:40 +0000 (15:58 +0100)]
Fix up issues with notes in the data browser

12 years agoRemove unused stylesheet rules
Tom Hughes [Sun, 14 Oct 2012 14:43:48 +0000 (15:43 +0100)]
Remove unused stylesheet rules

12 years agoRemove unused translations
Tom Hughes [Sun, 14 Oct 2012 14:40:40 +0000 (15:40 +0100)]
Remove unused translations

12 years agoImprove styling of notes popups
Tom Hughes [Sun, 14 Oct 2012 14:39:44 +0000 (15:39 +0100)]
Improve styling of notes popups

12 years agoSet attributes on newly created notes
Tom Hughes [Sun, 14 Oct 2012 13:04:59 +0000 (14:04 +0100)]
Set attributes on newly created notes

12 years agoRefactor note add/update code
Tom Hughes [Sun, 14 Oct 2012 12:51:01 +0000 (13:51 +0100)]
Refactor note add/update code

12 years agoAllow commenting on, and closing of, notes from the web site
Tom Hughes [Sun, 14 Oct 2012 12:26:42 +0000 (13:26 +0100)]
Allow commenting on, and closing of, notes from the web site

12 years agoAllow an optional comment to be given when closing a note
Tom Hughes [Sun, 14 Oct 2012 11:32:55 +0000 (12:32 +0100)]
Allow an optional comment to be given when closing a note

12 years agoReturn a copy of the note data on creation and update
Tom Hughes [Sun, 14 Oct 2012 11:31:44 +0000 (12:31 +0100)]
Return a copy of the note data on creation and update

12 years agoGet note comment notification working again
Tom Hughes [Sun, 14 Oct 2012 10:56:00 +0000 (11:56 +0100)]
Get note comment notification working again

12 years agoInclude useful URLs in note responses
Tom Hughes [Sun, 14 Oct 2012 10:00:33 +0000 (11:00 +0100)]
Include useful URLs in note responses

12 years agoUse named routes in note RSS builder
Tom Hughes [Sun, 14 Oct 2012 09:59:51 +0000 (10:59 +0100)]
Use named routes in note RSS builder

12 years agoLocalise notes interface
Tom Hughes [Sun, 14 Oct 2012 09:06:41 +0000 (10:06 +0100)]
Localise notes interface

12 years agoUse EJS templates for notes
Tom Hughes [Sat, 13 Oct 2012 17:06:29 +0000 (18:06 +0100)]
Use EJS templates for notes

12 years agoRefactor notes code to work with recent site changes
Tom Hughes [Sat, 13 Oct 2012 16:16:07 +0000 (17:16 +0100)]
Refactor notes code to work with recent site changes

12 years agoMerge branch 'master' into notes
Tom Hughes [Sat, 13 Oct 2012 14:55:34 +0000 (15:55 +0100)]
Merge branch 'master' into notes

Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/site/index.html.erb

12 years agoUse ejs templates in browse JS
John Firebaugh [Thu, 11 Oct 2012 18:50:54 +0000 (11:50 -0700)]
Use ejs templates in browse JS

12 years agoUse proj/unproj consistently
John Firebaugh [Mon, 8 Oct 2012 05:29:58 +0000 (22:29 -0700)]
Use proj/unproj consistently

12 years agoMove browse-related JS to browse.js
John Firebaugh [Fri, 5 Oct 2012 23:13:46 +0000 (16:13 -0700)]
Move browse-related JS to browse.js

12 years agoMove export-related JS to export.js
John Firebaugh [Fri, 5 Oct 2012 23:11:54 +0000 (16:11 -0700)]
Move export-related JS to export.js

12 years agoUpdate database schema
Tom Hughes [Sat, 13 Oct 2012 10:48:57 +0000 (11:48 +0100)]
Update database schema

12 years agoDrop renaming of sequences
Tom Hughes [Sat, 13 Oct 2012 10:48:13 +0000 (11:48 +0100)]
Drop renaming of sequences

Rails seems to rename sequences automatically now when the
corresponding table is renamed, so we don't need to do it.

12 years agoFix require paths in migrations
Tom Hughes [Sat, 13 Oct 2012 10:33:16 +0000 (11:33 +0100)]
Fix require paths in migrations

12 years agoProvide example of correct attribution
Richard Fairhurst [Thu, 11 Oct 2012 10:30:57 +0000 (11:30 +0100)]
Provide example of correct attribution

12 years agoRemove Potlatch 1 from edit menu
Richard Fairhurst [Thu, 11 Oct 2012 10:16:24 +0000 (11:16 +0100)]
Remove Potlatch 1 from edit menu

12 years agoUpdate Potlatch 2 stylesheet and presets
Tom Hughes [Fri, 12 Oct 2012 19:58:08 +0000 (20:58 +0100)]
Update Potlatch 2 stylesheet and presets

12 years agoPotlatch 2 localisation updates
Tom Hughes [Fri, 12 Oct 2012 19:57:01 +0000 (20:57 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 7 Oct 2012 22:08:10 +0000 (22:08 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate Potlatch 2 to 2.3-491-gc7ccf78 build
Tom Hughes [Sun, 7 Oct 2012 15:08:13 +0000 (16:08 +0100)]
Update Potlatch 2 to 2.3-491-gc7ccf78 build

12 years agoDisplay a diary entry count on the user page
Paweł Paprota [Fri, 5 Oct 2012 17:54:58 +0000 (19:54 +0200)]
Display a diary entry count on the user page

12 years agoMatch wikipedia language prefixes case insensitively
Paweł Paprota [Fri, 5 Oct 2012 18:38:46 +0000 (20:38 +0200)]
Match wikipedia language prefixes case insensitively

Without this values like "PL:Article" are linked to the English Wikipedia.

12 years agoDon't remove language prefixes from wikipedia tags
Paweł Paprota [Fri, 5 Oct 2012 18:23:40 +0000 (20:23 +0200)]
Don't remove language prefixes from wikipedia tags

Removing the language prefix from the displayed value of a wikipedia
tag is confusing, so don't do it. Fixes trac #4135.

12 years agoSplit long line
Tom Hughes [Fri, 5 Oct 2012 23:13:54 +0000 (00:13 +0100)]
Split long line

12 years agoClean up diary_entry.js
John Firebaugh [Fri, 5 Oct 2012 19:03:26 +0000 (12:03 -0700)]
Clean up diary_entry.js

12 years agoMove diary entry JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 18:58:45 +0000 (11:58 -0700)]
Move diary entry JS to page-specific script file

12 years agoEliminate interpolation in diary entry JS
John Firebaugh [Fri, 5 Oct 2012 18:54:13 +0000 (11:54 -0700)]
Eliminate interpolation in diary entry JS

12 years agoUpdate Potlatch 2 to 2.3-486-g109b096 build
Tom Hughes [Fri, 5 Oct 2012 21:47:19 +0000 (22:47 +0100)]
Update Potlatch 2 to 2.3-486-g109b096 build

12 years agoSimplify further by using OSM.home
John Firebaugh [Fri, 5 Oct 2012 19:59:03 +0000 (12:59 -0700)]
Simplify further by using OSM.home

12 years agoRemove unused params code
John Firebaugh [Fri, 5 Oct 2012 19:40:46 +0000 (12:40 -0700)]
Remove unused params code

12 years agoRemove unnecessary call to closeMapPopup()
John Firebaugh [Fri, 5 Oct 2012 18:38:14 +0000 (11:38 -0700)]
Remove unnecessary call to closeMapPopup()

In the 'set_location' case no popups are ever opened.

12 years agoUse jQuery
John Firebaugh [Fri, 5 Oct 2012 17:29:20 +0000 (10:29 -0700)]
Use jQuery

12 years agoMove user JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 17:01:38 +0000 (10:01 -0700)]
Move user JS to page-specific script file

In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.

12 years agoRemove unnecessary delete statement
John Firebaugh [Fri, 5 Oct 2012 16:10:13 +0000 (09:10 -0700)]
Remove unnecessary delete statement

12 years agoDon't try and dereference an object that may not exist
Tom Hughes [Fri, 5 Oct 2012 17:01:02 +0000 (18:01 +0100)]
Don't try and dereference an object that may not exist

12 years agoRefactor updatelinks to avoid exceptions in updateLocation
Tom Hughes [Fri, 5 Oct 2012 15:02:26 +0000 (16:02 +0100)]
Refactor updatelinks to avoid exceptions in updateLocation

12 years agoRefactor mapParams to compose better with apiUrl
John Firebaugh [Fri, 5 Oct 2012 02:35:06 +0000 (19:35 -0700)]
Refactor mapParams to compose better with apiUrl

12 years agoExtract OSM.apiUrl
John Firebaugh [Fri, 5 Oct 2012 02:15:24 +0000 (19:15 -0700)]
Extract OSM.apiUrl

12 years agoMerge globals.js.erb and params.js
John Firebaugh [Fri, 5 Oct 2012 02:09:56 +0000 (19:09 -0700)]
Merge globals.js.erb and params.js

12 years agoRemove unused assign of @bbox which is no longer used
John Firebaugh [Fri, 5 Oct 2012 00:00:40 +0000 (17:00 -0700)]
Remove unused assign of @bbox which is no longer used

12 years agoMove remaining inline changeset JS to changeset.js
John Firebaugh [Thu, 4 Oct 2012 23:59:48 +0000 (16:59 -0700)]
Move remaining inline changeset JS to changeset.js

12 years agoMove changeset JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 00:32:14 +0000 (17:32 -0700)]
Move changeset JS to page-specific script file

12 years agoEliminate interpolation in changeset JS
John Firebaugh [Thu, 4 Oct 2012 23:52:45 +0000 (16:52 -0700)]
Eliminate interpolation in changeset JS

12 years agoRemove unused function
John Firebaugh [Thu, 4 Oct 2012 21:48:36 +0000 (14:48 -0700)]
Remove unused function

12 years agoAdd Polish translations to OpenLayers configuration.
Tom Hughes [Fri, 5 Oct 2012 07:55:18 +0000 (08:55 +0100)]
Add Polish translations to OpenLayers configuration.

12 years agoUpdate Potlatch 2 to 2.3-476-g1bce25a build
Tom Hughes [Thu, 4 Oct 2012 17:03:02 +0000 (18:03 +0100)]
Update Potlatch 2 to 2.3-476-g1bce25a build

12 years agoRestrict the embedded map to the declared extent
Tom Hughes [Thu, 4 Oct 2012 16:58:01 +0000 (17:58 +0100)]
Restrict the embedded map to the declared extent

12 years agoRemove redundant parameters from embedded map constructor
Tom Hughes [Thu, 4 Oct 2012 16:55:53 +0000 (17:55 +0100)]
Remove redundant parameters from embedded map constructor

12 years agoTidy up some CSS to match house style
Tom Hughes [Tue, 2 Oct 2012 18:40:53 +0000 (19:40 +0100)]
Tidy up some CSS to match house style

12 years agoFix cut and paste errors in inbox/outbox redesign
Tom Hughes [Tue, 2 Oct 2012 18:17:27 +0000 (19:17 +0100)]
Fix cut and paste errors in inbox/outbox redesign

12 years agoRedesign inbox
Tom MacWright [Thu, 9 Aug 2012 19:15:08 +0000 (15:15 -0400)]
Redesign inbox

Cuts down on buttons, grey, and bold clutter.

12 years agoPotlatch 2 localisation updates
Tom Hughes [Tue, 2 Oct 2012 17:40:44 +0000 (18:40 +0100)]
Potlatch 2 localisation updates

12 years agoRemove unnecessary $(window).load() callbacks
John Firebaugh [Tue, 2 Oct 2012 02:22:39 +0000 (19:22 -0700)]
Remove unnecessary $(window).load() callbacks

All this is already inside a $(document).ready() callback.

12 years agoAvoid a JS error on (e.g.) ?way=nnnnn
John Firebaugh [Tue, 2 Oct 2012 02:21:37 +0000 (19:21 -0700)]
Avoid a JS error on (e.g.) ?way=nnnnn

When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.

Registering the events earlier avoids the need to call
updateLocation manually at all.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 2 Oct 2012 13:13:29 +0000 (13:13 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoIncrease allowed time delta in message sending test
Tom Hughes [Sun, 30 Sep 2012 13:24:28 +0000 (14:24 +0100)]
Increase allowed time delta in message sending test

Only allowing one second can fail sometimes, because if the actual
time is close to rolling over to the next second then the message
time will be rounded down but Time.now may roll over to the next
second before we get to the assertion.

12 years agoRemove monkey patch for I18n which is no longer needed
Tom Hughes [Sun, 30 Sep 2012 13:07:41 +0000 (14:07 +0100)]
Remove monkey patch for I18n which is no longer needed

12 years agoRequire version 5.0.9 of composite_primary_keys
Tom Hughes [Sun, 30 Sep 2012 11:39:01 +0000 (12:39 +0100)]
Require version 5.0.9 of composite_primary_keys

12 years agoRemove @midnode assign
John Firebaugh [Sat, 29 Sep 2012 18:09:01 +0000 (11:09 -0700)]
Remove @midnode assign

It does not appear to be necessary and no other edit links
make use of it. SiteController#edit will calculate a precise
center coordinate.

12 years agoRemove unused event argument
John Firebaugh [Sat, 29 Sep 2012 21:59:36 +0000 (14:59 -0700)]
Remove unused event argument

12 years agoUse $(document).ready() to initialise browse JS
John Firebaugh [Sat, 29 Sep 2012 21:49:16 +0000 (14:49 -0700)]
Use $(document).ready() to initialise browse JS

12 years agoMove browse JS to page-specific script file
John Firebaugh [Sat, 29 Sep 2012 21:45:15 +0000 (14:45 -0700)]
Move browse JS to page-specific script file

12 years agoEliminate interpolation in browse map JS
John Firebaugh [Sat, 29 Sep 2012 21:01:13 +0000 (14:01 -0700)]
Eliminate interpolation in browse map JS

12 years agoClean up search JS
John Firebaugh [Sat, 29 Sep 2012 17:01:29 +0000 (10:01 -0700)]
Clean up search JS

Move it to index.js/edit.js and eliminate the global doSearch
function. Not enough code is shared to justify it.

12 years agoMove edit JS to page-specific script file
John Firebaugh [Sat, 29 Sep 2012 16:23:32 +0000 (09:23 -0700)]
Move edit JS to page-specific script file

12 years agoInline key partial used only on index
John Firebaugh [Sat, 29 Sep 2012 21:25:33 +0000 (14:25 -0700)]
Inline key partial used only on index

12 years agoRequire index-only JS in index.js
John Firebaugh [Sat, 29 Sep 2012 21:19:48 +0000 (14:19 -0700)]
Require index-only JS in index.js

12 years agoEliminate interpolation in edit JS
John Firebaugh [Sat, 29 Sep 2012 16:20:05 +0000 (09:20 -0700)]
Eliminate interpolation in edit JS

12 years agoUpdate Potlatch 2 to 2.3-468-ge4a2053 build
Tom Hughes [Sat, 29 Sep 2012 17:30:32 +0000 (18:30 +0100)]
Update Potlatch 2 to 2.3-468-ge4a2053 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sat, 29 Sep 2012 17:30:14 +0000 (18:30 +0100)]
Potlatch 2 localisation updates

12 years agoExtract home_link partial
John Firebaugh [Sat, 29 Sep 2012 16:10:09 +0000 (09:10 -0700)]
Extract home_link partial

12 years agoWrap index JS in a single $(document).ready()
John Firebaugh [Sat, 29 Sep 2012 15:51:00 +0000 (08:51 -0700)]
Wrap index JS in a single $(document).ready()

12 years agoMove index JS to page-specific script file
John Firebaugh [Sat, 29 Sep 2012 15:38:59 +0000 (08:38 -0700)]
Move index JS to page-specific script file

12 years agoEliminate interpolation in index JS
John Firebaugh [Sat, 29 Sep 2012 15:17:36 +0000 (08:17 -0700)]
Eliminate interpolation in index JS

12 years agoUpdate database schema
Tom Hughes [Sat, 29 Sep 2012 16:34:50 +0000 (17:34 +0100)]
Update database schema

12 years agoUse the jQuery data() function to access HTML 5 data attributes
John Firebaugh [Fri, 7 Sep 2012 23:21:01 +0000 (16:21 -0700)]
Use the jQuery data() function to access HTML 5 data attributes

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 24 Sep 2012 18:49:53 +0000 (18:49 +0000)]
Localisation updates from http://translatewiki.net.