cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5497 commits 4 branches 1 tag 499 MiB
Commit graph

5497 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Firebaugh
394dcd7316 Avoid multiple click bindings on data layer 2012-11-29 18:31:17 +00:00
John Firebaugh
6255c96130 Use jQuery chaining 2012-11-29 18:29:50 +00:00
John Firebaugh
05eba79008 Move "Browse Map Data" to layers control 
Fixes https://trac.openstreetmap.org/ticket/4680
 2012-11-29 18:23:41 +00:00
John Firebaugh
fde2744f74 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).
 2012-11-29 05:50:03 -08:00
Tom Hughes
6041012cd7 Update Potlatch 2 to 2.3-538-gb4f7198 build 2012-11-27 09:40:19 +00:00
Tom Hughes
593e3af303 Potlatch 2 localisation updates 2012-11-27 09:39:22 +00:00
Siebrand Mazeland
a65efc1927 Localisation updates from http://translatewiki.net. 2012-11-26 08:18:45 +00:00
Tom Hughes
08283b9a33 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.
 2012-11-25 18:36:55 +00:00
John Firebaugh
3758930e18 Fix "Edit Area" remote control link 
Fixes https://trac.openstreetmap.org/ticket/4699
 2012-11-25 17:36:48 +00:00
Tom Hughes
7a334bd3fe Hide +/- signs, take three 2012-11-24 14:13:58 +00:00
Tom Hughes
d9352f16a8 Set the z-index on the top bar to keep it in front 2012-11-23 19:38:55 +00:00
Tom Hughes
f978642a58 Revert "Stop the map overlapping the top bar" 
This reverts commit 2ef2d7c876.
 2012-11-23 19:36:56 +00:00
Tom Hughes
8e27c78d3c 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.
 2012-11-23 19:00:51 +00:00
Tom Hughes
dc0ada9515 Set size and anchor position for embedded markers 2012-11-23 17:57:47 +00:00
Tom Hughes
3d40181f87 Improve hiding of text on zoom icons 2012-11-23 15:26:00 +00:00
Tom Hughes
31a6d20728 Set icon paths for markers on the embedded map 2012-11-23 15:06:13 +00:00
Tom Hughes
af35527c72 Add missing units 2012-11-23 15:00:04 +00:00
Tom Hughes
e951c6b4b0 Stop active link boxes appearing on the zoom in/out icons 2012-11-23 14:58:10 +00:00
Tom Hughes
4a26107560 Stop spurious +/- signs appearing in the zoom slider 2012-11-23 14:57:54 +00:00
Tom Hughes
8f079fe4ea Revert "Stop spurious +/- signs appearing in the zoom slider" 
This reverts commit 5edb4bf4e5.
 2012-11-23 14:56:44 +00:00
Tom Hughes
5edb4bf4e5 Stop spurious +/- signs appearing in the zoom slider 2012-11-23 14:50:39 +00:00
Tom Hughes
799b6d4cc7 Update the leaflet zoom slider plugin to fix IE8 2012-11-23 13:12:51 +00:00
Tom Hughes
2ef2d7c876 Stop the map overlapping the top bar 2012-11-23 12:23:38 +00:00
Tom Hughes
7d92ec7047 Merge branch 'leaflet' 2012-11-23 10:41:45 +00:00
Tom Hughes
c0b47c0c2a Serve embedded maps through the assets pipeline 2012-11-23 10:40:26 +00:00
Tom Hughes
d04e3ac9f8 Move map controls higher in the small screen view 2012-11-22 13:03:49 +00:00
Tom Hughes
0c2d538aa7 Use the small zoom control in the small screen layout 2012-11-22 12:54:37 +00:00
Tom Hughes
f6ac8ffbab Tidy up 2012-11-22 12:35:49 +00:00
Tom Hughes
048f831119 Update the Layers control when layers are added or removed 
Submitted upstream as https://github.com/CloudMade/Leaflet/pull/1169.
 2012-11-22 12:35:49 +00:00
Tom Hughes
7ac7db35b8 Remove hard coded assumption that layer zero is mapnik 2012-11-22 12:35:49 +00:00
Tom Hughes
8f02fe8269 Update to CPK 5.0.10 and remove monkey patch 2012-11-22 09:10:04 +00:00
Tom Hughes
8aa6d575ff Remove unused image 2012-11-21 22:52:53 +00:00
Tom Hughes
130a184ec5 Make sure all leaflet images are loaded through the asse pipeline 2012-11-21 19:01:09 +00:00
Tom Hughes
62ba6b50ba Replace OSM markers with recolured versions of the Leaflet marker 2012-11-21 18:43:20 +00:00
Tom Hughes
bc1b4d53e3 Use the OSM map marker icons on the home page 2012-11-20 21:52:40 +00:00
Tom Hughes
a0c9cc7d0a Use the OSM map marker icons when adding a new diary entry 2012-11-20 21:48:50 +00:00
Tom Hughes
1ffb6d2687 Make vendored asset definitions consistent 2012-11-20 21:24:03 +00:00
Tom Hughes
fd6abf41bf Get the notes tests working again 2012-11-20 21:05:26 +00:00
Tom Hughes
129d505d91 Fix formatting of comments in the notes RSS feed 2012-11-20 21:01:59 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Tom Hughes
bd8713f42b Update Potlatch 2 to 2.3-534-g63a3364 build 2012-11-20 18:59:36 +00:00
Tom Hughes
115341f7ae Potlatch 2 localisation updates 2012-11-20 18:59:05 +00:00
Siebrand Mazeland
de1988d2cc Localisation updates from http://translatewiki.net. 2012-11-20 12:49:40 +00:00
Siebrand Mazeland
735af4cd2b Localisation updates from http://translatewiki.net. 2012-11-20 12:06:12 +00:00
Tom Hughes
d68368e0d5 Rework RTL handling to keep rules together 2012-11-19 10:39:30 +00:00
Tom Hughes
6f9ad2eab6 Fix rendering of PanZoom control in RTL mode 2012-11-18 19:20:53 +00:00
Tom Hughes
2cecfa7d01 Configure CORS to allow GET and POST to /oauth 2012-11-16 22:28:52 +00:00
Tom Hughes
1c5db113e2 Always use the canonical host name in diary RSS feeds 2012-11-16 17:03:48 +00:00
Tom Hughes
44528ffe0f 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.
 2012-11-15 15:22:56 +00:00
Tom Hughes
7ffd7f10ff Updated Potlatch 2 to 2.3-529-g5446b49 build 2012-11-13 15:32:16 +00:00