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

1711 commits

Author SHA1 Message Date
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
Tom Hughes
1a0728ec7b Remove unused namefinder support from the geocoder backend 2012-09-18 11:54:11 +01:00
Martijn van Exel
5f0c590c32 Add a banner for SOTM US 2012-09-16 16:20:53 +01:00
Tom Hughes
42b20c5e0f Fix interpolation errors 2012-09-16 15:17:17 +01:00
Siebrand Mazeland
73b2a01ace Localisation updates from http://translatewiki.net. 2012-09-16 02:35:34 +00:00
Gnonthgol
fcddf920a3 Remove the "We are changing the license" flash on the login page 2012-09-14 15:24:36 +01:00
Tom Hughes
686ce8f3e5 Fix interpolation issues in attribution text 2012-09-13 09:56:26 +01:00
Tom Hughes
f954dd9e86 Fix incorrect heading in copyright page 2012-09-12 14:02:39 +01:00
Tom Hughes
9d61bd797f Improve attribution/license details on printouts 2012-09-12 09:25:07 +01:00
Tom Hughes
03a8467a82 Remove some unused i18n resources 2012-09-12 09:15:01 +01:00
Tom Hughes
04ea0d4db9 Update some license references to refer to ODbL 2012-09-12 09:14:29 +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
Richard Fairhurst
a302ddeb8a New /copyright page for ODbL 2012-09-12 08:37:09 +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
7f95920380 Fix incorrect interpolation variables 2012-09-08 15:19:38 +01:00
Tom Hughes
3787918d68 Remove SOTM advert 2012-09-08 14:32:27 +01:00
Siebrand Mazeland
55f0402471 Localisation updates from http://translatewiki.net. 2012-09-08 11:56:40 +00:00
John Firebaugh
8ec415b060 Use a param to trigger export rather than a separate action 
In site/_resize.html.erb and site/_search.html.erb, a
params[:action] conditional is used to include code that
should only run on the index action -- but it should be run
on the export action too. Cleanest fix is to eliminate that
action entirely.
 2012-09-07 09:27:59 +01:00
Tom Hughes
2fac41bf93 Fix incorrect interpolation variables 2012-09-03 08:54:23 +01:00
Siebrand Mazeland
960ae1773c Localisation updates from http://translatewiki.net. 2012-09-01 11:28:06 +00:00
Tom Hughes
81336c4a87 Monkey patch I18n::JS to ensure translations are in a fixed order 
Without this the result of converting the hash to JSON can vary
which causes different hashes for the result JS asset.

This is only an issue with ruby 1.8 as ruby 1.9 hashes behave like
the ActiveSupport::OrderedHash and enumerate in insertion order.
 2012-08-31 11:51:58 +01:00
Tom Hughes
815c98c977 Select which key entries to show on the client 
Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.
 2012-08-31 10:29:32 +01:00
Tom Hughes
721aaae777 Remove unused osmarender key data 2012-08-31 10:03:31 +01:00
Siebrand Mazeland
6d76f89e5c Localisation updates from http://translatewiki.net. 2012-08-28 10:01:13 +00:00
John Firebaugh
5aa09fbfd0 Use a standard application.js bundle 
Include map.js and menu.js in the bundle.
 2012-08-27 20:31:17 +01:00
Tom Hughes
7ad58d1411 Switch to using i18n-js for handling translations in javascript 2012-08-27 18:00:03 +01:00
Siebrand Mazeland
9638d6ea7f Localisation updates from http://translatewiki.net. 2012-08-25 21:24:42 +00:00
Tom Hughes
ea63736b5c Add an entry to the edit menu for turning on the notes layer 2012-08-22 21:50:48 +01:00
Tom Hughes
6206ab7fe7 Add OpenLayers.Format.QueryStringFilter to the OpenLayers build 2012-08-22 21:50:48 +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
fe16fec000 Start rewriting the notes layer for the front page 2012-08-22 20:37:09 +01:00
Siebrand Mazeland
f7f3cddd1b Localisation updates from http://translatewiki.net. 2012-08-19 16:18:23 +00:00
Tom Hughes
573991e5a9 Fixup make_friend and remove_friend properly 
Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.
 2012-08-15 20:13:14 +01:00
Tom Hughes
69fb269f26 Fix incorrect interpolation variables 2012-08-14 22:56:28 +01:00
Tom Hughes
740ba0dd38 Require POST for make_friend and remove_friend 
Note that this breaks the make_friend link in friend notfication
emails, but it will do as a temporary measure.
 2012-08-14 22:49:52 +01:00
Siebrand Mazeland
250fbf556a Localisation updates from http://translatewiki.net. 2012-08-12 18:25:26 +00:00
Tom Hughes
491da05584 Fix incorrect interpolation variable 2012-08-10 08:42:10 +01:00
Tom Hughes
fbabed694b Improve blocks on/by links on user pages 
All block related links are now only shown if the user has given
or received any blocks, and include a count of active blocks.
 2012-08-10 08:27:37 +01:00
Siebrand Mazeland
378dd2222c Localisation updates from http://translatewiki.net. 2012-08-09 14:07:45 +00:00
Tom Hughes
3445f447cd Add a SOTM advert to the sidebar 2012-08-08 21:37:29 +01:00
Tom Hughes
7f661ec55e Make things a bit more readable 2012-08-07 22:58:03 +01:00
Tom MacWright
f08259a529 Improve styling of inbox counter in greeting bar 2012-08-07 22:57:41 +01:00
Tom Hughes
5baa6a15e6 Update precompile lists for changes to OpenLayers styles 2012-08-02 22:28:55 +01:00
Tom Hughes
e885c1249b Break up the "copyright and license" text into smaller pieces 2012-08-02 21:40:12 +01:00
Tom Hughes
17cbdb3698 Fix broken interpolation variables 2012-08-02 19:39:48 +01:00
Siebrand Mazeland
3d23e34318 Localisation updates from http://translatewiki.net. 2012-08-02 11:46:01 +00:00
Tom Hughes
f9528a7464 Improve "no traces" message 2012-08-01 10:56:19 +01:00
Steve Singer
d2db785a2a Replace raw with a translation with the html suffix 2012-07-31 22:56:51 +01:00
Steve Singer
69d91bf24a Navigation changes to the GPX traces page 
Display a better message when no traces are present and only
display the paging links when multiple pages exist.
 2012-07-31 22:56:44 +01:00
Tristen Brown
51079ecafb Show a helpful message when there are no changesets to display 2012-07-31 21:44:22 +01:00