]> git.openstreetmap.org Git - rails.git/log
rails.git
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.

12 years agoUpdate Potlatch 2 to 2.3-465-g19866a9 build
Tom Hughes [Mon, 24 Sep 2012 18:00:08 +0000 (19:00 +0100)]
Update Potlatch 2 to 2.3-465-g19866a9 build

12 years agoDon't report the PD flag in the user API call
Tom Hughes [Mon, 24 Sep 2012 17:43:30 +0000 (18:43 +0100)]
Don't report the PD flag in the user API call

12 years agoAdd some extra information to user API responses
Tom Hughes [Wed, 19 Sep 2012 18:27:13 +0000 (19:27 +0100)]
Add some extra information to user API responses

12 years agoAdd a /api/0.6/user/NNNN call to the API
Tom Hughes [Wed, 19 Sep 2012 17:59:49 +0000 (18:59 +0100)]
Add a /api/0.6/user/NNNN call to the API

12 years agoUpdate logo on missing tile image
Tom Hughes [Fri, 21 Sep 2012 23:37:24 +0000 (00:37 +0100)]
Update logo on missing tile image

12 years agoDon't expose lat/lon of private traces
John Firebaugh [Fri, 21 Sep 2012 22:20:15 +0000 (15:20 -0700)]
Don't expose lat/lon of private traces

12 years agoSupport the same edit params for Potlatch 1 and 2
John Firebaugh [Fri, 21 Sep 2012 22:16:56 +0000 (15:16 -0700)]
Support the same edit params for Potlatch 1 and 2

Trac ticket 4587

12 years agoAdded a test for trac ticket 4471, and fixed the issue.
Matt Amos [Thu, 20 Sep 2012 23:45:53 +0000 (00:45 +0100)]
Added a test for trac ticket 4471, and fixed the issue.

12 years agoMove the administrator details further down the user page
Tom Hughes [Thu, 20 Sep 2012 08:25:53 +0000 (09:25 +0100)]
Move the administrator details further down the user page

12 years agomoderate refactoring of the user page
Tom MacWright [Fri, 31 Aug 2012 15:46:26 +0000 (11:46 -0400)]
moderate refactoring of the user page

12 years agoSuppress any border on the logo
Tom Hughes [Wed, 19 Sep 2012 11:12:45 +0000 (12:12 +0100)]
Suppress any border on the logo

12 years agoRemove unused namefinder support from the geocoder backend
Tom Hughes [Tue, 18 Sep 2012 10:54:11 +0000 (11:54 +0100)]
Remove unused namefinder support from the geocoder backend

12 years agoMove param-based map configuration to client
John Firebaugh [Mon, 27 Aug 2012 00:01:39 +0000 (17:01 -0700)]
Move param-based map configuration to client

This prepares us for hash-based permalinks (#81) and removes
the duplication between index.html.erb and SiteController#edit.

12 years agoUse jquery.cookie
John Firebaugh [Tue, 18 Sep 2012 00:00:03 +0000 (17:00 -0700)]
Use jquery.cookie

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.