Commit graph

6943 commits

Author SHA1 Message Date
Tom Hughes
75a32ff879 Fix broken translations 2015-01-10 15:59:19 +00:00
Tom Hughes
25337c0b04 Use assert_dom_equal to compare HTML text 2015-01-10 15:59:09 +00:00
Tom Hughes
0d7f7944bb Fix invalid CSS selectors 2015-01-10 15:58:30 +00:00
Tom Hughes
316ebb7570 Don't pass ActiveRecord objects to find and exists? 2015-01-10 12:41:16 +00:00
Tom Hughes
6af8f8a9e3 Fix invalid CSS selectors 2015-01-10 12:41:09 +00:00
Tom Hughes
5781674c1b Remove unused performance test stub 2015-01-10 12:41:04 +00:00
Tom Hughes
3058135d9a Update to rails 4.1.9 2015-01-08 10:06:22 +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
716846b480 Update Potlatch 2 to 2.3-650-gad99430 build 2014-12-20 11:41:47 +00:00
Bryan Housel
068471fc0e Don't raise APIAlreadyDeletedError when deleting with if-unused
related: openstreetmap/iD#2475
2014-12-15 23:39:46 -05:00
Tom Hughes
4e6fe811a0 Don't render the offline page for XHR requests 2014-12-14 00:32:50 +00:00
Tom Hughes
2b823b7b07 Make development mode work when the database is offline 2014-12-14 00:27:48 +00:00
Tom Hughes
281dc29c5c Disable the "add note" button in database offline mode 2014-12-14 00:27:31 +00:00
Tom Hughes
a6c24e3e5b Query mode doesn't need the database 2014-12-14 00:18:46 +00:00
Tom Hughes
1bfc96ec76 Update bundle 2014-12-08 08:02:00 +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
David Gumberg
b1a1d45576 Losslessly compressed all images using optipng and advpng 2014-12-07 16:36:39 -08:00
Richard Fairhurst
3e9080ac57 Merge pull request #26 from karussell/patch-2
Using HTTPS for GraphHopper
2014-12-06 17:11:04 +00:00
Peter
60dfcbda9a Using HTTPS for GraphHopper
this avoids information leaking if used via https://openstreetmap.org and it should not be a problem when using via the HTTP variant
2014-12-06 18:09:18 +01:00
Sean Hussey
f2c23d1d91 Fix typo 2014-12-03 11:24:07 -05:00
Tom Hughes
36592f72bc Fix exception when message limit is hit 2014-12-02 21:29:12 +00:00
Tom Hughes
b00b156ef4 Prefer a key=value match over a key only match for object descriptions 2014-11-24 11:00:24 +00:00
Tom Hughes
4d44f188e1 Include number of recent diary entries in spam scoring 2014-11-20 21:18:00 +00:00
Tom Hughes
3dbc55fc16 Make sure button_to buttons are separated by whitespace 2014-11-19 00:21:58 +00:00
Tom Hughes
eb6b1ae733 Don't paginate redactions
The index view doesn't render any pagination controls, and there
aren't enough redactions for pagination to be necessary yet.

Fixes #735
2014-11-19 00:11:51 +00:00
Tom Hughes
a994f5df0b Update ohauth 2014-11-18 17:58:45 +00:00
Tom Hughes
557dcd8614 Update jQuery plugins 2014-11-18 17:57:21 +00:00
Tom Hughes
ab671bd1e1 Update html5shiv 2014-11-18 17:57:09 +00:00
Tom Hughes
aeb524095c Update vendor URLs 2014-11-18 17:56:42 +00:00
Tom Hughes
33bcb2e088 Update attribution for embedded maps
Fixes #838
2014-11-18 17:41:45 +00:00
Tom Hughes
dc9f779c30 Update to rails 4.1.8 2014-11-17 19:09:22 +00:00
Siebrand Mazeland
1f956adb81 Localisation updates from https://translatewiki.net. 2014-11-14 13:56:13 +01:00
Richard Fairhurst
e94f251de5 Merge pull request #25 from zerebubuth/routing-ui-tweaks
Routing UI tweaks
2014-11-12 18:32:04 +00:00
Tom Hughes
89af923605 Stringify user ID 2014-11-12 09:44:21 +00:00
Matt Amos
91930aa4a5 Consolidated list highlight colours to one parameter. 2014-11-10 20:05:54 +00:00
Matt Amos
e3062aa794 Made top & bottom spacing in directions list consistent. 2014-11-10 19:59:02 +00:00
Matt Amos
4734b9ce5d Added some vertical space in the routing text input boxes. 2014-11-10 19:36:43 +00:00
Matt Amos
3a9db4cf30 Use buttons for switching to/from directions.
Previously, used a small text link which wasn't very usable. Now
it uses larger buttons which are (hopefully) more usable. Also
this sorts out the weird right-hanging text boxes for the to/from
in the directions sidebar - now they look like proper text input
boxes.

However, the "back to search" button and the directions submit
buttons are weirdly large and I don't quite understand why.
Hopefully an easy fix for someone who knows the arcana of CSS
better than I.
2014-11-10 19:17:21 +00: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
ac2f9308b9 Update to rails 4.1.7 2014-11-09 22:41:12 +00:00
Tom Hughes
08a0fc90e3 Track users in piwik 2014-11-09 22:41:01 +00:00
Tom Hughes
4abb666ef0 Handle unknown admin_level values 2014-11-07 19:17:34 +00:00
Tom Hughes
526ff06172 Allow query mode to be turned off at low zoom
Fixes #830
2014-11-07 15:58:05 +00:00
Tom Hughes
2992564276 Look for locale specific names 2014-11-07 15:19:30 +00:00
Tom Hughes
cddec72be5 Don't do the admin boundary special case unless admin_level is set 2014-11-07 15:00:22 +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
Paul Norman
4877799160 Link to Phusion Passenger docs for production
Phusion Passenger has documentation for common web servers, so we can
link to them, as most users will be using one of them in production.
2014-11-07 08:23:47 +00:00