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

2165 commits

Author SHA1 Message Date
Tom Hughes
fb70a89a36 There is no routing.js to compile 2015-02-01 14:50:18 +00:00
Tom Hughes
13d650e2dc Merge branch 'master' into routing 2015-02-01 11:32:02 +00:00
Sarah Hoffmann
2f6f627a76 update list of key-value pairs for nominatim 2015-01-31 22:36:28 +01:00
Tom Hughes
16b875b271 Fix broken interpolation 2015-01-26 22:43:52 +00:00
Siebrand Mazeland
32dfa68f90 Localisation updates from https://translatewiki.net. 2015-01-26 23:03:30 +01:00
Matt Amos
c3e2e6462f Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2 
Conflicts:
	config/locales/de.yml
 2015-01-26 13:14:58 +00:00
Siebrand Mazeland
9ad586f08e Localisation updates from https://translatewiki.net. 2015-01-19 09:35:56 +01:00
Tom Hughes
44e44a5198 Only log at info level in production 2015-01-18 19:43:21 +00:00
Tom Hughes
e65e41a694 Update to rails 4.2.0 2015-01-10 17:46:58 +00:00
Tom Hughes
428f379eef Restore removal of div and style elements when sanitizing HTML 2015-01-10 17:41:17 +00:00
Tom Hughes
75a32ff879 Fix broken translations 2015-01-10 15:59:19 +00:00
Siebrand Mazeland
6ac1a593a9 Localisation updates from https://translatewiki.net. 2015-01-02 11:04:15 +01:00
Siebrand Mazeland
b9493f56a3 Localisation updates from https://translatewiki.net. 2014-12-27 17:05:10 +01:00
Tom Hughes
2b823b7b07 Make development mode work when the database is offline 2014-12-14 00:27:48 +00:00
Adam Conrad
9934eed190 Remove unnecessary local variable 
The local variable `app` was unused and therefore not needed
to be declared with initialization
 2014-12-08 07:59:49 +00:00
Siebrand Mazeland
1f956adb81 Localisation updates from https://translatewiki.net. 2014-11-14 13:56:13 +01:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge 
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
 2014-11-10 16:14:06 +00:00
Tom Hughes
f0ecc6312b Revert "Add SOTM advert" 
This reverts commit 15a7276a9f.
 2014-11-09 23:03:04 +00:00
Tom Hughes
e11d734f9f Merge branch 'overpass' 2014-11-07 08:40:18 +00:00
Paul Norman
295c4f6992 Recommend PostgreSQL 9.1+ in database.yml 
Postgres 8.3 is EOL and the minimum version supported by PostgreSQL
is 9.0. The production servers run 9.1, and the extension setup is
easier with it too.
 2014-11-07 08:24:26 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing 
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
 2014-11-03 11:08:13 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Tom Hughes
2f22843732 Merge branch 'comments' 2014-11-01 11:43:21 +00:00
Siebrand Mazeland
1d9fe46af1 Localisation updates from https://translatewiki.net. 2014-10-27 18:58:16 +01:00
Tom Hughes
b83c5b4b50 Fixes for offline mode 2014-10-26 11:39:00 +00:00
Tom Hughes
f636391580 Move changeset comment feeds out of the API namespace 2014-10-23 21:40:13 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions 
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
 2014-10-23 21:24:51 +01:00
Siebrand Mazeland
653b4c93bc Localisation updates from https://translatewiki.net. 2014-10-23 21:37:57 +02:00
Siebrand Mazeland
d83664100c Localisation updates from https://translatewiki.net. 2014-10-20 19:07:29 +02:00
Tom Hughes
dae66c21d5 Update to CPK 7.0.11 and drop monkey patch 2014-10-10 12:32:25 +01:00
Siebrand Mazeland
4e976c835a Localisation updates from https://translatewiki.net. 2014-10-06 12:11:58 +02:00
Tom Hughes
96e1665c01 Update to rails 4.1.6 2014-10-02 19:54:21 +01:00
Tom Hughes
15a7276a9f Add SOTM advert 2014-09-04 15:25:56 +01: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
Siebrand Mazeland
821c2fa2d8 Localisation updates from https://translatewiki.net. 2014-08-10 11:46:50 +02:00
Tom Hughes
04948fff0c Addd some missing quotes 2014-08-10 08:55:06 +01:00
Siebrand Mazeland
befd09bc2a Localisation updates from https://translatewiki.net. 2014-08-09 16:21:12 +02:00
Tom Hughes
3ab24d63f0 Revert "Localisation updates from https://translatewiki.net." 
This reverts commit e25fbfa13a.
 2014-08-06 16:04:13 +01:00
Siebrand Mazeland
e25fbfa13a Localisation updates from https://translatewiki.net. 2014-08-06 16:50:27 +02:00
Tom Hughes
2e29168986 Precompile expressInstall.swf 2014-08-06 08:58:47 +01:00
Tom Hughes
3ca29a8dc7 Precompile iD locales 2014-07-25 18:44:57 +01:00
Sunah Suh
5b2ab22e78 Remove myopenid from openid providers 2014-07-24 22:13:19 +01:00
Tom Hughes
0b9bf8d816 Force the path to be treated as UTF-8 2014-07-22 15:13:36 +01:00
Tom Hughes
c53db246f6 Merge branch 'rails41' 2014-07-21 08:53:44 +01:00
Florian M. Schäfer
7764f6fc28 Added wikidata links to the browse helper 
Analogous to wikipedia tags this links any wikidata tag with its item
page on wikidata.

For now it's restricted to the plain wikidata=* tag (namespaces like
operator:wikidata=* and similar are not yet supported) and only accepts
the values with the format Q<number>.
 2014-07-20 15:02:01 +01:00
Tom Hughes
6a198d47aa Make sure all environment can see asset precompilation rules 2014-07-04 19:24:25 +01:00
Tom Hughes
17ce58df35 Update postgres connection adaptor patches 2014-07-04 19:24:25 +01:00
Tom Hughes
bd402599f5 Update to rails 4.1.1 2014-07-04 19:24:25 +01:00
Tom Hughes
4ef3a884d0 Fix database offline mode 2014-07-02 11:07:52 +01:00
Siebrand Mazeland
9428eb7723 Localisation updates from https://translatewiki.net. 2014-06-23 12:44:35 +00:00