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

2192 commits

Author SHA1 Message Date
Tom Hughes
88f8544d8c Monkey patch the port number in the rack request 
https://github.com/phusion/passenger/issues/1421
 2015-03-10 12:10:12 +00:00
Tom Hughes
dbba67450a Fix offline mode 2015-03-09 20:54:33 +00:00
Tom Hughes
7fef0353f2 More test work 2015-03-08 00:48:13 +00:00
Tom Hughes
15b550182c Yet more tests... 2015-03-02 21:20:01 +00:00
Tom Hughes
e2609b9758 Remove unused code 2015-03-02 00:07:13 +00:00
Tom Hughes
1891efef06 Testing, testing, testing... 2015-03-01 23:05:32 +00:00
Tom Hughes
9fb8f5a84b Drop the old output_compression plugin 
The production servers all have mod_deflate enabled anyway, which
almost certainly does a better job of compression than this.
 2015-03-01 10:52:28 +00:00
Tom Hughes
fa3ccdfd49 Fix OSRM directions issues 
Don't rely on trailing spaces in translation strings as they
aren't reliably preserved, and make "exit" translatable.

Fixes #915
 2015-02-27 17:00:28 +00:00
Tom Hughes
e434cb154c Convert OpenID authentication to generic third party authentication 2015-02-25 01:07:23 +00:00
Tom Hughes
eaf4b32a7f Rework OpenID tests for new flows using OmniAuth mocking 2015-02-25 01:07:23 +00:00
Tom Hughes
b0150caee6 Convert OpenID authentication to use OmniAuth 2015-02-25 01:07:23 +00:00
Tom Hughes
6d124f8012 Fix some more JSHint issues 2015-02-24 00:30:25 +00:00
Tom Hughes
bd2e999756 Move some javascript functions out of global scope 2015-02-24 00:19:08 +00:00
Tom Hughes
6671a934bf Add JSHint support 2015-02-23 21:45:57 +00:00
Tom Hughes
9e160ec176 Move memcached for caching if enabled regardless of environment 2015-02-22 19:21:34 +00:00
Tom Hughes
2c262b9bb4 Add travis configuration 2015-02-22 19:21:33 +00:00
Tom Hughes
8e404f3a46 Fix some more rubocop style issues 2015-02-20 20:39:52 +00:00
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
5cbd4038ed Fix rubocop style issues 2015-02-20 08:56:16 +00:00
Tom Hughes
ef7f3d800c Fix most auto-correctable rubocop issues 2015-02-20 08:56:16 +00:00
Tom Hughes
34e3e51456 Cleanup trailing whitespace 2015-02-20 08:56:16 +00:00
Minh Nguyễn
ab24163f45 Fixed a typo 
Admininstration → Administration
 2015-02-19 23:44:06 -08:00
Tom Hughes
27e0084e8f Rename new en-gb locale to en-GB 2015-02-19 16:14:58 +00:00
Siebrand Mazeland
8724ca1f9b Localisation updates from https://translatewiki.net. 2015-02-19 13:19:56 +01:00
Tom Hughes
2b7529a3f1 Update example configuration 2015-02-16 22:14:05 +00:00
Tom Hughes
250bb47cc2 Merge remote-tracking branch 'systemed/routing' 2015-02-16 08:30:29 +00:00
Tom Hughes
d5e90c0d87 Add asset wrappers for iD 2015-02-11 19:18:13 +00:00
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