potlatch2.git
7 years agoMerge remote-tracking branch 'upstream/master'
Ed Loach [Wed, 14 Nov 2012 17:19:01 +0000 (17:19 +0000)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #88 from tomhughes/master
Richard Fairhurst [Tue, 13 Nov 2012 15:24:25 +0000 (07:24 -0800)]
Merge pull request #88 from tomhughes/master

Beat flash into submission

7 years agoWork around flash security errors
Tom Hughes [Tue, 13 Nov 2012 15:19:22 +0000 (15:19 +0000)]
Work around flash security errors

Flash 11.2.202.251 on linux throws security errors trying to
retrieve data from a loader that has been put there with loadBytes
so we stash a copy in our extended info so we can get it back later.

7 years agoAdd shift-click to SelectedWayNode contextual help
Richard Fairhurst [Thu, 8 Nov 2012 11:12:46 +0000 (11:12 +0000)]
Add shift-click to SelectedWayNode contextual help

7 years agoThere are too many building=yes in OSM, and very few that specify the type, which...
Shaun McDonald [Mon, 8 Oct 2012 14:54:12 +0000 (15:54 +0100)]
There are too many building=yes in OSM, and very few that specify the type, which is probably due to this menu being hidden in a tab, so lets expose it on the basic tab.

7 years agoMerge pull request #85 from EdLoach/master
Richard Fairhurst [Tue, 13 Nov 2012 11:27:55 +0000 (03:27 -0800)]
Merge pull request #85 from EdLoach/master

Nightclub ref trac ticket 4025

7 years agoMerge pull request #81 from smsm1/improve_presets
Richard Fairhurst [Mon, 12 Nov 2012 17:58:38 +0000 (09:58 -0800)]
Merge pull request #81 from smsm1/improve_presets

Make the building type selector more prominent.

7 years agoAdd shift-click to SelectedWayNode contextual help
Richard Fairhurst [Thu, 8 Nov 2012 11:12:46 +0000 (11:12 +0000)]
Add shift-click to SelectedWayNode contextual help

7 years agoMerge remote-tracking branch 'upstream/master'
Ed Loach [Wed, 7 Nov 2012 13:38:36 +0000 (13:38 +0000)]
Merge remote-tracking branch 'upstream/master'

7 years agoMerge pull request #87 from balrog-kun/master
Richard Fairhurst [Wed, 7 Nov 2012 12:45:18 +0000 (04:45 -0800)]
Merge pull request #87 from balrog-kun/master

Show fire hydrant POIs.

7 years agoAdd a fire hydrant icon to the stylesheet.
Andrzej Zaborowski [Wed, 7 Nov 2012 12:32:26 +0000 (13:32 +0100)]
Add a fire hydrant icon to the stylesheet.

Icon prepared by Tomasz Nycz.

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

7 years agoRevert "Trac #4378 - creating one node ways"
Ed Loach [Tue, 6 Nov 2012 23:38:37 +0000 (23:38 +0000)]
Revert "Trac #4378 - creating one node ways"

This reverts commit ab6c2e9a31446d4f930d18f9043a8302d7e5f61c.

7 years agoMultiple selection check for non-interactive objects
Richard Fairhurst [Sun, 4 Nov 2012 18:38:04 +0000 (18:38 +0000)]
Multiple selection check for non-interactive objects

7 years agoTrac #4378 - creating one node ways
Ed Loach [Thu, 1 Nov 2012 19:39:19 +0000 (19:39 +0000)]
Trac #4378 - creating one node ways

This change treats 1 node ways created by deleting a node from a way as
deleted ways. Tests that I've done suggest this works, including for
undo and redo, but would like someone else to see whether it messes
something else up that I've missed.

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

7 years agoinputSet - payments
Ed Loach [Fri, 26 Oct 2012 14:07:23 +0000 (15:07 +0100)]
inputSet - payments

Attached just to vending machine for now, but can be attached to other
items (and once they have been could perhaps close trac ticket 3716).

7 years agoAdded further destination dropdown options
Ed Loach [Fri, 26 Oct 2012 13:31:57 +0000 (14:31 +0100)]
Added further destination dropdown options

Having only added the one previously

7 years agoAdd nightclub
Ed Loach [Thu, 25 Oct 2012 15:49:04 +0000 (16:49 +0100)]
Add nightclub

Re: https://trac.openstreetmap.org/ticket/4025 - added to Food and Drink
section (where bar is) and Sport and Leisure (as it is for leisure
purposes). Also icon in core-pois added.

7 years agoMerge remote-tracking branch 'upstream/master'
Ed Loach [Thu, 25 Oct 2012 13:05:36 +0000 (14:05 +0100)]
Merge remote-tracking branch 'upstream/master'

7 years agoAdd missing Library POI on the map
Rob Norris [Sat, 20 Oct 2012 17:02:23 +0000 (18:02 +0100)]
Add missing Library POI on the map

Icon was generated from the existing icon in the resources/features/pois via:

convert -resize 16x16 amenity_library.n.24.png amenity_library.n.16.png

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

7 years agoMerge pull request #83 from rnorris/patches
Richard Fairhurst [Sun, 21 Oct 2012 18:02:47 +0000 (11:02 -0700)]
Merge pull request #83 from rnorris/patches

Add missing Library POI on the map

7 years agoAdd missing Library POI on the map
Rob Norris [Sat, 20 Oct 2012 17:02:23 +0000 (18:02 +0100)]
Add missing Library POI on the map

Icon was generated from the existing icon in the resources/features/pois via:

convert -resize 16x16 amenity_library.n.24.png amenity_library.n.16.png

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

7 years agoMerge pull request #82 from EdLoach/master
Richard Fairhurst [Fri, 19 Oct 2012 14:35:25 +0000 (07:35 -0700)]
Merge pull request #82 from EdLoach/master

First attempt using git, to add access=destination

7 years agoAdd access=destination permission
Ed Loach [Fri, 19 Oct 2012 14:24:18 +0000 (15:24 +0100)]
Add access=destination permission

7 years agoTidy form display
Richard Fairhurst [Fri, 19 Oct 2012 12:16:10 +0000 (13:16 +0100)]
Tidy form display

7 years agoDownload on resize
Richard Fairhurst [Thu, 18 Oct 2012 18:00:32 +0000 (19:00 +0100)]
Download on resize

7 years agoFix toolbox positioning
Richard Fairhurst [Thu, 18 Oct 2012 17:15:49 +0000 (18:15 +0100)]
Fix toolbox positioning
/me is currently wondering what qualifies you to put "tech" at the start of your name

7 years agoDon't allow ContextualHelp to receive focus
Richard Fairhurst [Thu, 18 Oct 2012 16:19:10 +0000 (17:19 +0100)]
Don't allow ContextualHelp to receive focus

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

7 years agoContextual help for each ControllerState
Richard Fairhurst [Sun, 14 Oct 2012 23:14:50 +0000 (16:14 -0700)]
Contextual help for each ControllerState

7 years agoAnother Flex 4.6 compatibility issue
Richard Fairhurst [Sun, 14 Oct 2012 18:13:44 +0000 (11:13 -0700)]
Another Flex 4.6 compatibility issue

7 years agoFix incompatibility with Flex 4.6
Richard Fairhurst [Sun, 14 Oct 2012 16:52:57 +0000 (09:52 -0700)]
Fix incompatibility with Flex 4.6

7 years agoMerge branch 'master' of github.com:systemed/potlatch2
Richard Fairhurst [Tue, 9 Oct 2012 12:26:15 +0000 (13:26 +0100)]
Merge branch 'master' of github.com:systemed/potlatch2

7 years agoRemove zoom-specific rules
Richard Fairhurst [Tue, 9 Oct 2012 12:24:30 +0000 (13:24 +0100)]
Remove zoom-specific rules
(sorry... I know they're pretty, but in the current Halcyon MapCSS implementation they prevent caching styles when zooming in/out; removing them greatly speeds up redraw time)

7 years agoThere are too many building=yes in OSM, and very few that specify the type, which...
Shaun McDonald [Mon, 8 Oct 2012 14:54:12 +0000 (15:54 +0100)]
There are too many building=yes in OSM, and very few that specify the type, which is probably due to this menu being hidden in a tab, so lets expose it on the basic tab.

7 years agoMerge pull request #80 from smsm1/improve_presets
Richard Fairhurst [Mon, 8 Oct 2012 14:14:21 +0000 (07:14 -0700)]
Merge pull request #80 from smsm1/improve_presets

Fix typo.

7 years agoFix typo.
Shaun McDonald [Mon, 8 Oct 2012 13:47:57 +0000 (14:47 +0100)]
Fix typo.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 7 Oct 2012 22:08:13 +0000 (22:08 +0000)]
Localisation updates from translatewiki.net.

7 years agoMerge pull request #64 from 1ec5/patch-2
Richard Fairhurst [Sat, 6 Oct 2012 08:42:28 +0000 (01:42 -0700)]
Merge pull request #64 from 1ec5/patch-2

Fixed MapQuest Open Aerial URL

7 years agoMake toolbox expandable, default one row high
Richard Fairhurst [Sat, 6 Oct 2012 08:38:24 +0000 (09:38 +0100)]
Make toolbox expandable, default one row high

7 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Sat, 6 Oct 2012 07:59:01 +0000 (08:59 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

7 years agoDon't straighten ways if they diverge too much
Richard Fairhurst [Sat, 6 Oct 2012 07:58:23 +0000 (08:58 +0100)]
Don't straighten ways if they diverge too much

7 years agoMerge pull request #79 from smsm1/improve_presets
Richard Fairhurst [Fri, 5 Oct 2012 17:05:02 +0000 (10:05 -0700)]
Merge pull request #79 from smsm1/improve_presets

Improve presets

7 years agoRemoving some features from the drag and drop panel which should only be attached...
Shaun McDonald [Fri, 5 Oct 2012 16:44:22 +0000 (17:44 +0100)]
Removing some features from the drag and drop panel which should only be attached to a node in the middle of a way.

7 years agoAdd option for indicating that a sidewalk has been mapped separately. Add synonyms...
Shaun McDonald [Fri, 5 Oct 2012 16:34:33 +0000 (17:34 +0100)]
Add option for indicating that a sidewalk has been mapped separately. Add synonyms of lesser used tags.

7 years agoAdd the types of bicycle parking.
Shaun McDonald [Fri, 5 Oct 2012 15:36:59 +0000 (16:36 +0100)]
Add the types of bicycle parking.

7 years agoAutomatically close KML polygons
Richard Fairhurst [Fri, 5 Oct 2012 09:09:35 +0000 (10:09 +0100)]
Automatically close KML polygons

7 years agoSort 'add to relation' dialogue by description
Richard Fairhurst [Thu, 4 Oct 2012 23:12:54 +0000 (00:12 +0100)]
Sort 'add to relation' dialogue by description

7 years agoMake advanced relations display a little nicer
Richard Fairhurst [Thu, 4 Oct 2012 23:03:19 +0000 (00:03 +0100)]
Make advanced relations display a little nicer

7 years agoFix shift-clicking issue
Richard Fairhurst [Thu, 4 Oct 2012 21:15:59 +0000 (22:15 +0100)]
Fix shift-clicking issue

7 years agoAllow railway platforms on bridges and tunnels.
Shaun McDonald [Wed, 3 Oct 2012 18:59:12 +0000 (19:59 +0100)]
Allow railway platforms on bridges and tunnels.

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

7 years agoMove the Sidewalks into a more appropriate location that's more consistent for the...
Shaun McDonald [Wed, 3 Oct 2012 18:49:23 +0000 (19:49 +0100)]
Move the Sidewalks into a more appropriate location that's more consistent for the tabs.

7 years agoMerge pull request #78 from smsm1/implement_ant_clean
Richard Fairhurst [Wed, 3 Oct 2012 18:16:17 +0000 (11:16 -0700)]
Merge pull request #78 from smsm1/implement_ant_clean

Implement the ant clean task.

7 years agoMerge pull request #77 from smsm1/master
Richard Fairhurst [Wed, 3 Oct 2012 16:41:57 +0000 (09:41 -0700)]
Merge pull request #77 from smsm1/master

Readme need MOAR ram to be able to compile on OSX.

7 years agoBugfix so relations show up on Basic panel
Richard Fairhurst [Wed, 3 Oct 2012 16:31:08 +0000 (17:31 +0100)]
Bugfix so relations show up on Basic panel

7 years agoUpdate the ANT_OPTS as higher memory requirements were needed for sucessful compile.
Shaun McDonald [Wed, 3 Oct 2012 16:28:23 +0000 (17:28 +0100)]
Update the ANT_OPTS as higher memory requirements were needed for sucessful compile.

7 years agoImplement the ant clean task.
Shaun McDonald [Wed, 3 Oct 2012 10:48:12 +0000 (11:48 +0100)]
Implement the ant clean task.

7 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Tue, 2 Oct 2012 21:59:27 +0000 (22:59 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

7 years agoAdd sidewalk tag for Shaun
Richard Fairhurst [Tue, 2 Oct 2012 21:59:02 +0000 (22:59 +0100)]
Add sidewalk tag for Shaun

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 2 Oct 2012 13:13:52 +0000 (13:13 +0000)]
Localisation updates from translatewiki.net.

7 years agoMerge branch 'master' of https://github.com/systemed/potlatch2
Richard Fairhurst [Fri, 28 Sep 2012 14:45:51 +0000 (15:45 +0100)]
Merge branch 'master' of https://github.com/systemed/potlatch2

7 years agoShow changeset comments in the history dialogue
Richard Fairhurst [Fri, 28 Sep 2012 14:45:17 +0000 (15:45 +0100)]
Show changeset comments in the history dialogue

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 24 Sep 2012 18:50:11 +0000 (18:50 +0000)]
Localisation updates from translatewiki.net.

7 years agoJump directly to lat/lon pair
Richard Fairhurst [Thu, 20 Sep 2012 15:29:58 +0000 (16:29 +0100)]
Jump directly to lat/lon pair

7 years agoAdd databaseWarning to LocalizationMap
Richard Fairhurst [Thu, 20 Sep 2012 15:19:28 +0000 (16:19 +0100)]
Add databaseWarning to LocalizationMap
(I have absolutely no idea whether this is the way to do it,
but no-one has has stepped up, so...)

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

7 years agoMerge pull request #76 from pnorman/more_imagery_bounds
Richard Fairhurst [Thu, 13 Sep 2012 09:22:58 +0000 (02:22 -0700)]
Merge pull request #76 from pnorman/more_imagery_bounds

More imagery bounds

7 years agoreplace attribution with terms for bc_mosaic
Paul Norman [Thu, 13 Sep 2012 09:18:19 +0000 (02:18 -0700)]
replace attribution with terms for bc_mosaic

7 years agoFix bc_mosaic bbox
Paul Norman [Thu, 13 Sep 2012 09:15:59 +0000 (02:15 -0700)]
Fix bc_mosaic bbox

7 years agoSplit OSM TIGER 2011 into CONUS, Alaska and Hawaii based on OSM - Tiger Edited
Paul Norman [Thu, 13 Sep 2012 09:04:32 +0000 (02:04 -0700)]
Split OSM TIGER 2011 into CONUS, Alaska and Hawaii based on OSM - Tiger Edited

7 years agoSplit OSM - Tiger Edited Map into CONUS, Alaska and Hawaii
Paul Norman [Thu, 13 Sep 2012 09:03:08 +0000 (02:03 -0700)]
Split OSM - Tiger Edited Map into CONUS, Alaska and Hawaii

7 years agoSet usgs_large_scale bounds
Paul Norman [Thu, 13 Sep 2012 08:58:53 +0000 (01:58 -0700)]
Set usgs_large_scale bounds

7 years agoSplit USGS Topographic Maps into CONUS, Alaska and Hawaii
Paul Norman [Thu, 13 Sep 2012 08:56:45 +0000 (01:56 -0700)]
Split USGS Topographic Maps into CONUS, Alaska and Hawaii

7 years agoMerge pull request #75 from Firefishy/patch-3
Richard Fairhurst [Tue, 11 Sep 2012 22:17:58 +0000 (15:17 -0700)]
Merge pull request #75 from Firefishy/patch-3

Add South Africa - CD:NGI aerial

7 years agoAdd South Africa - CD:NGI aerial
Grant [Tue, 11 Sep 2012 22:08:18 +0000 (00:08 +0200)]
Add South Africa - CD:NGI aerial

Add the RSA - CD:NGI aerial.

7 years agoRemove licence status display
Richard Fairhurst [Tue, 11 Sep 2012 15:57:48 +0000 (16:57 +0100)]
Remove licence status display

7 years agoFilter mouse events when dropdown open
Richard Fairhurst [Tue, 11 Sep 2012 15:30:58 +0000 (16:30 +0100)]
Filter mouse events when dropdown open

7 years agoMerge pull request #74 from pnorman/patch-1
Richard Fairhurst [Sun, 9 Sep 2012 10:35:49 +0000 (03:35 -0700)]
Merge pull request #74 from pnorman/patch-1

imagery.xml changes

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

7 years agoFix ampersand entities
pnorman [Sat, 8 Sep 2012 06:53:32 +0000 (23:53 -0700)]
Fix ampersand entities

7 years agoAdd bc_mosaic layer
pnorman [Sat, 8 Sep 2012 06:49:00 +0000 (23:49 -0700)]
Add bc_mosaic layer

7 years agoUse new more accurate bounds of OS OpenData Streetview
pnorman [Sat, 8 Sep 2012 06:37:56 +0000 (23:37 -0700)]
Use new more accurate bounds of OS OpenData Streetview

7 years agoDon't throw an exception if user has disabled SharedObjects
Richard Fairhurst [Sat, 1 Sep 2012 16:28:30 +0000 (17:28 +0100)]
Don't throw an exception if user has disabled SharedObjects

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 1 Sep 2012 11:28:18 +0000 (11:28 +0000)]
Localisation updates from translatewiki.net.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 25 Aug 2012 21:24:50 +0000 (21:24 +0000)]
Localisation updates from translatewiki.net.

7 years agoNew help icon
Richard Fairhurst [Wed, 22 Aug 2012 13:24:42 +0000 (14:24 +0100)]
New help icon

7 years agoMake help tooltips more obvious
Richard Fairhurst [Wed, 22 Aug 2012 13:24:22 +0000 (14:24 +0100)]
Make help tooltips more obvious

7 years agoMake save icon less aggressive for the shrinking violets out there
Richard Fairhurst [Wed, 22 Aug 2012 13:23:11 +0000 (14:23 +0100)]
Make save icon less aggressive for the shrinking violets out there

7 years agoExpand designation= help text and reword label
Richard Fairhurst [Wed, 22 Aug 2012 13:22:31 +0000 (14:22 +0100)]
Expand designation= help text and reword label

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 19 Aug 2012 16:18:38 +0000 (16:18 +0000)]
Localisation updates from translatewiki.net.

7 years agoWhere is it going?
Richard Fairhurst [Wed, 15 Aug 2012 12:07:10 +0000 (13:07 +0100)]
Where is it going?

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 12 Aug 2012 18:26:45 +0000 (18:26 +0000)]
Localisation updates from translatewiki.net.

7 years agoMerge pull request #71 from rnorris/PythonWebserver
Richard Fairhurst [Sat, 11 Aug 2012 21:55:59 +0000 (14:55 -0700)]
Merge pull request #71 from rnorris/PythonWebserver

Python webserver

7 years agoMerge pull request #72 from rnorris/Help
Richard Fairhurst [Sat, 11 Aug 2012 21:55:10 +0000 (14:55 -0700)]
Merge pull request #72 from rnorris/Help

Help

7 years agoRecommend server.py since python is installed on most Linux distributions by default
Rob Norris [Sat, 11 Aug 2012 19:47:30 +0000 (20:47 +0100)]
Recommend server.py since python is installed on most Linux distributions by default

7 years agoAdd an even simpler test webserver setup using python (no need for ruby to be install...
Rob Norris [Sat, 11 Aug 2012 14:06:19 +0000 (15:06 +0100)]
Add an even simpler test webserver setup using python (no need for ruby to be installed on your system)

7 years agoShow the shortcut key (J) for Merge Ways text in the toolbox.
Rob Norris [Sat, 11 Aug 2012 15:26:57 +0000 (16:26 +0100)]
Show the shortcut key (J) for Merge Ways text in the toolbox.