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

2109 commits

Author SHA1 Message Date
Siebrand Mazeland
53d2b6e72d Localisation updates from https://translatewiki.net. 2013-12-23 20:23:19 +00:00
Siebrand Mazeland
822496fd9f Localisation updates from https://translatewiki.net. 2013-12-20 11:05:55 +00:00
Tom Hughes
41d02225d2 Add details for Finland to copyright page 2013-12-19 17:30:15 +00:00
Siebrand Mazeland
7ef23078df Localisation updates from https://translatewiki.net. 2013-12-17 09:01:42 +00:00
Tom Hughes
6ff6b2f527 Change "My Inbox" to "My Messages" in user menu 
Fixes #661
 2013-12-15 22:41:57 +00:00
Richard Fairhurst
48c2031868 Fix typo 
restauraunt => restaurant
 2013-12-12 09:58:19 +00:00
Tom Hughes
44f89c049c Remove export rule for translations which no longer exist 2013-12-09 09:29:21 +00:00
Tom Hughes
24893c0936 Update page title when switching to the front page view 
Fixes https://trac.openstreetmap.org/ticket/5063
 2013-12-09 09:28:13 +00:00
Tom Hughes
de9d26c7df Drop redundant monkey patches 2013-12-08 22:49:31 +00:00
Tom Hughes
4395ed6117 Fix untranslatable string 2013-12-08 11:02:43 +00:00
Roland Olbricht
83b3db9974 Improve display of alternative download sources 
Makes the list of alternative sources displayed all the time
rather than just when the bounding box is too large, and adds
the Overpass API to the list of sources.

Fixes #606
Fixed #635
 2013-12-07 14:56:47 +00:00
Tom Hughes
70be43201a Make title of "More" menu translatable 2013-12-07 11:24:44 +00:00
Tom Hughes
2366ecba77 Fix interpolation variable errors 2013-12-07 11:16:02 +00:00
Siebrand Mazeland
1467d82458 Localisation updates from https://translatewiki.net. 2013-12-07 11:08:37 +00:00
Tom Hughes
0162e94592 Fix translation interpolations 2013-12-05 22:35:21 +00:00
Siebrand Mazeland
b7b76e8463 Localisation updates from https://translatewiki.net. 2013-12-05 22:14:38 +00:00
Tom Hughes
cc4bca22b0 Update to rails 4.0.2 2013-12-03 21:09:10 +00:00
John Firebaugh
944f3ebb67 Remove map data size warning (#592) 2013-12-03 19:38:26 +00:00
Tom Hughes
e418075e26 Replace some legacy routes with redirects 2013-12-03 19:08:21 +00:00
Tom Hughes
f3f31d3bea Remove unused strings 2013-12-02 19:28:51 +00:00
Tom Hughes
f42af6d47e Removed bogus translation 2013-12-02 09:10:10 +00:00
Siebrand Mazeland
1999e94186 Localisation updates from https://translatewiki.net. 2013-12-02 08:40:42 +00:00
Tom Hughes
aff0583a34 Drop monkey patch now we're using option style redirects 
Option style redirects escape path parameters correctly, so we
can drop out monkey patch.
 2013-12-01 20:54:52 +00:00
Tom Hughes
61bb31ebdd Preserve the bounding box when redirecting history URLs 
Using the options style for the redirect seems to cause parameters
to be preserved, which the path style of redirect does not.
 2013-12-01 19:59:57 +00:00
Tom Hughes
3b6580297f Rename changed translation to avoid test failures 2013-12-01 09:11:59 +00:00
Siebrand Mazeland
73341cfefd Localisation updates from https://translatewiki.net. 2013-11-30 18:36:16 +00:00
Tom Hughes
e73a770d81 Remove monkey patch which has been merged upstream in rails 4 2013-11-30 14:02:49 +00:00
Tom Hughes
309831a619 Monkey patch escaping in redirect routes 
The correct method of escaping depends on whether the parameter
is being substituted in the path or the query, but all our ones
are substitued in the path so use URI.escape instead of the
standard Rack::Utils.escape which does query escaping.

https://github.com/rails/rails/issues/13110
 2013-11-30 13:53:48 +00:00
Tom Hughes
a9f4549327 Tidy up the OAuth authorization screens 
Make sure all messages are translatable, separate errors from
user initiated denial of authorization.
 2013-11-30 12:25:22 +00:00
Tom Hughes
bfd11bf79a Change "Copyright & License" to "Copyright" and move it left 2013-11-30 10:51:43 +00:00
Tom Hughes
d375caf7a3 Update to CPK 6.0.1 and drop monkey patch 2013-11-30 10:28:41 +00:00
Tom Hughes
e0028d8639 Add a title for hidden notes 2013-11-28 20:23:50 +00:00
Tom Hughes
832969fddd Add hidden_by message for notes hidden by moderators 2013-11-28 19:06:17 +00:00
Tom Hughes
68a3df4d53 Merge branch 'redesign' 
Conflicts:
	app/assets/stylesheets/common.css.scss
 2013-11-28 17:30:53 +00:00
Tom Hughes
fb9b4edcdd Add tests for new redirects and fix a few bugs in the redirects 2013-11-28 08:56:52 +00:00
Tom Hughes
3cd5f45e08 Simplify browse routes and make routes more consistent 
This gets rid of the /browse/ prefix and uses /history consistently
for all routes that show a list of changesets.
 2013-11-28 00:14:07 +00:00
Tom Hughes
272a708b0f Format browse page titles in a consistent way 2013-11-24 16:55:56 +00:00
John Firebaugh
bbc72e26bc Tweak welcome text 2013-11-22 12:29:45 -08:00
Siebrand Mazeland
5a26a23cda Localisation updates from http://translatewiki.net. 2013-11-21 06:52:31 +00:00
John Firebaugh
b5825b2f64 Sign Up -> Start Mapping 2013-11-19 15:02:31 -08:00
John Firebaugh
826ab544b1 Logout -> Log Out 2013-11-19 14:59:25 -08:00
John Firebaugh
d0de36b607 Refine changeset browse behavior 
The general history view shows changesets in the current view
and updates when you move the map. The view for an individual
user, nearby users, or friends zooms the map to the extent of
the results, and doesn't change when you move the map.
 2013-11-19 12:10:14 -08:00
Aaron Lidman
a5e8b4cb88 Improved export warning, removed heading 2013-11-19 11:57:30 -08:00
John Firebaugh
e91956d0f7 Fix test failures 2013-11-19 10:30:18 -08:00
John Firebaugh
44629832dd Merge branch 'master' into redesign 
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
 2013-11-19 09:42:47 -08:00
Siebrand Mazeland
0b7deb6375 Localisation updates from http://translatewiki.net. 2013-11-19 06:57:29 +00:00
John Firebaugh
6929566543 Shorten intro text 2013-11-18 18:04:05 -08:00
John Firebaugh
2b4f8e92c9 Merge branch 'master' into redesign 
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
 2013-11-15 16:47:49 -08:00
Aaron Lidman
e62bac06ed Improved noteLayer and dataLayer availability, closes #65 2013-11-15 15:06:44 -08:00
John Firebaugh
dc82421f56 Adjustments to about page and welcome copy 2013-11-15 15:04:46 -08:00