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

1912 commits

Author SHA1 Message Date
Tom Hughes
8f02fe8269 Update to CPK 5.0.10 and remove monkey patch 2012-11-22 09:10:04 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Siebrand Mazeland
de1988d2cc Localisation updates from http://translatewiki.net. 2012-11-20 12:49:40 +00:00
Siebrand Mazeland
735af4cd2b Localisation updates from http://translatewiki.net. 2012-11-20 12:06:12 +00:00
Tom Hughes
d68368e0d5 Rework RTL handling to keep rules together 2012-11-19 10:39:30 +00:00
Tom Hughes
2cecfa7d01 Configure CORS to allow GET and POST to /oauth 2012-11-16 22:28:52 +00:00
Tom Hughes
44528ffe0f Don't use hard coded value in "one" pluralization rule 
French uses the "one" rule for zero as well as one (if there is no
explicit zero rule) so make sure we use %{count} there.

Also made the same change to English, and added an explcit zero rul.
 2012-11-15 15:22:56 +00:00
Tom Hughes
9bc3196dee Monkey patch field_changed? support until CPK is updated 2012-11-12 19:15:20 +00:00
Eric Theise
789e0dffd0 Fixing typo and outdated information 2012-11-12 09:47:17 +00:00
Tom Hughes
4cf82d1baa Fix interpolation variables 2012-11-10 19:52:30 +00:00
John Firebaugh
6054eea238 Bundle leaflet css in a single asset 2012-11-09 12:59:29 -08:00
John Firebaugh
fe6e837cfe Replace leaflet.draw with leaflet-locationfilter 2012-11-09 12:59:28 -08:00
John Firebaugh
1caf40a2a2 Precompile leaflet CSS 2012-11-09 12:59:27 -08:00
Siebrand Mazeland
a15bfa2ff8 Localisation updates from http://translatewiki.net. 2012-11-07 12:11:28 +00:00
Tom Hughes
6aaaf5dddb Rework signup emails a bit 
Remove "lego" strings and try and reduce duplication between the
text and HTML versions of the mails.
 2012-11-05 09:54:58 +00:00
Tom Hughes
b7b68aee36 Simplify handling of verified emails in OpenID signup 
Also make sure that all paths that lead to OpenID based signup
will notice a verified email properly.
 2012-10-30 21:43:38 +00:00
Kai Krueger
104727f889 Trust Google and Yahoo to return valid email addresses 
Both Google and Yahoo guarantee that the email address they return
during the OpenID authentication are emails that they have already
verified:

  http://stackoverflow.com/q/5639419

Therefore special case these OpenID providers and automatically
activate the new users account without requiring a separate email
verification step.

This therefore reduces the signup procedure by one step and makes
it easier for new users of these OpenID providers, which cover the
majority of users.
 2012-10-30 19:14:45 +00:00
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