rails.git
7 years agoTidy up
Tom Hughes [Wed, 21 Nov 2012 22:53:10 +0000 (22:53 +0000)]
Tidy up

7 years agoUpdate the Layers control when layers are added or removed
Tom Hughes [Thu, 22 Nov 2012 12:27:12 +0000 (12:27 +0000)]
Update the Layers control when layers are added or removed

Submitted upstream as https://github.com/CloudMade/Leaflet/pull/1169.

7 years agoRemove hard coded assumption that layer zero is mapnik
Tom Hughes [Thu, 22 Nov 2012 09:48:03 +0000 (09:48 +0000)]
Remove hard coded assumption that layer zero is mapnik

7 years agoRemove unused image
Tom Hughes [Wed, 21 Nov 2012 22:52:53 +0000 (22:52 +0000)]
Remove unused image

7 years agoMake sure all leaflet images are loaded through the asse pipeline
Tom Hughes [Wed, 21 Nov 2012 19:01:09 +0000 (19:01 +0000)]
Make sure all leaflet images are loaded through the asse pipeline

7 years agoReplace OSM markers with recolured versions of the Leaflet marker
Tom Hughes [Tue, 20 Nov 2012 23:11:41 +0000 (23:11 +0000)]
Replace OSM markers with recolured versions of the Leaflet marker

7 years agoUse the OSM map marker icons on the home page
Tom Hughes [Tue, 20 Nov 2012 21:52:40 +0000 (21:52 +0000)]
Use the OSM map marker icons on the home page

7 years agoUse the OSM map marker icons when adding a new diary entry
Tom Hughes [Tue, 20 Nov 2012 21:48:50 +0000 (21:48 +0000)]
Use the OSM map marker icons when adding a new diary entry

7 years agoMake vendored asset definitions consistent
Tom Hughes [Tue, 20 Nov 2012 21:24:03 +0000 (21:24 +0000)]
Make vendored asset definitions consistent

7 years agoUpdate Leaflet
John Firebaugh [Sat, 10 Nov 2012 00:01:29 +0000 (16:01 -0800)]
Update Leaflet

7 years agoMove popup anchor definition to icon
John Firebaugh [Fri, 9 Nov 2012 23:57:31 +0000 (15:57 -0800)]
Move popup anchor definition to icon

7 years agoUse nicer markers
John Firebaugh [Fri, 9 Nov 2012 21:30:29 +0000 (13:30 -0800)]
Use nicer markers

7 years agoUpdate leaflet.locationfilter
John Firebaugh [Fri, 9 Nov 2012 21:13:56 +0000 (13:13 -0800)]
Update leaflet.locationfilter

7 years agoDon't zoom map when enabling location filter
John Firebaugh [Fri, 9 Nov 2012 20:58:47 +0000 (12:58 -0800)]
Don't zoom map when enabling location filter

7 years agoFix user popup styles
John Firebaugh [Fri, 9 Nov 2012 20:11:35 +0000 (12:11 -0800)]
Fix user popup styles

7 years agoFix user map icon and offset
John Firebaugh [Thu, 8 Nov 2012 21:41:21 +0000 (13:41 -0800)]
Fix user map icon and offset

7 years agoInline map.js marker functions
John Firebaugh [Thu, 8 Nov 2012 21:26:29 +0000 (13:26 -0800)]
Inline map.js marker functions

7 years agoUpdate leaflet.osm.js
John Firebaugh [Thu, 8 Nov 2012 20:40:32 +0000 (12:40 -0800)]
Update leaflet.osm.js

7 years agoUse leaflet css for print
John Firebaugh [Tue, 6 Nov 2012 03:36:48 +0000 (19:36 -0800)]
Use leaflet css for print

7 years agoUpdate some print styles for Leaflet
John Firebaugh [Mon, 5 Nov 2012 01:55:53 +0000 (17:55 -0800)]
Update some print styles for Leaflet

7 years agoFix L.Icon.Default.imagePath in production
John Firebaugh [Mon, 5 Nov 2012 01:48:20 +0000 (17:48 -0800)]
Fix L.Icon.Default.imagePath in production

7 years agoFix bbox params on browse area links
John Firebaugh [Sun, 4 Nov 2012 20:05:13 +0000 (13:05 -0700)]
Fix bbox params on browse area links

7 years agoMove non-vendor leaflet assets into app
John Firebaugh [Sun, 4 Nov 2012 20:04:34 +0000 (13:04 -0700)]
Move non-vendor leaflet assets into app

7 years agoRemove OL SimpleLayerSwitcher
John Firebaugh [Sat, 3 Nov 2012 13:53:28 +0000 (07:53 -0600)]
Remove OL SimpleLayerSwitcher

Consensus was to use the default Leaflet layer switcher
and rather than port SimpleLayerSwitcher to Leaflet.

7 years agoFix left pan button position in RTL
John Firebaugh [Sat, 3 Nov 2012 13:51:46 +0000 (07:51 -0600)]
Fix left pan button position in RTL

7 years agoFix zoom control positioning
John Firebaugh [Thu, 1 Nov 2012 15:53:46 +0000 (09:53 -0600)]
Fix zoom control positioning

7 years agoproperly positioned leaflet controls and removed old open layers style rules.
Saman Bemel-Benrud [Thu, 1 Nov 2012 15:05:20 +0000 (11:05 -0400)]
properly positioned leaflet controls and removed old open layers style rules.

7 years agoUpdate Leaflet
John Firebaugh [Thu, 1 Nov 2012 03:27:28 +0000 (21:27 -0600)]
Update Leaflet

7 years agoMatch pan/zoom control style better
John Firebaugh [Fri, 26 Oct 2012 19:31:18 +0000 (12:31 -0700)]
Match pan/zoom control style better

Thanks @ajashton

7 years agoUpdate leaflet.locationfilter
John Firebaugh [Sat, 20 Oct 2012 23:49:45 +0000 (16:49 -0700)]
Update leaflet.locationfilter

7 years agoBundle leaflet css in a single asset
John Firebaugh [Fri, 19 Oct 2012 22:53:06 +0000 (15:53 -0700)]
Bundle leaflet css in a single asset

7 years agoAdd Vendorfile
John Firebaugh [Fri, 19 Oct 2012 22:45:09 +0000 (15:45 -0700)]
Add Vendorfile

See https://github.com/grosser/vendorer

7 years agoPan/zoom controls that look like the OL ones
John Firebaugh [Fri, 19 Oct 2012 22:42:21 +0000 (15:42 -0700)]
Pan/zoom controls that look like the OL ones

7 years agoRestore maxFeatures check
John Firebaugh [Fri, 19 Oct 2012 17:57:45 +0000 (10:57 -0700)]
Restore maxFeatures check

7 years agoReplace leaflet.draw with leaflet-locationfilter
John Firebaugh [Fri, 19 Oct 2012 00:53:30 +0000 (17:53 -0700)]
Replace leaflet.draw with leaflet-locationfilter

7 years agoIE compatibility
John Firebaugh [Fri, 19 Oct 2012 00:46:19 +0000 (17:46 -0700)]
IE compatibility

7 years agoReduce flicker in data browser
John Firebaugh [Tue, 16 Oct 2012 00:23:11 +0000 (17:23 -0700)]
Reduce flicker in data browser

7 years agoPort embed.html to leaflet
John Firebaugh [Tue, 16 Oct 2012 00:17:11 +0000 (17:17 -0700)]
Port embed.html to leaflet

7 years agoUse L.OSM tile classes
John Firebaugh [Mon, 15 Oct 2012 23:52:53 +0000 (16:52 -0700)]
Use L.OSM tile classes

7 years agoUpdate leaflet-osm
John Firebaugh [Mon, 15 Oct 2012 23:47:44 +0000 (16:47 -0700)]
Update leaflet-osm

7 years agoUpdate Leaflet
John Firebaugh [Mon, 15 Oct 2012 23:23:31 +0000 (16:23 -0700)]
Update Leaflet

7 years agoCalculate scale in export
John Firebaugh [Fri, 12 Oct 2012 22:14:06 +0000 (15:14 -0700)]
Calculate scale in export

7 years agoRemove calls to map.setCenter
John Firebaugh [Fri, 12 Oct 2012 20:33:24 +0000 (13:33 -0700)]
Remove calls to map.setCenter

7 years agoDon't show map controls on browse pages
John Firebaugh [Fri, 12 Oct 2012 20:28:16 +0000 (13:28 -0700)]
Don't show map controls on browse pages

7 years agoUse baselayerchange event
John Firebaugh [Fri, 12 Oct 2012 20:18:28 +0000 (13:18 -0700)]
Use baselayerchange event

7 years agoUpdate Leaflet
John Firebaugh [Fri, 12 Oct 2012 20:17:37 +0000 (13:17 -0700)]
Update Leaflet

7 years agoPrecompile leaflet CSS
John Firebaugh [Fri, 12 Oct 2012 18:08:03 +0000 (11:08 -0700)]
Precompile leaflet CSS

7 years agoPort to Leaflet
John Firebaugh [Sat, 25 Aug 2012 17:55:46 +0000 (10:55 -0700)]
Port to Leaflet

7 years agoUse jQuery's toggle binding
John Firebaugh [Fri, 12 Oct 2012 00:27:35 +0000 (17:27 -0700)]
Use jQuery's toggle binding

The old code never unbound the existing binding, so they
piled up.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 7 Nov 2012 12:11:28 +0000 (12:11 +0000)]
Localisation updates from translatewiki.net.

7 years agoRework signup emails a bit
Tom Hughes [Mon, 5 Nov 2012 09:54:58 +0000 (09:54 +0000)]
Rework signup emails a bit

Remove "lego" strings and try and reduce duplication between the
text and HTML versions of the mails.

7 years agoSupport semicolon as parameter delimiter
John Firebaugh [Sun, 4 Nov 2012 21:53:31 +0000 (13:53 -0800)]
Support semicolon as parameter delimiter

http://lists.openstreetmap.org/pipermail/rails-dev/2012-November/001259.html

7 years agoAllow mass assignment of user preference keys and values
Tom Hughes [Sun, 4 Nov 2012 14:40:24 +0000 (14:40 +0000)]
Allow mass assignment of user preference keys and values

7 years agoUse binary mode for trace files
Tom Hughes [Sun, 4 Nov 2012 14:35:34 +0000 (14:35 +0000)]
Use binary mode for trace files

We don't want to try and do any enoding conversions (or indeed any
newline conversions) on uploaded trace files.

7 years agoTweak Potlatch maximisation a bit more
Tom Hughes [Thu, 1 Nov 2012 17:02:11 +0000 (17:02 +0000)]
Tweak Potlatch maximisation a bit more

7 years agoMake full screen mode in Potlatch work properly again
Tom Hughes [Thu, 1 Nov 2012 16:56:36 +0000 (16:56 +0000)]
Make full screen mode in Potlatch work properly again

7 years agoMake sure we always read the body of a PUT or POST request
Tom Hughes [Thu, 1 Nov 2012 12:45:37 +0000 (12:45 +0000)]
Make sure we always read the body of a PUT or POST request

Unfortunately if a PUT or POST request that has a body fails to
read it then Apache will sometimes fail to return the response it
is given to the client properly, instead erroring:

  https://issues.apache.org/bugzilla/show_bug.cgi?id=44782

To work round this we call rewind on the body for every request using
a filter, which forces it to be fetched from Apache into a file.

7 years agoRevert "Add a newline to the end of the body when reporting an error"
Tom Hughes [Thu, 1 Nov 2012 12:42:47 +0000 (12:42 +0000)]
Revert "Add a newline to the end of the body when reporting an error"

This reverts commit 59c97f4866652c025ec4f61cabcaaedd3124ab33.

7 years agoAdd a newline to the end of the body when reporting an error
Tom Hughes [Thu, 1 Nov 2012 09:13:43 +0000 (09:13 +0000)]
Add a newline to the end of the body when reporting an error

There seems to be some sort problem with ruby 1.9 where a response
body that is a single line with no newline causes the response not
to be sent properly.

7 years agoUse zip instead of SyncEnumerator in statistics script
Tom Hughes [Thu, 1 Nov 2012 00:35:31 +0000 (00:35 +0000)]
Use zip instead of SyncEnumerator in statistics script

7 years agoForce encoding in AMF controller
Tom Hughes [Wed, 31 Oct 2012 20:39:31 +0000 (20:39 +0000)]
Force encoding in AMF controller

Although the strings are UTF-8 we need to treat them as byte
strings for the purposes of encoding AMF responses.

7 years agoFix history sidebar for small screens
Saman Bemel-Benrud [Tue, 30 Oct 2012 23:00:49 +0000 (19:00 -0400)]
Fix history sidebar for small screens

7 years agoUse the asset pipeline to load the sprite
Tom Hughes [Tue, 30 Oct 2012 22:41:07 +0000 (22:41 +0000)]
Use the asset pipeline to load the sprite

7 years agoSimplify handling of verified emails in OpenID signup
Tom Hughes [Tue, 30 Oct 2012 18:53:58 +0000 (18:53 +0000)]
Simplify handling of verified emails in OpenID signup

Also make sure that all paths that lead to OpenID based signup
will notice a verified email properly.

7 years agoTrust Google and Yahoo to return valid email addresses
Kai Krueger [Sat, 13 Oct 2012 06:26:04 +0000 (00:26 -0600)]
Trust Google and Yahoo to return valid email addresses

Both Google and Yahoo guarantee that the email address they return
during the OpenID authentication are emails that they have already
verified:

  http://stackoverflow.com/q/5639419

Therefore special case these OpenID providers and automatically
activate the new users account without requiring a separate email
verification step.

This therefore reduces the signup procedure by one step and makes
it easier for new users of these OpenID providers, which cover the
majority of users.

7 years agoFix editor view
Saman Bemel-Benrud [Tue, 30 Oct 2012 16:10:48 +0000 (12:10 -0400)]
Fix editor view

7 years agoChange approach to layout in order to fix some weird CSS problems
Saman Bemel-Benrud [Wed, 24 Oct 2012 23:25:51 +0000 (19:25 -0400)]
Change approach to layout in order to fix some weird CSS problems

Move away from using an absolute positioned #content div as this was
causing some weird problems when users scrolled down, like not showing
bottom padding, and prematurely cutting off the left keyline.

Now, the content area uses relative positioning most of the time, and
fixed positioning when the full screen map is in place.

Using fixed positioning on the big map is nice because you can now scroll
down to see more sidebar content, but you won't end up with an ugly block
of white space under the map.

7 years agoMove OL control styling to OL theme
Tom Hughes [Mon, 29 Oct 2012 18:59:39 +0000 (18:59 +0000)]
Move OL control styling to OL theme

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 27 Oct 2012 13:37:36 +0000 (13:37 +0000)]
Localisation updates from translatewiki.net.

7 years agoFix RTL issues with the search and donate icons
Tom Hughes [Fri, 26 Oct 2012 20:51:26 +0000 (21:51 +0100)]
Fix RTL issues with the search and donate icons

7 years agoMake it easier to test alternative locales
Tom Hughes [Fri, 26 Oct 2012 20:41:03 +0000 (21:41 +0100)]
Make it easier to test alternative locales

Allow a locale=xx parameter in the URL to select the locale.

7 years agoMake it easier to test RTL layout
John Firebaugh [Fri, 26 Oct 2012 18:05:26 +0000 (11:05 -0700)]
Make it easier to test RTL layout

Instead of fiddling with settings so the site appears in Arabic
or Hebrew, you can add a dir=rtl param to the URL.

7 years agoMinor style overhaul to sidebar
Saman Bemel-Benrud [Wed, 24 Oct 2012 22:47:03 +0000 (18:47 -0400)]
Minor style overhaul to sidebar

A number of small usability improvements / fixes, including:

* Small inconsistencies in spacing fixed
* Links now visually differentiated from headings in the menu
* Search bar actually looks right (or at least not as broken) in IE7 now
* New heart on the donate button + larger click area on the donate button!

7 years agoRemoved incorrect margin between zoom in and zoom out controls
Saman Bemel-Benrud [Fri, 26 Oct 2012 18:27:39 +0000 (19:27 +0100)]
Removed incorrect margin between zoom in and zoom out controls

7 years agoAdd /user_blocks/ to robots.txt disallow
Grant [Wed, 24 Oct 2012 09:33:55 +0000 (11:33 +0200)]
Add /user_blocks/ to robots.txt disallow

Add Disallow: /user_blocks/ as the content is not suitable for indexing.

7 years agoImproved user icons
Saman Bemel-Benrud [Fri, 19 Oct 2012 21:17:53 +0000 (17:17 -0400)]
Improved user icons

7 years agoRevert "Add SoTM Scotland banner"
Grant Slater [Mon, 22 Oct 2012 20:02:27 +0000 (21:02 +0100)]
Revert "Add SoTM Scotland banner"

This reverts commit 749caaff73596e284c39ce7d0a840f8a0a50687d.

7 years agoUpdate bundle
Tom Hughes [Mon, 22 Oct 2012 18:08:16 +0000 (19:08 +0100)]
Update bundle

7 years agoAllow cross-origin requests to API
John Firebaugh [Sat, 20 Oct 2012 23:11:51 +0000 (16:11 -0700)]
Allow cross-origin requests to API

7 years agoAvoid unnecessary array allocations
John Firebaugh [Mon, 22 Oct 2012 03:31:29 +0000 (20:31 -0700)]
Avoid unnecessary array allocations

7 years agoUpdate Potlatch 2 to 2.3-509-g0221790 build
Tom Hughes [Sun, 21 Oct 2012 18:27:35 +0000 (19:27 +0100)]
Update Potlatch 2 to 2.3-509-g0221790 build

7 years agoPotlatch 2 localisation updates
Tom Hughes [Sun, 21 Oct 2012 18:26:27 +0000 (19:26 +0100)]
Potlatch 2 localisation updates

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 20 Oct 2012 16:19:22 +0000 (16:19 +0000)]
Localisation updates from translatewiki.net.

7 years agoUpdate Potlatch 2 to 2.3-502-g0247dab build
Tom Hughes [Thu, 18 Oct 2012 18:02:31 +0000 (19:02 +0100)]
Update Potlatch 2 to 2.3-502-g0247dab build

7 years agoAdd SoTM Scotland banner
Grant Slater [Thu, 18 Oct 2012 14:59:11 +0000 (15:59 +0100)]
Add SoTM Scotland banner

7 years agoUpdate database schema
Tom Hughes [Thu, 18 Oct 2012 17:58:42 +0000 (18:58 +0100)]
Update database schema

7 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

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

7 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

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

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

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

7 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

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

7 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

7 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

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

7 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

7 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

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