Commit graph

1945 commits

Author SHA1 Message Date
Siebrand Mazeland
2074f4604f Localisation updates from http://translatewiki.net. 2012-10-27 13:37:36 +00:00
Grant Slater
49666ecf11 Revert "Add SoTM Scotland banner"
This reverts commit 749caaff73.
2012-10-22 21:07:22 +01:00
John Firebaugh
7751973871 Allow cross-origin requests to API 2012-10-22 19:11:52 +01:00
Siebrand Mazeland
2c3e6ae1f7 Localisation updates from http://translatewiki.net. 2012-10-20 16:19:22 +00:00
Grant Slater
749caaff73 Add SoTM Scotland banner 2012-10-18 19:00:25 +01:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +01:00
Tom Hughes
3fb931f9a8 Merge branch 'master' into notes 2012-10-15 22:38:13 +01:00
Tom Hughes
bfcc3235c5 Remove SOTM US advert 2012-10-15 19:15:54 +01:00
Siebrand Mazeland
5c693d5471 Localisation updates from http://translatewiki.net. 2012-10-15 11:10:25 +00:00
Tom Hughes
c6be5f3a6f Fix up issues with notes in the data browser 2012-10-14 16:01:37 +01:00
Tom Hughes
9d90474675 Remove unused translations 2012-10-14 16:01:36 +01:00
Tom Hughes
d57755b737 Allow commenting on, and closing of, notes from the web site 2012-10-14 16:01:35 +01:00
Tom Hughes
92ce228cbe Get note comment notification working again 2012-10-14 16:01:34 +01:00
Tom Hughes
28b4c624b8 Use named routes in note RSS builder 2012-10-14 13:52:58 +01:00
Tom Hughes
361906af9e Localise notes interface 2012-10-14 13:52:54 +01:00
Tom Hughes
e3d5e3da52 Refactor notes code to work with recent site changes 2012-10-13 17:16:07 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
2012-10-13 15:55:34 +01:00
Richard Fairhurst
012d5b69c6 Provide example of correct attribution 2012-10-12 21:06:56 +01:00
Siebrand Mazeland
d20cbd3c5c Localisation updates from http://translatewiki.net. 2012-10-07 22:08:10 +00:00
Tom Hughes
32a9bb9f47 Split long line 2012-10-06 00:13:54 +01:00
John Firebaugh
7f6320ed10 Move diary entry JS to page-specific script file 2012-10-06 00:03:24 +01:00
John Firebaugh
04887011d4 Eliminate interpolation in diary entry JS 2012-10-06 00:02:42 +01:00
John Firebaugh
dd1ec4eb9b Move user JS to page-specific script file
In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.
2012-10-05 22:24:41 +01:00
John Firebaugh
898bc32f48 Move changeset JS to page-specific script file 2012-10-05 15:20:26 +01:00
Tom Hughes
1ea1e40272 Add Polish translations to OpenLayers configuration. 2012-10-05 08:55:18 +01:00
Siebrand Mazeland
c6e267f2bd Localisation updates from http://translatewiki.net. 2012-10-02 13:13:29 +00:00
Tom Hughes
05b4406c14 Remove monkey patch for I18n which is no longer needed 2012-09-30 14:07:41 +01:00
John Firebaugh
7c5d0fff3d Move browse JS to page-specific script file 2012-09-30 12:14:25 +01:00
John Firebaugh
605c700895 Clean up search JS
Move it to index.js/edit.js and eliminate the global doSearch
function. Not enough code is shared to justify it.
2012-09-30 12:05:24 +01:00
John Firebaugh
e83d43ca82 Move edit JS to page-specific script file 2012-09-30 11:59:49 +01:00
John Firebaugh
352f2a1671 Move index JS to page-specific script file 2012-09-29 18:00:04 +01:00
John Firebaugh
43243e4c92 Eliminate interpolation in index JS 2012-09-29 18:00:04 +01:00
Siebrand Mazeland
e9ff13dc9c Localisation updates from http://translatewiki.net. 2012-09-24 18:49:53 +00:00
Tom Hughes
3ce4de1295 Add a /api/0.6/user/NNNN call to the API 2012-09-24 18:44:11 +01:00
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