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

512 commits

Author SHA1 Message Date
Grant Slater
0aa32990d5 Tweak layer levels 2013-08-14 00:31:37 +01:00
John Firebaugh
a45af012b4 Update to iD v1.1.2 2013-08-12 14:20:01 -07:00
John Firebaugh
25792ba304 iD 1.1.1 2013-08-10 00:38:46 +01:00
John Firebaugh
78e97ade45 iD 1.1.0 2013-08-10 00:38:36 +01:00
John Firebaugh
dc877c3d03 Reapply patch 2013-08-08 14:26:36 -07:00
John Firebaugh
1b2738af80 Update leaflet.locate (fixes #438) 2013-08-08 14:26:14 -07:00
John Firebaugh
54ded37bf2 Tooltips for map controls 2013-08-07 15:41:32 -07:00
Tom Hughes
4a97b04179 Update Potlatch 2 to 2.3-596-gc119528 build 2013-08-06 12:26:20 +01:00
John Firebaugh
406e93de95 Port fix for Leaflet issue #1919 2013-08-05 14:30:50 -07:00
John Firebaugh
a89d75d3d8 Recenter marker on map pan/zoom 2013-08-05 12:27:37 -07:00
John Firebaugh
1a5f14d338 Update hash on P2 and iD edit pages and throttle 2013-07-30 15:41:41 -07:00
John Firebaugh
57e711d343 Use leaflet-hash 2013-07-30 15:41:40 -07:00
John Firebaugh
74293c8946 Fix locate button style 2013-07-18 10:45:14 -07:00
Saman Bemel-Benrud
b9a19ab23a starting to cleanup+style map controls. 2013-07-18 10:36:08 -07:00
Tom MacWright
73bbee5df9 Add leaflet-locate control, invisible currently. 2013-07-18 10:31:19 -07:00
Tom MacWright
5aea67a71f Remove pan and zoom controls 2013-07-18 10:31:19 -07:00
Tom Hughes
fe2f03da14 Give up on automatic resizing of text areas 2013-07-18 15:31:51 +01:00
Tom Hughes
e4ed5ae275 Update Leaflet to 0.6.3 2013-07-17 19:18:36 +01:00
Tom Hughes
51528b274f Update Leaflet to 0.6.1 2013-06-27 15:52:18 +01:00
Tom Hughes
15423c2130 Update Leaflet.zoomslider 2013-06-26 18:20:06 +01:00
Tom Hughes
cec2253b82 Update Leaflet to 0.6 2013-06-26 17:28:24 +01:00
Peter Wendorff
358b92e3e5 Update OpenStreetMap.js with correct attribution 2013-06-17 18:37:03 +01:00
Tom Hughes
743cce1d9c Update leaflet-osm 2013-05-14 21:43:01 +01:00
John Firebaugh
d1675eb764 Update to iD 1.0.1 2013-05-10 19:30:03 +01:00
John Firebaugh
c3801e5931 Update to iD 1.0.0 2013-05-06 12:32:48 -07:00
John Firebaugh
3da2a95cea Update iD, set locale 2013-05-03 13:47:30 -07:00
John Firebaugh
356fa7f2de Update iD 2013-05-03 10:52:43 -07:00
John Firebaugh
daf9166298 Fix edit links on browse and changeset pages 2013-05-03 10:52:42 -07:00
John Firebaugh
3ddc803259 Update iD; clean up OAuth configuration 2013-05-03 10:52:42 -07:00
Tom MacWright
7a98913d0c Add iD editor 
iD sources live in vendor/assets/iD, and are managed with
vendorer, using the "rewrite" functionality to replace relative
paths in the CSS with <%= asset_path(…) %> directives.

To avoid needing to namespace all of its CSS classes, iD
is embedded via an iframe.

To setup, edit application.yml to include an `id_key` key.
(It can use the same consumer key as P2 if you like.)
 2013-05-03 10:52:41 -07:00
Tom Hughes
d9d8d5a106 Handle empty arguments when computing the OAuth base string 2013-04-29 10:49:19 +01:00
Tom Hughes
77de506312 Update ohauth and switch to using the new headerGenerator method 2013-04-28 10:39:56 +01:00
Tom Hughes
10161fb41b Encode parameters correctly when building an OAuth base string 
Parameter key and value escaping needs to use the extended algorithm
from the OAuth specification, not the standard URI escaping algorithm
so we need to escape !, ', *, ( and ) characters.
 2013-04-27 12:20:16 +01:00
Tom Hughes
0c8ad2f86e Merge branch 'notes' 
Conflicts:
	Vendorfile
 2013-04-23 22:40:21 +01:00
Tom Hughes
96d5517a9b Update jQuery Autogrow Textarea Plugin to v3.0 2013-04-17 17:38:22 +01:00
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