]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoExtract layer configuration to map.js
John Firebaugh [Thu, 30 Aug 2012 16:00:55 +0000 (09:00 -0700)]
Extract layer configuration to map.js

12 years agoAdd a banner for SOTM US
Martijn van Exel [Sat, 15 Sep 2012 02:29:48 +0000 (20:29 -0600)]
Add a banner for SOTM US

12 years agoFix interpolation errors
Tom Hughes [Sun, 16 Sep 2012 14:17:17 +0000 (15:17 +0100)]
Fix interpolation errors

12 years agoUpdate database schema
Tom Hughes [Fri, 14 Sep 2012 14:54:37 +0000 (15:54 +0100)]
Update database schema

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 16 Sep 2012 02:35:34 +0000 (02:35 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoRemove the "We are changing the license" flash on the login page
Gnonthgol [Fri, 14 Sep 2012 11:49:55 +0000 (13:49 +0200)]
Remove the "We are changing the license" flash on the login page

12 years agoPotlatch 2 imagery update
Tom Hughes [Thu, 13 Sep 2012 09:51:51 +0000 (10:51 +0100)]
Potlatch 2 imagery update

12 years agoFix interpolation issues in attribution text
Tom Hughes [Thu, 13 Sep 2012 08:56:26 +0000 (09:56 +0100)]
Fix interpolation issues in attribution text

12 years agoUpdate Potlatch 2 to 2.3-455-g0b5f2c0 build
Tom Hughes [Wed, 12 Sep 2012 15:25:14 +0000 (16:25 +0100)]
Update Potlatch 2 to 2.3-455-g0b5f2c0 build

12 years agoUse the HTML5 doctype and specify the character set explicitly
Grant Slater [Wed, 12 Sep 2012 11:44:25 +0000 (13:44 +0200)]
Use the HTML5 doctype and specify the character set explicitly

12 years agoFix incorrect heading in copyright page
Tom Hughes [Wed, 12 Sep 2012 13:02:39 +0000 (14:02 +0100)]
Fix incorrect heading in copyright page

12 years agoUpdate attribution on embedded maps
Tom Hughes [Wed, 12 Sep 2012 09:02:01 +0000 (10:02 +0100)]
Update attribution on embedded maps

12 years agoImprove attribution/license details on printouts
Tom Hughes [Wed, 12 Sep 2012 08:25:07 +0000 (09:25 +0100)]
Improve attribution/license details on printouts

12 years agoRemove some unused i18n resources
Tom Hughes [Wed, 12 Sep 2012 08:15:01 +0000 (09:15 +0100)]
Remove some unused i18n resources

12 years agoUpdate some license references to refer to ODbL
Tom Hughes [Wed, 12 Sep 2012 08:14:29 +0000 (09:14 +0100)]
Update some license references to refer to ODbL

12 years agoSwitch from CC BY-SA 2.0 to ODbL 1.0
Grant Slater [Wed, 12 Sep 2012 06:23:38 +0000 (08:23 +0200)]
Switch from CC BY-SA 2.0 to ODbL 1.0

Change of OSM license for after 12 September 2012 07:00 UTC.

12 years agoNew /copyright page for ODbL
Richard Fairhurst [Tue, 11 Sep 2012 10:12:42 +0000 (11:12 +0100)]
New /copyright page for ODbL

12 years agoAdd CC BY-SA 2.0 copyright/attribution/license attributes to <osm>
Grant Slater [Tue, 11 Sep 2012 16:58:23 +0000 (17:58 +0100)]
Add CC BY-SA 2.0 copyright/attribution/license attributes to <osm>

12 years agoPotlatch 2 imagery update
Tom Hughes [Sun, 9 Sep 2012 18:07:30 +0000 (19:07 +0100)]
Potlatch 2 imagery update

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sun, 9 Sep 2012 18:07:10 +0000 (19:07 +0100)]
Potlatch 2 localisation updates

12 years agoFix incorrect interpolation variables
Tom Hughes [Sat, 8 Sep 2012 14:19:38 +0000 (15:19 +0100)]
Fix incorrect interpolation variables

12 years agoRemove SOTM advert
Tom Hughes [Sat, 8 Sep 2012 13:32:27 +0000 (14:32 +0100)]
Remove SOTM advert

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 8 Sep 2012 11:56:40 +0000 (11:56 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoMove resize JS to application bundle
John Firebaugh [Thu, 6 Sep 2012 23:35:35 +0000 (16:35 -0700)]
Move resize JS to application bundle

12 years agoEliminate interpolation in resize JS
John Firebaugh [Thu, 6 Sep 2012 23:22:55 +0000 (16:22 -0700)]
Eliminate interpolation in resize JS

12 years agoTrigger map.updateSize() via a custom event
John Firebaugh [Fri, 7 Sep 2012 19:40:00 +0000 (12:40 -0700)]
Trigger map.updateSize() via a custom event

12 years agoMake active highlighting work properly again
Tom Hughes [Fri, 7 Sep 2012 08:40:05 +0000 (09:40 +0100)]
Make active highlighting work properly again

12 years agoUse a param to trigger export rather than a separate action
John Firebaugh [Fri, 7 Sep 2012 08:26:44 +0000 (09:26 +0100)]
Use a param to trigger export rather than a separate action

In site/_resize.html.erb and site/_search.html.erb, a
params[:action] conditional is used to include code that
should only run on the index action -- but it should be run
on the export action too. Cleanest fix is to eliminate that
action entirely.

12 years agoFloat the user image right in the global diary list
Tom Hughes [Thu, 6 Sep 2012 21:03:15 +0000 (22:03 +0100)]
Float the user image right in the global diary list

12 years agoRemove controller_action class from the content div
Tom Hughes [Thu, 6 Sep 2012 21:01:49 +0000 (22:01 +0100)]
Remove controller_action class from the content div

It's duplicated by the new controller-action class on the body
element, so just use that instead.

12 years agoUse named routes in the layout
Tom Hughes [Thu, 6 Sep 2012 20:49:02 +0000 (21:49 +0100)]
Use named routes in the layout

12 years agoUse the jQuery data() function to access HTML 5 data attributes
Tom Hughes [Thu, 6 Sep 2012 20:29:16 +0000 (21:29 +0100)]
Use the jQuery data() function to access HTML 5 data attributes

12 years agoMove rich text support code into a separate file
Tom Hughes [Thu, 6 Sep 2012 19:44:24 +0000 (20:44 +0100)]
Move rich text support code into a separate file

12 years agoRefactor view and css code around homepage links
Tom MacWright [Wed, 5 Sep 2012 22:34:34 +0000 (18:34 -0400)]
Refactor view and css code around homepage links

This adds a new class to the body which we can use to do more styling
in CSS rather than erb-embedded Ruby. The only visual change is that
there's now a subtle transition for homepage links becoming active.

12 years agoMove piwik code to a static JS asset
Tom Hughes [Wed, 5 Sep 2012 22:05:07 +0000 (23:05 +0100)]
Move piwik code to a static JS asset

12 years agoIssue piwik goal tracking calls correctly
Tom Hughes [Wed, 5 Sep 2012 20:10:23 +0000 (21:10 +0100)]
Issue piwik goal tracking calls correctly

12 years agoClear the openid URL when an account is deleted
Tom Hughes [Wed, 5 Sep 2012 14:33:01 +0000 (15:33 +0100)]
Clear the openid URL when an account is deleted

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 3 Sep 2012 08:02:29 +0000 (09:02 +0100)]
Potlatch 2 localisation updates

12 years agoUpdate Potlatch 2 to 2.3-446-gf5ffc13 build
Tom Hughes [Mon, 3 Sep 2012 08:01:38 +0000 (09:01 +0100)]
Update Potlatch 2 to 2.3-446-gf5ffc13 build

12 years agoFix incorrect interpolation variables
Tom Hughes [Mon, 3 Sep 2012 07:54:23 +0000 (08:54 +0100)]
Fix incorrect interpolation variables

12 years agoTest that replying to a message marks it as read
Tom Hughes [Mon, 3 Sep 2012 07:47:51 +0000 (08:47 +0100)]
Test that replying to a message marks it as read

12 years agoMark a message as read when a user replies via the web
Tom Hughes [Mon, 3 Sep 2012 07:40:17 +0000 (08:40 +0100)]
Mark a message as read when a user replies via the web

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