]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoFix "Edit Area" remote control link
John Firebaugh [Sun, 25 Nov 2012 16:05:01 +0000 (12:05 -0400)]
Fix "Edit Area" remote control link

Fixes https://trac.openstreetmap.org/ticket/4699

12 years agoHide +/- signs, take three
Tom Hughes [Sat, 24 Nov 2012 14:13:58 +0000 (14:13 +0000)]
Hide +/- signs, take three

12 years agoSet the z-index on the top bar to keep it in front
Tom Hughes [Fri, 23 Nov 2012 19:38:55 +0000 (19:38 +0000)]
Set the z-index on the top bar to keep it in front

12 years agoRevert "Stop the map overlapping the top bar"
Tom Hughes [Fri, 23 Nov 2012 19:36:56 +0000 (19:36 +0000)]
Revert "Stop the map overlapping the top bar"

This reverts commit 2ef2d7c876168d6beb606b655470f48ffabc8841.

12 years agoFall back to the mapnik layer
Tom Hughes [Fri, 23 Nov 2012 19:00:51 +0000 (19:00 +0000)]
Fall back to the mapnik layer

If there are no known layers in the layers string, then fall back to
showing the standard mapnik layer.

12 years agoSet size and anchor position for embedded markers
Tom Hughes [Fri, 23 Nov 2012 17:57:47 +0000 (17:57 +0000)]
Set size and anchor position for embedded markers

12 years agoImprove hiding of text on zoom icons
Tom Hughes [Fri, 23 Nov 2012 15:26:00 +0000 (15:26 +0000)]
Improve hiding of text on zoom icons

12 years agoSet icon paths for markers on the embedded map
Tom Hughes [Fri, 23 Nov 2012 15:06:13 +0000 (15:06 +0000)]
Set icon paths for markers on the embedded map

12 years agoAdd missing units
Tom Hughes [Fri, 23 Nov 2012 15:00:04 +0000 (15:00 +0000)]
Add missing units

12 years agoStop active link boxes appearing on the zoom in/out icons
Tom Hughes [Fri, 23 Nov 2012 14:58:10 +0000 (14:58 +0000)]
Stop active link boxes appearing on the zoom in/out icons

12 years agoStop spurious +/- signs appearing in the zoom slider
Tom Hughes [Fri, 23 Nov 2012 14:57:54 +0000 (14:57 +0000)]
Stop spurious +/- signs appearing in the zoom slider

12 years agoRevert "Stop spurious +/- signs appearing in the zoom slider"
Tom Hughes [Fri, 23 Nov 2012 14:56:44 +0000 (14:56 +0000)]
Revert "Stop spurious +/- signs appearing in the zoom slider"

This reverts commit 5edb4bf4e5da9e7d48f8bc9f0d87fa6c95fca440.

12 years agoStop spurious +/- signs appearing in the zoom slider
Tom Hughes [Fri, 23 Nov 2012 14:50:39 +0000 (14:50 +0000)]
Stop spurious +/- signs appearing in the zoom slider

12 years agoUpdate the leaflet zoom slider plugin to fix IE8
Tom Hughes [Fri, 23 Nov 2012 13:12:51 +0000 (13:12 +0000)]
Update the leaflet zoom slider plugin to fix IE8

12 years agoStop the map overlapping the top bar
Tom Hughes [Fri, 23 Nov 2012 12:23:38 +0000 (12:23 +0000)]
Stop the map overlapping the top bar

12 years agoMerge branch 'leaflet'
Tom Hughes [Fri, 23 Nov 2012 10:41:45 +0000 (10:41 +0000)]
Merge branch 'leaflet'

12 years agoServe embedded maps through the assets pipeline
Tom Hughes [Fri, 23 Nov 2012 09:04:38 +0000 (09:04 +0000)]
Serve embedded maps through the assets pipeline

12 years agoMove map controls higher in the small screen view
Tom Hughes [Thu, 22 Nov 2012 13:03:49 +0000 (13:03 +0000)]
Move map controls higher in the small screen view

12 years agoUse the small zoom control in the small screen layout
Tom Hughes [Thu, 22 Nov 2012 12:54:37 +0000 (12:54 +0000)]
Use the small zoom control in the small screen layout

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

12 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.

12 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

12 years agoUpdate to CPK 5.0.10 and remove monkey patch
Tom Hughes [Thu, 22 Nov 2012 09:10:04 +0000 (09:10 +0000)]
Update to CPK 5.0.10 and remove monkey patch

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

12 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

12 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

12 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

12 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

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

12 years agoUpdate Potlatch 2 to 2.3-534-g63a3364 build
Tom Hughes [Tue, 20 Nov 2012 18:59:36 +0000 (18:59 +0000)]
Update Potlatch 2 to 2.3-534-g63a3364 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Tue, 20 Nov 2012 18:59:05 +0000 (18:59 +0000)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 20 Nov 2012 12:49:40 +0000 (12:49 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 20 Nov 2012 12:06:12 +0000 (12:06 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoRework RTL handling to keep rules together
Tom Hughes [Fri, 16 Nov 2012 16:12:14 +0000 (16:12 +0000)]
Rework RTL handling to keep rules together

12 years agoFix rendering of PanZoom control in RTL mode
Tom Hughes [Sun, 18 Nov 2012 19:20:53 +0000 (19:20 +0000)]
Fix rendering of PanZoom control in RTL mode

12 years agoConfigure CORS to allow GET and POST to /oauth
Tom Hughes [Fri, 16 Nov 2012 22:28:52 +0000 (22:28 +0000)]
Configure CORS to allow GET and POST to /oauth

12 years agoAlways use the canonical host name in diary RSS feeds
Tom Hughes [Fri, 16 Nov 2012 17:03:48 +0000 (17:03 +0000)]
Always use the canonical host name in diary RSS feeds

12 years agoDon't use hard coded value in "one" pluralization rule
Tom Hughes [Thu, 15 Nov 2012 15:22:56 +0000 (15:22 +0000)]
Don't use hard coded value in "one" pluralization rule

French uses the "one" rule for zero as well as one (if there is no
explicit zero rule) so make sure we use %{count} there.

Also made the same change to English, and added an explcit zero rul.

12 years agoUpdated Potlatch 2 to 2.3-529-g5446b49 build
Tom Hughes [Tue, 13 Nov 2012 15:32:16 +0000 (15:32 +0000)]
Updated Potlatch 2 to 2.3-529-g5446b49 build

12 years agoOnly call force_encoding on ruby 1.9
Tom Hughes [Mon, 12 Nov 2012 20:19:07 +0000 (20:19 +0000)]
Only call force_encoding on ruby 1.9

12 years agoFix bogus test
Tom Hughes [Mon, 12 Nov 2012 19:27:09 +0000 (19:27 +0000)]
Fix bogus test

12 years agoMonkey patch field_changed? support until CPK is updated
Tom Hughes [Mon, 12 Nov 2012 19:14:31 +0000 (19:14 +0000)]
Monkey patch field_changed? support until CPK is updated

12 years agoUpdate to rails 3.2.9
Tom Hughes [Mon, 12 Nov 2012 19:13:54 +0000 (19:13 +0000)]
Update to rails 3.2.9

12 years agoFixing typo and outdated information
Eric Theise [Sun, 11 Nov 2012 04:59:12 +0000 (21:59 -0700)]
Fixing typo and outdated information

12 years agoUse counter caches to improve spam scoring
Tom Hughes [Mon, 12 Nov 2012 09:39:44 +0000 (09:39 +0000)]
Use counter caches to improve spam scoring

Now that we have the counter caches we can take all edits and traces
into account without incurring the cost of having to scan the database
to count them all.

12 years agoFix interpolation variables
Tom Hughes [Sat, 10 Nov 2012 19:52:30 +0000 (19:52 +0000)]
Fix interpolation variables

12 years agoUpdate Potlatch 2 to 2.3-515-gd4558d1 build
Tom Hughes [Sat, 10 Nov 2012 19:43:54 +0000 (19:43 +0000)]
Update Potlatch 2 to 2.3-515-gd4558d1 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sat, 10 Nov 2012 19:43:18 +0000 (19:43 +0000)]
Potlatch 2 localisation updates

12 years agoFixing two typos
Eric Theise [Sat, 10 Nov 2012 19:17:34 +0000 (12:17 -0700)]
Fixing two typos

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

12 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

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

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

12 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

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

12 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

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

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

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

12 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

12 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

12 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

12 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

12 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.

12 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

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

12 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.

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

12 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

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

12 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

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

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

12 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

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

12 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

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

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

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

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

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

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

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

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

12 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

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

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

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

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

12 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.

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

12 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.

12 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

12 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

12 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.

12 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

12 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

12 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.

12 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.

12 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.

12 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