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

52 commits

Author SHA1 Message Date
Tom Hughes
6be39fca2f Make support email address configurable 2016-03-20 18:58:50 +00:00
Tom Hughes
7d53513769 Add routing URLs to example config 2016-01-11 19:11:50 +00:00
Tom Hughes
e54eadea95 Add support for Mapzen's Valhalla routing engine 2015-09-29 15:37:04 +01:00
Tom Hughes
7dd23a4b56 Move the MapQuest API key to the configuration file 2015-09-28 13:45:01 +01:00
Tom Hughes
82cefb5929 Add support for generating logstash friendly logs 2015-07-19 19:24:20 +01:00
Tom Hughes
2b2264ddab Add support for Windows Live authentication 2015-05-19 14:04:09 +01:00
Tom Hughes
c9893e186b Add support for Facebook authentication 2015-05-19 14:04:08 +01:00
Tom Hughes
ddaf43bc0e Add tests for Google OAuth authentication 2015-04-14 10:08:07 +01:00
Tom Hughes
eeb9866d50 Add support for Google OAuth2 authentication 
This replaces OpenID authentication, which is going away soon, but
provides an upgrade path where we can migrate users that already have
a Google OpenID setup to the new system transparently.
 2015-04-14 10:08:07 +01:00
Tom Hughes
a31591bdc3 Drop memory limit support 
The soft limit won't work with passenger 5 and causes spurious
errors to be reported back to browsers, and in any case it doesn't
actually seem to be necessary anymore.
 2015-03-30 21:32:36 +01:00
Tom Hughes
1891efef06 Testing, testing, testing... 2015-03-01 23:05:32 +00:00
Tom Hughes
2b7529a3f1 Update example configuration 2015-02-16 22:14:05 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Paul Norman
2d26d1f764 Add an imagery blacklist to capabilities 
This blacklist is for imagery which is of an incompatible license or ToS
but is incorrectly used with some frequency.

This adds a <policy> element to the capabilities XML which contains the
blacklist information within it
 2014-08-31 18:41:12 +01:00
Tom Hughes
50ea797f33 Add https support for overpass 2014-03-25 18:58:21 +00:00
Tom Hughes
5f970fe334 Make overpass server URL configurable 2014-03-16 16:18:13 +00:00
Tom Hughes
26855add38 Rework piwik configuration 2013-08-24 12:54:51 +01:00
John Firebaugh
8dc16bd8db Make iD default editor 
Make iD the default editor for all users that have not specified
a preferred editor, except fall back to P2 on IE.
 2013-08-15 16:36:18 -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
e8d32637c1 Add javascript OAuth support 2013-03-28 00:34:09 +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
Eric Theise
789e0dffd0 Fixing typo and outdated information 2012-11-12 09:47:17 +00:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
 2012-09-20 16:01:24 +01:00
Grant Slater
5d39a58b8b Switch from CC BY-SA 2.0 to ODbL 1.0 
Change of OSM license for after 12 September 2012 07:00 UTC.
 2012-09-12 08:52:10 +01:00
Grant Slater
2805118a60 Add CC BY-SA 2.0 copyright/attribution/license attributes to <osm> 2012-09-11 18:46:37 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
1a2f6c29c6 Update to use api.geonames.org instead of ws.geonames.org 2012-04-18 18:44:37 +01:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Tom Hughes
e116688136 Avoid using underscore in anchor names 
Perl's YAML parser (wrongly as far as I can see) rejects any anchor
name with an underscore in it.
 2011-09-24 16:03:15 +01:00
Tom Hughes
dc4cc8d219 Add support for manual tracking of a Piwik goal on signup 2011-09-20 21:40:53 +01:00
Tom Hughes
3a654c8919 Merge branch 'master' into openstreetbugs 2011-09-18 14:26:59 +01:00
Tom Hughes
3259bc7ede Add support for Piwik analytics 2011-09-17 00:11:53 +01:00
Tom Hughes
72e33046c8 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2011-08-13 11:48:04 +01:00
Tom Hughes
9c1a3e4708 Allow the log location to be changed in production 2011-08-12 22:27:15 +01:00
Tom Hughes
7c98b41cc8 Merge branch 'master' into openstreetbugs 2011-06-22 22:36:43 +01:00
Tom Hughes
540e56a9cc Add an option to require the CTs to be agreed to edit 2011-06-14 22:57:05 +01:00
Tom Hughes
e3b8b89330 Mass rename of "bugs" as "notes" for increased user friendliness 2011-05-21 17:22:31 +01:00
Tom Hughes
22bef89d1a Use quad tiling to select bugs in an area 
Remove the _no_quadtile versiond of the selection routines and switch
to using the ordinary ones but with a (large) limit applied on the size
of the area to prevent us spending ages working out the list of tiles
to be selected.
 2011-05-18 00:35:56 +01:00
Tom Hughes
c738c964aa Removed duplicate require_terms_seen definition 2011-04-29 22:59:39 +01:00
Tom Hughes
75d311c5a6 Add config file entry for memcache server list 2011-04-29 21:23:58 +01:00
Tom Hughes
62d9dbdc23 Make Potlatch 2 the default editor in the example configuration 2011-04-03 14:40:51 +01:00
Tom Hughes
7fd956260e Default REQUIRE_TERMS_SEEN to false for now 2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Andy Allan
6d51e77880 Use configuration variables for limiting nearby users, and bump the number to 30 2010-12-17 13:18:26 +00:00
Tom Hughes
0a52a4eb07 Implement automatic OAuth setup for Potlatch 2 2010-11-29 12:20:22 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
f364dd8f00 Allow the Nominatim instance used to be configured 2010-11-02 10:40:43 +00:00