]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoConvert author_ip to a proper INET field
Tom Hughes [Mon, 3 Dec 2012 13:00:52 +0000 (13:00 +0000)]
Convert author_ip to a proper INET field

11 years agoDisplay formatted notes in the web UI
Tom Hughes [Sun, 2 Dec 2012 17:06:59 +0000 (17:06 +0000)]
Display formatted notes in the web UI

11 years agoReturn note comments as formatted HTML as well as text
Tom Hughes [Sun, 2 Dec 2012 17:00:33 +0000 (17:00 +0000)]
Return note comments as formatted HTML as well as text

11 years agoFormat note comments correctly in the data browser
Tom Hughes [Sun, 2 Dec 2012 16:46:33 +0000 (16:46 +0000)]
Format note comments correctly in the data browser

11 years agoLink user names to their pages
Tom Hughes [Sun, 2 Dec 2012 16:39:20 +0000 (16:39 +0000)]
Link user names to their pages

11 years agoInclude a user URL in JSON and XML responses
Tom Hughes [Sun, 2 Dec 2012 16:38:59 +0000 (16:38 +0000)]
Include a user URL in JSON and XML responses

11 years agoRemove the author_name field from notes
Tom Hughes [Sun, 2 Dec 2012 16:29:00 +0000 (16:29 +0000)]
Remove the author_name field from notes

11 years agoAbort any existing load before starting a new one
Tom Hughes [Sun, 2 Dec 2012 15:04:19 +0000 (15:04 +0000)]
Abort any existing load before starting a new one

11 years agoPolice the MAX_NOTE_REQUEST_AREA limit on the client
Tom Hughes [Sun, 2 Dec 2012 14:55:56 +0000 (14:55 +0000)]
Police the MAX_NOTE_REQUEST_AREA limit on the client

11 years agoMake sure popups don't overlay controls or the top bar
Tom Hughes [Sun, 2 Dec 2012 13:32:16 +0000 (13:32 +0000)]
Make sure popups don't overlay controls or the top bar

11 years agoAdd a scrollbar when a note gets too big
Tom Hughes [Sun, 2 Dec 2012 12:51:58 +0000 (12:51 +0000)]
Add a scrollbar when a note gets too big

11 years agoRework notes UI using leaflet
Tom Hughes [Sat, 1 Dec 2012 17:46:26 +0000 (17:46 +0000)]
Rework notes UI using leaflet

11 years agoMerge branch 'master' into notes
Tom Hughes [Sat, 1 Dec 2012 18:22:30 +0000 (18:22 +0000)]
Merge branch 'master' into notes

Conflicts:
app/assets/javascripts/browse.js
app/assets/javascripts/map.js.erb
app/assets/stylesheets/common.css.scss
app/views/site/index.html.erb

11 years agoMove caching of reverse geocodes to describe_location
Tom Hughes [Wed, 28 Nov 2012 22:44:03 +0000 (22:44 +0000)]
Move caching of reverse geocodes to describe_location

11 years agoRemove nearby_place from the note model
Kai Krueger [Tue, 20 Nov 2012 23:10:07 +0000 (16:10 -0700)]
Remove nearby_place from the note model

Instead of storing the auto-generated meta information nearby_place
in the database, just look up the information on the fly when needed
and cache it for performance.

11 years agoRevert "Use Redcarpet::Render::XHTML instead of our custom renderer"
Tom Hughes [Thu, 29 Nov 2012 22:22:22 +0000 (22:22 +0000)]
Revert "Use Redcarpet::Render::XHTML instead of our custom renderer"

This reverts commit 4bb95b37735fac25467af21418cc0a973497219c.

11 years agoDon't try and compile the (non-existent) openlayers theme
Tom Hughes [Thu, 29 Nov 2012 21:29:40 +0000 (21:29 +0000)]
Don't try and compile the (non-existent) openlayers theme

11 years agoUse Redcarpet::Render::XHTML instead of our custom renderer
Tom Hughes [Thu, 29 Nov 2012 18:59:43 +0000 (18:59 +0000)]
Use Redcarpet::Render::XHTML instead of our custom renderer

Now that my :link_attributes patch has been merged we don't need
the custom renderer to add the rel=nofollow attributes.

11 years agoAvoid multiple click bindings on data layer
John Firebaugh [Thu, 29 Nov 2012 15:40:23 +0000 (07:40 -0800)]
Avoid multiple click bindings on data layer

11 years agoUse jQuery chaining
John Firebaugh [Thu, 29 Nov 2012 15:33:04 +0000 (07:33 -0800)]
Use jQuery chaining

11 years agoMove "Browse Map Data" to layers control
John Firebaugh [Thu, 29 Nov 2012 15:30:38 +0000 (07:30 -0800)]
Move "Browse Map Data" to layers control

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

11 years agoSort changeset rectangles by size
John Firebaugh [Thu, 29 Nov 2012 13:50:03 +0000 (05:50 -0800)]
Sort changeset rectangles by size

This should help make more changesets accessible on the
map, without requiring precision cursor placement on the
changeset boundary (#169).

11 years agoUpdate Potlatch 2 to 2.3-538-gb4f7198 build
Tom Hughes [Tue, 27 Nov 2012 09:40:19 +0000 (09:40 +0000)]
Update Potlatch 2 to 2.3-538-gb4f7198 build

11 years agoPotlatch 2 localisation updates
Tom Hughes [Tue, 27 Nov 2012 09:39:22 +0000 (09:39 +0000)]
Potlatch 2 localisation updates

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 26 Nov 2012 08:18:45 +0000 (08:18 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoChange map placement in small screen mode
Tom Hughes [Sun, 25 Nov 2012 18:36:55 +0000 (18:36 +0000)]
Change map placement in small screen mode

This mirrors the way the map is now handled in large screen mode, and
makes it display properly in the Android browser.

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

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

11 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

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

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

11 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

11 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

11 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

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

11 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

11 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

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

11 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

11 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

11 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

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

11 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

11 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

11 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

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

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

11 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

11 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

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

11 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

11 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

11 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

11 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

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

11 years agoGet the notes tests working again
Tom Hughes [Tue, 20 Nov 2012 21:05:26 +0000 (21:05 +0000)]
Get the notes tests working again

11 years agoFix formatting of comments in the notes RSS feed
Tom Hughes [Tue, 20 Nov 2012 21:01:59 +0000 (21:01 +0000)]
Fix formatting of comments in the notes RSS feed

11 years agoMerge branch 'master' into notes
Tom Hughes [Tue, 20 Nov 2012 19:08:30 +0000 (19:08 +0000)]
Merge branch 'master' into notes

Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/common.css.scss
app/helpers/application_helper.rb

11 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

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

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

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

11 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

11 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

11 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

11 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

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

11 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

11 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

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

11 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

11 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

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

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

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

11 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

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

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

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

11 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

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

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

11 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

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

11 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

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

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

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

11 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

11 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

11 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

11 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

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

11 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

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

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

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

11 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

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

11 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