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

277 commits

Author SHA1 Message Date
Tom Hughes
7f598ab412 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/diary_entry/list.html.erb
 2013-04-08 22:34:37 +01:00
Tom Hughes
22760a3cc8 Update Potlatch 2 to 2.3-584-g996bb4d build 2013-04-08 10:36:10 +01:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
e8d32637c1 Add javascript OAuth support 2013-03-28 00:34:09 +00:00
Tom Hughes
a5626fc55b Update imagery definitions for Potlatch 2 2013-02-08 19:18:36 +00:00
Tom Hughes
56db9ca2b7 Merge branch 'master' into notes 2013-02-02 11:00:46 +00:00
Tom Hughes
a77b0e45a5 Update Potlatch 2 translations 2013-02-02 10:58:32 +00:00
Tom Hughes
6bde69a840 Update to Leaflet 0.5 2013-01-17 17:44:10 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
 2013-01-15 21:11:35 +00:00
Tom Hughes
1eda38f77b Update Potlatch 2 to 2.3-554-ge648197 build 2012-12-21 08:50:28 +00:00
Tom Hughes
8ca9f5a0d5 Potlatch 2 localisation updates 2012-12-21 08:49:39 +00:00
Tom Hughes
37bf8e2f6e Update Potlatch 2 to 2.3-547-g4a8c109 build 2012-12-03 14:58:44 +00:00
Tom Hughes
b4abc4ca17 Potlatch 2 localisation updates 2012-12-03 14:58:43 +00:00
Tom Hughes
78f608b114 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
 2012-12-01 18:22:30 +00: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
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
7d92ec7047 Merge branch 'leaflet' 2012-11-23 10:41:45 +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
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
Tom Hughes
7ffd7f10ff Updated Potlatch 2 to 2.3-529-g5446b49 build 2012-11-13 15:32:16 +00:00
Tom Hughes
f15c5a3647 Update Potlatch 2 to 2.3-515-gd4558d1 build 2012-11-10 19:43:54 +00:00
Tom Hughes
0f9e1fa05e Potlatch 2 localisation updates 2012-11-10 19:43:18 +00:00
John Firebaugh
078da130b7 Update Leaflet 2012-11-09 16:01:29 -08:00
John Firebaugh
f4c64084a6 Update leaflet.locationfilter 2012-11-09 13:13:56 -08:00
John Firebaugh
a457189880 Update leaflet.osm.js 2012-11-09 12:59:30 -08:00
John Firebaugh
cc7753896c Move non-vendor leaflet assets into app 2012-11-09 12:59:30 -08:00
John Firebaugh
39006baf33 Fix left pan button position in RTL 2012-11-09 12:59:29 -08:00
John Firebaugh
e6afda8764 Update Leaflet 2012-11-09 12:59:29 -08:00
John Firebaugh
378d08f2c9 Update leaflet.locationfilter 2012-11-09 12:59:29 -08:00
John Firebaugh
6f793e1b21 Pan/zoom controls that look like the OL ones 2012-11-09 12:59:28 -08:00
John Firebaugh
f8b0b861d4 Restore maxFeatures check 2012-11-09 12:59:28 -08:00
John Firebaugh
fe6e837cfe Replace leaflet.draw with leaflet-locationfilter 2012-11-09 12:59:28 -08:00
John Firebaugh
030b7c4052 Update leaflet-osm 2012-11-09 12:59:28 -08:00
John Firebaugh
4d19c6892c Update Leaflet 2012-11-09 12:59:28 -08:00
John Firebaugh
1ae4483c69 Update Leaflet 2012-11-09 12:59:27 -08:00
John Firebaugh
30ad58c01f Port to Leaflet 2012-11-09 12:59:27 -08:00
Tom Hughes
e64bcf335a Update Potlatch 2 to 2.3-509-g0221790 build 2012-10-21 19:27:35 +01:00
Tom Hughes
b7967002d8 Potlatch 2 localisation updates 2012-10-21 19:27:21 +01:00
Tom Hughes
abd46402a7 Update Potlatch 2 to 2.3-502-g0247dab build 2012-10-18 19:02:31 +01:00
Tom Hughes
9f560df39d Recover properly from a failed notes load 
Patch OpenLayers so that it doesn't consider an area as loaded if
the HTTP request fails, so that it will try and load the area when
you zoom back in again.
 2012-10-16 13:09:52 +01:00
Tom Hughes
3fb931f9a8 Merge branch 'master' into notes 2012-10-15 22:38:13 +01:00
Tom Hughes
44b084dc3a Update Potlatch 2 to 2.3-500-g740307e build 2012-10-15 19:28:30 +01:00
Tom Hughes
e166ff1303 Potlatch 2 localisation updates 2012-10-15 19:28:09 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2012-10-13 15:55:34 +01:00
Tom Hughes
93f6a35bf2 Update Potlatch 2 stylesheet and presets 2012-10-12 21:05:29 +01:00