]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 1 Sep 2012 11:28:06 +0000 (11:28 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoMonkey patch I18n::JS to ensure translations are in a fixed order
Tom Hughes [Fri, 31 Aug 2012 10:51:58 +0000 (11:51 +0100)]
Monkey patch I18n::JS to ensure translations are in a fixed order

Without this the result of converting the hash to JSON can vary
which causes different hashes for the result JS asset.

This is only an issue with ruby 1.8 as ruby 1.9 hashes behave like
the ActiveSupport::OrderedHash and enumerate in insertion order.

12 years agoSelect which key entries to show on the client
Tom Hughes [Fri, 31 Aug 2012 09:29:32 +0000 (10:29 +0100)]
Select which key entries to show on the client

Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.

12 years agoUse CSS to centre the images in the key
Tom Hughes [Fri, 31 Aug 2012 09:27:45 +0000 (10:27 +0100)]
Use CSS to centre the images in the key

12 years agoRemove unused osmarender key data
Tom Hughes [Fri, 31 Aug 2012 09:03:31 +0000 (10:03 +0100)]
Remove unused osmarender key data

12 years agoRemove unused osmarender key data
Tom Hughes [Fri, 31 Aug 2012 08:30:44 +0000 (09:30 +0100)]
Remove unused osmarender key data

12 years agoMove key JS to application bundle
John Firebaugh [Thu, 30 Aug 2012 16:55:39 +0000 (09:55 -0700)]
Move key JS to application bundle

12 years agoEliminate interpolation in key JS
John Firebaugh [Thu, 30 Aug 2012 16:52:08 +0000 (09:52 -0700)]
Eliminate interpolation in key JS

12 years agoGet rid of the sidebar's onclose global state
Tom Hughes [Thu, 30 Aug 2012 22:02:54 +0000 (23:02 +0100)]
Get rid of the sidebar's onclose global state

12 years agoBasic javascript cleanup
Tom MacWright [Thu, 30 Aug 2012 16:17:17 +0000 (12:17 -0400)]
Basic javascript cleanup

Unifies some logic, cleans up style.

12 years agoMove sidebar JS to application bundle
John Firebaugh [Thu, 30 Aug 2012 16:20:20 +0000 (09:20 -0700)]
Move sidebar JS to application bundle

It's required on the main page so will nearly always be loaded anyway.

Enclosed in an anonymous function to avoid leaking the onclose global.

12 years agoUse custom events to resize the map on sidebar open/close
Tom Hughes [Thu, 30 Aug 2012 19:27:11 +0000 (20:27 +0100)]
Use custom events to resize the map on sidebar open/close

12 years agoRemove copy of Array.forEach that was committed accidentally
Tom Hughes [Thu, 30 Aug 2012 18:17:11 +0000 (19:17 +0100)]
Remove copy of Array.forEach that was committed accidentally

12 years agoFix maximisation of Potlatch
Tom Hughes [Wed, 29 Aug 2012 14:37:26 +0000 (15:37 +0100)]
Fix maximisation of Potlatch

12 years agoPrevent scrollbars showing up on the edit view
Tom Hughes [Wed, 29 Aug 2012 14:36:51 +0000 (15:36 +0100)]
Prevent scrollbars showing up on the edit view

12 years agoImprove handling of sidebar close link
Tom Hughes [Wed, 29 Aug 2012 13:08:18 +0000 (14:08 +0100)]
Improve handling of sidebar close link

12 years agoSet an explicit 0px border on the map
Tom Hughes [Wed, 29 Aug 2012 12:43:19 +0000 (13:43 +0100)]
Set an explicit 0px border on the map

The JS code which resizes the map relies on being able to parse
the border widths as a number, and by default IE7 seems to have
a border of "medium" which fails to parse.

12 years agoSwitch to the HTML5 DOCTYPE
Tom Hughes [Wed, 29 Aug 2012 08:01:32 +0000 (09:01 +0100)]
Switch to the HTML5 DOCTYPE

12 years agoUse augment.js for improved cross browser compatibility
Tom Hughes [Wed, 29 Aug 2012 11:29:47 +0000 (12:29 +0100)]
Use augment.js for improved cross browser compatibility

Remove the quick hack for that I added for Array.forEach and pull
in augment.js instead to add missing JS methods to older browsers.

12 years agoImplement Array.forEach for browsers which don't have it
Tom Hughes [Wed, 29 Aug 2012 08:29:51 +0000 (09:29 +0100)]
Implement Array.forEach for browsers which don't have it

12 years agoMove a chunk of non-markup ruby code from a view to the controller
Tom Hughes [Tue, 28 Aug 2012 19:39:18 +0000 (20:39 +0100)]
Move a chunk of non-markup ruby code from a view to the controller

12 years agoMove some javascript from the layout to application.js
Tom Hughes [Tue, 28 Aug 2012 18:47:20 +0000 (19:47 +0100)]
Move some javascript from the layout to application.js

12 years agoPotlatch 2 localisation updates
Tom Hughes [Tue, 28 Aug 2012 10:53:16 +0000 (11:53 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 28 Aug 2012 10:01:13 +0000 (10:01 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate the image size when we switch to the mapnik export format
Tom Hughes [Mon, 27 Aug 2012 21:54:04 +0000 (22:54 +0100)]
Update the image size when we switch to the mapnik export format

12 years agoUse start.html.erb views instead of _sidebar.html.erb partials
Tom Hughes [Mon, 27 Aug 2012 20:18:07 +0000 (21:18 +0100)]
Use start.html.erb views instead of _sidebar.html.erb partials

12 years agoAvoid polluting the global scope
John Firebaugh [Sun, 26 Aug 2012 23:36:05 +0000 (16:36 -0700)]
Avoid polluting the global scope

Only startBrowse and startExport need to be exposed;
everything else can be scoped inside those functions.

12 years agoUse a standard application.js bundle
John Firebaugh [Sun, 26 Aug 2012 02:41:18 +0000 (19:41 -0700)]
Use a standard application.js bundle

Include map.js and menu.js in the bundle.

12 years agoRemove unused helper
John Firebaugh [Sun, 26 Aug 2012 02:31:52 +0000 (19:31 -0700)]
Remove unused helper

12 years agoRemove unused gem and add a comment where it was replaced
John Firebaugh [Sun, 26 Aug 2012 02:30:51 +0000 (19:30 -0700)]
Remove unused gem and add a comment where it was replaced

12 years agoExtract browse.js static asset
John Firebaugh [Sun, 26 Aug 2012 02:27:10 +0000 (19:27 -0700)]
Extract browse.js static asset

12 years agoReduce interpolation in browse/start.js.erb
John Firebaugh [Sun, 26 Aug 2012 02:18:31 +0000 (19:18 -0700)]
Reduce interpolation in browse/start.js.erb

12 years agoExtract export.js static asset
John Firebaugh [Sun, 26 Aug 2012 01:40:37 +0000 (18:40 -0700)]
Extract export.js static asset

12 years agoReduce interpolation in export/start.js.erb
John Firebaugh [Sun, 26 Aug 2012 01:21:14 +0000 (18:21 -0700)]
Reduce interpolation in export/start.js.erb

12 years agoSwitch to using i18n-js for handling translations in javascript
Tom Hughes [Fri, 24 Feb 2012 23:21:09 +0000 (23:21 +0000)]
Switch to using i18n-js for handling translations in javascript

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 25 Aug 2012 21:24:42 +0000 (21:24 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoFloat user image to right correctly on per-user diary listing page
Alex Barth [Sat, 25 Aug 2012 03:16:19 +0000 (23:16 -0400)]
Float user image to right correctly on per-user diary listing page

12 years agoSet OpenLayers lang unobtrusively
John Firebaugh [Sat, 25 Aug 2012 02:00:59 +0000 (19:00 -0700)]
Set OpenLayers lang unobtrusively

We output the locale code as the lang attribute, so
use that rather than interpolating into embedded JS.

12 years agoUpdate Potlatch 2 to 2.3-443-g151b833 build
Tom Hughes [Wed, 22 Aug 2012 21:52:27 +0000 (22:52 +0100)]
Update Potlatch 2 to 2.3-443-g151b833 build

12 years agoRevise SOTM logo design
Tom MacWright [Tue, 21 Aug 2012 16:12:25 +0000 (12:12 -0400)]
Revise SOTM logo design

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 20 Aug 2012 20:29:56 +0000 (21:29 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 19 Aug 2012 16:18:23 +0000 (16:18 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoRework sidebar width calculation to work with jQuery 1.8
Tom Hughes [Sun, 19 Aug 2012 15:55:29 +0000 (16:55 +0100)]
Rework sidebar width calculation to work with jQuery 1.8

12 years agoUpdate tests for changes to HTML escaping in rails 3.2.8
Tom Hughes [Fri, 17 Aug 2012 21:57:58 +0000 (22:57 +0100)]
Update tests for changes to HTML escaping in rails 3.2.8

12 years agoUpdate rails to 3.2.8
Tom Hughes [Fri, 17 Aug 2012 21:40:52 +0000 (22:40 +0100)]
Update rails to 3.2.8

12 years agoTest the links in the menu of the user view page
Tom Hughes [Wed, 15 Aug 2012 21:09:36 +0000 (22:09 +0100)]
Test the links in the menu of the user view page

12 years agoAdd a missing </tr> tag
Tom Hughes [Wed, 15 Aug 2012 21:09:23 +0000 (22:09 +0100)]
Add a missing </tr> tag

12 years agoAdd tests for make_friend and remove_friend
Tom Hughes [Wed, 15 Aug 2012 20:41:29 +0000 (21:41 +0100)]
Add tests for make_friend and remove_friend

12 years agoFixup make_friend and remove_friend properly
Tom Hughes [Wed, 15 Aug 2012 18:48:06 +0000 (19:48 +0100)]
Fixup make_friend and remove_friend properly

Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.

12 years agoUpdate Potlatch 2 to 2.3-438-g86fce48 build
Tom Hughes [Wed, 15 Aug 2012 18:22:53 +0000 (19:22 +0100)]
Update Potlatch 2 to 2.3-438-g86fce48 build

12 years agoReposition the zoom slider after recreating the SimplePanZoom control
Tom Hughes [Wed, 15 Aug 2012 18:04:40 +0000 (19:04 +0100)]
Reposition the zoom slider after recreating the SimplePanZoom control

12 years agoFix regression - no link to view diary of other users
Tom MacWright [Tue, 14 Aug 2012 18:53:51 +0000 (14:53 -0400)]
Fix regression - no link to view diary of other users

12 years agoFix incorrect interpolation variables
Tom Hughes [Tue, 14 Aug 2012 21:56:28 +0000 (22:56 +0100)]
Fix incorrect interpolation variables

12 years agoRequire POST for make_friend and remove_friend
Tom Hughes [Tue, 14 Aug 2012 21:49:07 +0000 (22:49 +0100)]
Require POST for make_friend and remove_friend

Note that this breaks the make_friend link in friend notfication
emails, but it will do as a temporary measure.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 12 Aug 2012 18:25:26 +0000 (18:25 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoMove some helper functions to better homes
Tom Hughes [Sun, 12 Aug 2012 15:14:35 +0000 (16:14 +0100)]
Move some helper functions to better homes

12 years agoRemove empty helper files
Tom Hughes [Sun, 12 Aug 2012 15:14:00 +0000 (16:14 +0100)]
Remove empty helper files

12 years agoCorrect API URL shown in data browser sidebar
Tom Hughes [Sat, 11 Aug 2012 09:49:38 +0000 (10:49 +0100)]
Correct API URL shown in data browser sidebar

12 years agoPotlatch 2 localisation updates
Tom Hughes [Fri, 10 Aug 2012 11:28:16 +0000 (12:28 +0100)]
Potlatch 2 localisation updates

12 years agoUpdate Potlatch 2 to 2.3-430-g8cee913 build
Tom Hughes [Fri, 10 Aug 2012 11:27:53 +0000 (12:27 +0100)]
Update Potlatch 2 to 2.3-430-g8cee913 build

12 years agoUpdate schema
Tom Hughes [Fri, 10 Aug 2012 07:42:38 +0000 (08:42 +0100)]
Update schema

12 years agoFix incorrect interpolation variable
Tom Hughes [Fri, 10 Aug 2012 07:42:10 +0000 (08:42 +0100)]
Fix incorrect interpolation variable

12 years agoImprove blocks on/by links on user pages
Tom Hughes [Thu, 9 Aug 2012 09:48:34 +0000 (10:48 +0100)]
Improve blocks on/by links on user pages

All block related links are now only shown if the user has given
or received any blocks, and include a count of active blocks.

12 years agoFix test failure caused by moving OAuth settings link
Tom Hughes [Thu, 9 Aug 2012 20:56:04 +0000 (21:56 +0100)]
Fix test failure caused by moving OAuth settings link

12 years agoImprove user page navigation menu
Tom MacWright [Tue, 7 Aug 2012 18:35:17 +0000 (14:35 -0400)]
Improve user page navigation menu

Add counts to edits, blocks, and traces; don't show blocks if there
are none; and move OAuth to the settings page.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 9 Aug 2012 14:07:45 +0000 (14:07 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoPreserve background colour when marking messages read/unread
Tom Hughes [Wed, 8 Aug 2012 23:26:38 +0000 (00:26 +0100)]
Preserve background colour when marking messages read/unread

12 years agoAdd a SOTM advert to the sidebar
Tom Hughes [Wed, 8 Aug 2012 20:37:29 +0000 (21:37 +0100)]
Add a SOTM advert to the sidebar

12 years agoImprove presentation of homepage
Tom MacWright [Tue, 7 Aug 2012 23:16:52 +0000 (19:16 -0400)]
Improve presentation of homepage

Collapse search button into icon, deemphasize copy and remove
extraneous borders.

12 years agoHide the new layer switcher and zoom controls on printouts
Tom Hughes [Wed, 8 Aug 2012 17:08:29 +0000 (18:08 +0100)]
Hide the new layer switcher and zoom controls on printouts

12 years agoHide the SimplePanZoom control on the user page map
Tom Hughes [Wed, 8 Aug 2012 17:05:57 +0000 (18:05 +0100)]
Hide the SimplePanZoom control on the user page map

12 years agoUse SimplePanZoom control in changeset browser maps
Tom Hughes [Wed, 8 Aug 2012 17:00:42 +0000 (18:00 +0100)]
Use SimplePanZoom control in changeset browser maps

12 years agoEnable transition support for Firefox and Opera
Tom Hughes [Tue, 7 Aug 2012 23:37:07 +0000 (00:37 +0100)]
Enable transition support for Firefox and Opera

12 years agoReplace standard PanZoomBar control with new SimplePanZoom control
Tom MacWright [Tue, 7 Aug 2012 20:50:22 +0000 (16:50 -0400)]
Replace standard PanZoomBar control with new SimplePanZoom control

12 years agoMake things a bit more readable
Tom Hughes [Tue, 7 Aug 2012 21:57:13 +0000 (22:57 +0100)]
Make things a bit more readable

12 years agoImprove styling of inbox counter in greeting bar
Tom MacWright [Tue, 7 Aug 2012 17:03:36 +0000 (13:03 -0400)]
Improve styling of inbox counter in greeting bar

12 years agoUpdate precompile lists for changes to OpenLayers styles
Tom Hughes [Thu, 2 Aug 2012 21:28:55 +0000 (22:28 +0100)]
Update precompile lists for changes to OpenLayers styles

12 years agoBreak up the "copyright and license" text into smaller pieces
Tom Hughes [Thu, 2 Aug 2012 20:40:12 +0000 (21:40 +0100)]
Break up the "copyright and license" text into smaller pieces

12 years agoFix broken interpolation variables
Tom Hughes [Thu, 2 Aug 2012 18:39:48 +0000 (19:39 +0100)]
Fix broken interpolation variables

12 years agoPotlatch 2 localisation updates
Tom Hughes [Thu, 2 Aug 2012 18:31:02 +0000 (19:31 +0100)]
Potlatch 2 localisation updates

12 years agoUpdate Potlatch 2 to 2.3-425-g81ca535 build
Tom Hughes [Thu, 2 Aug 2012 18:29:15 +0000 (19:29 +0100)]
Update Potlatch 2 to 2.3-425-g81ca535 build

12 years agoUse a custom OpenLayers theme
Tom Hughes [Wed, 1 Aug 2012 20:40:40 +0000 (21:40 +0100)]
Use a custom OpenLayers theme

Instead of having a customised copy of the default theme in the
app assets, use a custom theme that pulls in the default one and
then overrides things as needed.

12 years agoStyle the CSS zoom control to match the layer switcher
Tom Hughes [Wed, 1 Aug 2012 11:05:47 +0000 (12:05 +0100)]
Style the CSS zoom control to match the layer switcher

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 2 Aug 2012 11:46:01 +0000 (11:46 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoImprove "no traces" message
Tom Hughes [Wed, 1 Aug 2012 09:56:19 +0000 (10:56 +0100)]
Improve "no traces" message

12 years agoAdd paragraph tags around "no edits" message
Tom Hughes [Wed, 1 Aug 2012 09:55:48 +0000 (10:55 +0100)]
Add paragraph tags around "no edits" message

12 years agoReplace raw with a translation with the html suffix
Steve Singer [Sun, 18 Mar 2012 19:31:07 +0000 (15:31 -0400)]
Replace raw with a translation with the html suffix

12 years agoDon't show the changeset container or map if there are no changesets
Steve Singer [Sun, 18 Mar 2012 19:28:42 +0000 (15:28 -0400)]
Don't show the changeset container or map if there are no changesets

12 years agoNavigation changes to the GPX traces page
Steve Singer [Sun, 22 Jul 2012 14:41:17 +0000 (10:41 -0400)]
Navigation changes to the GPX traces page

Display a better message when no traces are present and only
display the paging links when multiple pages exist.

12 years agoShow a helpful message when there are no changesets to display
Tristen Brown [Sat, 17 Mar 2012 21:08:36 +0000 (17:08 -0400)]
Show a helpful message when there are no changesets to display

12 years agoShow a helpful message when there are no traces to display
Tristen Brown [Sat, 17 Mar 2012 21:07:53 +0000 (17:07 -0400)]
Show a helpful message when there are no traces to display

12 years agoDon't try and fix the height of the search box
Tom Hughes [Mon, 30 Jul 2012 12:41:11 +0000 (13:41 +0100)]
Don't try and fix the height of the search box

We have no idea how much space a given browser will need for an input
field so stop pretending we do as we just get it wrong.

12 years agoMake links back to the user language copyright page work
Tom Hughes [Mon, 30 Jul 2012 12:35:25 +0000 (13:35 +0100)]
Make links back to the user language copyright page work

12 years agoUpdate Potlatch 2 imagery sources
Tom Hughes [Sun, 29 Jul 2012 21:24:55 +0000 (22:24 +0100)]
Update Potlatch 2 imagery sources

12 years agoShow the correct reconfirm link for OpenID login attempts
Tom Hughes [Fri, 27 Jul 2012 20:30:06 +0000 (21:30 +0100)]
Show the correct reconfirm link for OpenID login attempts

12 years agoOpenID attributes returned via AX seem to be arrays now
Tom Hughes [Fri, 27 Jul 2012 20:27:45 +0000 (21:27 +0100)]
OpenID attributes returned via AX seem to be arrays now

12 years agoReplace deprecated update_attribute method
Tom Hughes [Fri, 27 Jul 2012 11:24:44 +0000 (12:24 +0100)]
Replace deprecated update_attribute method

12 years agoUpdate to rails 3.2.7
Tom Hughes [Fri, 27 Jul 2012 11:15:55 +0000 (12:15 +0100)]
Update to rails 3.2.7

12 years agoUpdate Potlatch 2 to 2.3-419-gbf71353 build
Tom Hughes [Fri, 27 Jul 2012 11:13:10 +0000 (12:13 +0100)]
Update Potlatch 2 to 2.3-419-gbf71353 build

12 years agoClear pass_crypt_confirmation when encrypting a new password
Tom Hughes [Fri, 27 Jul 2012 10:39:11 +0000 (11:39 +0100)]
Clear pass_crypt_confirmation when encrypting a new password

If we change pass_crypt (by encrypting it) without clearing the
confirmation then the user record becomes invalid.