]> git.openstreetmap.org Git - rails.git/log
rails.git
14 years agoLocalisation updates from translatewiki.net (2009-10-10)
Translatewiki [Sat, 10 Oct 2009 19:19:58 +0000 (19:19 +0000)]
Localisation updates from translatewiki.net (2009-10-10)

14 years agoDisplay user's email addresses and the IP address used to create
Tom Hughes [Fri, 9 Oct 2009 15:45:01 +0000 (15:45 +0000)]
Display user's email addresses and the IP address used to create
their account to people that are logged in as administrators.

14 years agoFix tests which do logins to handle the cookie test.
Tom Hughes [Fri, 9 Oct 2009 09:13:13 +0000 (09:13 +0000)]
Fix tests which do logins to handle the cookie test.

14 years agoTest that the user has cookies enabled at critical points where we
Tom Hughes [Fri, 9 Oct 2009 08:47:47 +0000 (08:47 +0000)]
Test that the user has cookies enabled at critical points where we
are about to require them and warn the user if they are not enabled.

14 years agolocalisation updates from translatewiki.net (2009-10-08)
Translatewiki [Thu, 8 Oct 2009 22:11:35 +0000 (22:11 +0000)]
localisation updates from translatewiki.net (2009-10-08)

14 years agolocalisation updates from translatewiki.net (2009-10-08)
Translatewiki [Thu, 8 Oct 2009 21:39:07 +0000 (21:39 +0000)]
localisation updates from translatewiki.net (2009-10-08)

14 years agoFix output of javascript strings - use english strings to walk the
Tom Hughes [Thu, 8 Oct 2009 12:25:55 +0000 (12:25 +0000)]
Fix output of javascript strings - use english strings to walk the
tree but output strings in the correct locale. Closes #2362.

14 years ago* localisation updates from translatewiki.net (2009-10-07)
Translatewiki [Tue, 6 Oct 2009 23:03:08 +0000 (23:03 +0000)]
* localisation updates from translatewiki.net (2009-10-07)

14 years ago* localisation updates from translatewiki.net (2009-10-07)
Translatewiki [Tue, 6 Oct 2009 22:57:32 +0000 (22:57 +0000)]
* localisation updates from translatewiki.net (2009-10-07)
* new languages: Czech (cs)

14 years agoRename .htaccess to htacess.example to stop it causing problems when
Tom Hughes [Tue, 6 Oct 2009 17:29:44 +0000 (17:29 +0000)]
Rename .htaccess to htacess.example to stop it causing problems when
the directives in it are not allowed.

14 years agoRemove hack that was needed to cope with our old asset tagging but
Tom Hughes [Tue, 6 Oct 2009 17:26:51 +0000 (17:26 +0000)]
Remove hack that was needed to cope with our old asset tagging but
which now does nothing except break installation in subdirectories.

14 years agoUse relative URLs in the stylesheet so we can run in a subdirectory.
Tom Hughes [Tue, 6 Oct 2009 17:24:38 +0000 (17:24 +0000)]
Use relative URLs in the stylesheet so we can run in a subdirectory.

14 years agoFixed bug in _blocks partial when used by the index view.
Matt Amos [Tue, 6 Oct 2009 14:19:54 +0000 (14:19 +0000)]
Fixed bug in _blocks partial when used by the index view.

14 years agoMerge blocking branch to head.
Tom Hughes [Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)]
Merge blocking branch to head.

14 years agoAdd parentheses to avoid warning.
Tom Hughes [Mon, 5 Oct 2009 20:28:15 +0000 (20:28 +0000)]
Add parentheses to avoid warning.

14 years agoMerge 17944:17988 from trunk.
Tom Hughes [Mon, 5 Oct 2009 20:25:45 +0000 (20:25 +0000)]
Merge 17944:17988 from trunk.

14 years agoOS7 tile layer support
Richard Fairhurst [Mon, 5 Oct 2009 12:36:01 +0000 (12:36 +0000)]
OS7 tile layer support

14 years agostill tidy properties when icon has changed
Richard Fairhurst [Mon, 5 Oct 2009 11:50:24 +0000 (11:50 +0000)]
still tidy properties when icon has changed

14 years ago* localisation updates from translatewiki.net (2009-10-05)
Translatewiki [Mon, 5 Oct 2009 08:20:20 +0000 (08:20 +0000)]
* localisation updates from translatewiki.net (2009-10-05)
* svn:eol-style native

14 years agoAnother update for ru.yml. If this does not work, please let me know. Would also...
Translatewiki [Sun, 4 Oct 2009 11:35:49 +0000 (11:35 +0000)]
Another update for ru.yml. If this does not work, please let me know. Would also like to get rid of the leading newlines...

14 years agoFix syntax error in r17978
Translatewiki [Sun, 4 Oct 2009 11:32:30 +0000 (11:32 +0000)]
Fix syntax error in r17978

14 years agoLocalisation updates from translatewiki.net (2009-10-04)
Translatewiki [Sun, 4 Oct 2009 11:28:57 +0000 (11:28 +0000)]
Localisation updates from translatewiki.net (2009-10-04)

14 years agoLocalisation updates from translatewiki.net (2009-10-04)
Translatewiki [Sun, 4 Oct 2009 11:10:29 +0000 (11:10 +0000)]
Localisation updates from translatewiki.net (2009-10-04)

14 years agoMake Mail/Revert in History dialog i18n-able
Ævar Arnfjörð Bjarmason [Sun, 4 Oct 2009 08:40:37 +0000 (08:40 +0000)]
Make Mail/Revert in History dialog i18n-able

14 years agoSynced from Translatewiki. Including one new language (gl)
Ævar Arnfjörð Bjarmason [Sun, 4 Oct 2009 07:54:27 +0000 (07:54 +0000)]
Synced from Translatewiki. Including one new language (gl)

14 years agoModify the existing i18n() javascript function to lookup strings in
Tom Hughes [Fri, 2 Oct 2009 23:41:19 +0000 (23:41 +0000)]
Modify the existing i18n() javascript function to lookup strings in
the javascript i18n array as well as expanding arguments, and make all
lookups go through it.

14 years agoMove javascript translations to a separate key based on the path to
Tom Hughes [Fri, 2 Oct 2009 23:33:17 +0000 (23:33 +0000)]
Move javascript translations to a separate key based on the path to
the javascript file that uses them and amend the layout to automatically
find and output all javascript strings.

14 years agoThere is no need to translate the names of layers which are not shown
Tom Hughes [Fri, 2 Oct 2009 23:03:42 +0000 (23:03 +0000)]
There is no need to translate the names of layers which are not shown
in the layer switcher.

14 years agoSynced from Translatewiki
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:58:59 +0000 (20:58 +0000)]
Synced from Translatewiki

14 years agoFollow up to [17948]: Make the layer switcher translatable too!
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:39:47 +0000 (20:39 +0000)]
Follow up to [17948]: Make the layer switcher translatable too!

14 years agoSome of our JavaScript files have UI messages but we don't want to
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:19:28 +0000 (20:19 +0000)]
Some of our JavaScript files have UI messages but we don't want to
make them dynamic.

So I'm creating a globally scoped JavaScript array called rails_i18n
which holds some of these messages. It's loaded in <head> before any
of the JavaScript files so it should always be available.

14 years agoMerging 17905:17944 from trunk.
Matt Amos [Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)]
Merging 17905:17944 from trunk.

14 years agoAdd parentheses to avoid warnings.
Tom Hughes [Fri, 2 Oct 2009 14:40:25 +0000 (14:40 +0000)]
Add parentheses to avoid warnings.

14 years agoAmend [17942]:
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 13:04:47 +0000 (13:04 +0000)]
Amend [17942]:

 * Center-align donation text
 * Add title="" to the donate link
 * Use an official cc_button.png from http://1.1.1.1/bmi/i.creativecommons.org/l/by-sa/2.0/88x31.png that doesn't include English text
 * Add rel=license to license link as suggested by CC
 * Add width/height to CC button

14 years agoReplace the donate button with a text version that can be translated.
Tom Hughes [Fri, 2 Oct 2009 12:29:44 +0000 (12:29 +0000)]
Replace the donate button with a text version that can be translated.

14 years agoLocalisation updates from translatewiki.net (2009-10-02)
Translatewiki [Fri, 2 Oct 2009 11:28:35 +0000 (11:28 +0000)]
Localisation updates from translatewiki.net (2009-10-02)

14 years ago* Remove trailing newline from help_html
Translatewiki [Fri, 2 Oct 2009 11:20:57 +0000 (11:20 +0000)]
* Remove trailing newline from help_html
* Update message order

14 years agoAdding blocking to user auth bits of amf_controller. Or, at least, the bits I could...
Matt Amos [Fri, 2 Oct 2009 10:49:03 +0000 (10:49 +0000)]
Adding blocking to user auth bits of amf_controller. Or, at least, the bits I could find.

14 years agoFix wrong comment.
Matt Amos [Fri, 2 Oct 2009 10:46:19 +0000 (10:46 +0000)]
Fix wrong comment.

14 years agouse {{count}} instead of {{sent_count}} so rails plural forms will kick in
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 10:41:47 +0000 (10:41 +0000)]
use {{count}} instead of {{sent_count}} so rails plural forms will kick in

14 years agofix GPS offset
Richard Fairhurst [Fri, 2 Oct 2009 07:05:05 +0000 (07:05 +0000)]
fix GPS offset

14 years agoAdd "blocks on" and "blocks by" links to the user page when a logged
Tom Hughes [Thu, 1 Oct 2009 21:30:45 +0000 (21:30 +0000)]
Add "blocks on" and "blocks by" links to the user page when a logged
in user is looking at their own page.

14 years agoSwap two translations so they are the right way round.
Tom Hughes [Thu, 1 Oct 2009 21:13:13 +0000 (21:13 +0000)]
Swap two translations so they are the right way round.

14 years agoReplace a couple calls to inject with more readble constructs.
Tom Hughes [Thu, 1 Oct 2009 20:39:04 +0000 (20:39 +0000)]
Replace a couple calls to inject with more readble constructs.

14 years agoSet a limit on the new/edit block text area. Make it as big as diary
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:29:17 +0000 (20:29 +0000)]
Set a limit on the new/edit block text area. Make it as big as diary
comments instead of the insane default rails size of 40/20 cols/rows

14 years agoCorrect comment.
Tom Hughes [Thu, 1 Oct 2009 20:24:53 +0000 (20:24 +0000)]
Correct comment.

14 years ago * The Back link in block/id/edit wasn't translatable
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:24:36 +0000 (20:24 +0000)]
 * The Back link in block/id/edit wasn't translatable
 * New text for back links to make them more understandable

14 years agoCorrect comment.
Tom Hughes [Thu, 1 Oct 2009 20:22:52 +0000 (20:22 +0000)]
Correct comment.

14 years ago * <title> for /blocks/new/*
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:18:24 +0000 (20:18 +0000)]
 * <title> for /blocks/new/*
 * use h() to escape usernames

14 years agoAdd a route for '/blocks/new/:display_name' so links will be
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:08:13 +0000 (20:08 +0000)]
Add a route for '/blocks/new/:display_name' so links will be
'/blocks/new/Example' not '/blocks/new?display_name=Example'

14 years agoDon't bother creating the user index on user_roles as migration 48 will
Tom Hughes [Thu, 1 Oct 2009 20:04:33 +0000 (20:04 +0000)]
Don't bother creating the user index on user_roles as migration 48 will
create one on user+role that will do the same job.

Removing it here is a bit of a hack as it will not get dropped from
existing databases but as it was not given an explicit name it is hard
to write a migration to drop it.

14 years agouse h() to avoid XSS in usernames
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:02:54 +0000 (20:02 +0000)]
use h() to avoid XSS in usernames

14 years agotitle/links for revoke page
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:59:02 +0000 (19:59 +0000)]
title/links for revoke page

14 years agoOops. Mixed up heading/title
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:55:25 +0000 (19:55 +0000)]
Oops. Mixed up heading/title

14 years agotitle/heading & XSS fix for /edit
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:45:36 +0000 (19:45 +0000)]
title/heading & XSS fix for /edit

14 years agoAdd <title> to /blocks and don't Camel Case headings
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:27:15 +0000 (19:27 +0000)]
Add <title> to /blocks and don't Camel Case headings

14 years agoSet title on /blocks/:id and link to usernames
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:18:23 +0000 (19:18 +0000)]
Set title on /blocks/:id and link to usernames

14 years agoBack -> View all blocks
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:10:31 +0000 (19:10 +0000)]
Back -> View all blocks

14 years agoWhen a user hasn't made any blocks or been blocked don't display a
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:04:38 +0000 (19:04 +0000)]
When a user hasn't made any blocks or been blocked don't display a
skeleton table. Just a <p> saying there's nothing here.

14 years ago * use h() on username to avoid XSS
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:49:38 +0000 (18:49 +0000)]
 * use h() on username to avoid XSS
 * Link to username in <h1>
 * Set <title> on /blocks and /blocks_by

14 years agoMore specific alt/title text
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:42:45 +0000 (18:42 +0000)]
More specific alt/title text

14 years agoAdding title for role icons when viewing user isn't an admin, re-adding translations...
Matt Amos [Thu, 1 Oct 2009 18:09:31 +0000 (18:09 +0000)]
Adding title for role icons when viewing user isn't an admin, re-adding translations for those.

14 years agoSet title/h1 to something sensible when granting/revoking roles
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:02:08 +0000 (18:02 +0000)]
Set title/h1 to something sensible when granting/revoking roles

14 years agoAdd title="" to the revoke/grant icons that indicate what they're about to do
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 17:57:20 +0000 (17:57 +0000)]
Add title="" to the revoke/grant icons that indicate what they're about to do

14 years agoMerging 17846:17904 from trunk.
Matt Amos [Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)]
Merging 17846:17904 from trunk.

14 years agoRefactored user_role and controller. Now much more DRY.
Matt Amos [Thu, 1 Oct 2009 17:15:34 +0000 (17:15 +0000)]
Refactored user_role and controller. Now much more DRY.

14 years agoSynced from Translatewiki
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 16:48:31 +0000 (16:48 +0000)]
Synced from Translatewiki

14 years agocompile avar's latest commit
Richard Fairhurst [Thu, 1 Oct 2009 16:01:12 +0000 (16:01 +0000)]
compile avar's latest commit

14 years ago* Localisation updates from translatewiki.net (2009-10-01)
Translatewiki [Thu, 1 Oct 2009 13:42:46 +0000 (13:42 +0000)]
* Localisation updates from translatewiki.net (2009-10-01)
* svn:eol-style native

14 years agoTranslatewiki URLs changed. Adjust script to match
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 13:41:51 +0000 (13:41 +0000)]
Translatewiki URLs changed. Adjust script to match

14 years agoRichardF forgot to nuke cz.yml in [17664]. Nuking
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 13:18:45 +0000 (13:18 +0000)]
RichardF forgot to nuke cz.yml in [17664]. Nuking

14 years agoPotlatch 1.2c
Richard Fairhurst [Thu, 1 Oct 2009 11:04:00 +0000 (11:04 +0000)]
Potlatch 1.2c

14 years agoThe 'more' message used in the history dialog (history.as) was missing
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 10:59:43 +0000 (10:59 +0000)]
The 'more' message used in the history dialog (history.as) was missing

14 years agoThis whitespace at the end of "Custom: " isn't needed. The layer
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 10:39:31 +0000 (10:39 +0000)]
This whitespace at the end of "Custom: " isn't needed. The layer
selector looks the same without it and Translatewiki pukes on it.

In any case this needs to be turned into a message with
parameters. But Potlatch's code is too hairy so I'm not touching it.

14 years agoFixed message key that was broken due to a broken regex I used during
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 10:21:12 +0000 (10:21 +0000)]
Fixed message key that was broken due to a broken regex I used during
importing. It had AS message params mixed up with it.

14 years agoshow buildings in pink
Richard Fairhurst [Wed, 30 Sep 2009 23:54:25 +0000 (23:54 +0000)]
show buildings in pink

14 years agoOpen up crossdomain policy to allow all headers from everywhere as I can't
Tom Hughes [Wed, 30 Sep 2009 23:47:26 +0000 (23:47 +0000)]
Open up crossdomain policy to allow all headers from everywhere as I can't
find any information anywhere that gives me any idea why we would want to
restrict what headers can be sent.

14 years agoImport extra rails translations from http://github.com/svenfuchs/rails-i18n.
Tom Hughes [Wed, 30 Sep 2009 23:26:47 +0000 (23:26 +0000)]
Import extra rails translations from http://github.com/svenfuchs/rails-i18n.

14 years agocomment out dupe purging debug message
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:43:17 +0000 (17:43 +0000)]
comment out dupe purging debug message

14 years agocompile error in previous commit
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:43:02 +0000 (17:43 +0000)]
compile error in previous commit

14 years ago--cache option
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:42:06 +0000 (17:42 +0000)]
--cache option

14 years agoAdded better messages and error handling in a couple of places. Added integration...
Matt Amos [Wed, 30 Sep 2009 17:39:42 +0000 (17:39 +0000)]
Added better messages and error handling in a couple of places. Added integration checks to ensure that the blocking is actually working. Tests FTW.

14 years agoTried to DRY the user_blocks controller. Moved the configuration of the blocking...
Matt Amos [Wed, 30 Sep 2009 15:44:29 +0000 (15:44 +0000)]
Tried to DRY the user_blocks controller. Moved the configuration of the blocking periods into application.yml.

14 years agoThere are a bunch of keys on Translatewiki that are equivalent to
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 11:04:16 +0000 (11:04 +0000)]
There are a bunch of keys on Translatewiki that are equivalent to
English for some reason. Probably because they were there at import
time. Nuke them.

14 years agoUpdated from Translatewiki with ''perl script/locale/merge-from-translatewiki''
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 10:58:00 +0000 (10:58 +0000)]
Updated from Translatewiki with ''perl script/locale/merge-from-translatewiki''

14 years agoUpdate language list.
Tom Hughes [Wed, 30 Sep 2009 08:50:21 +0000 (08:50 +0000)]
Update language list.

14 years agoAdd script to update config/languages.yml from translatewiki language list.
Tom Hughes [Wed, 30 Sep 2009 08:49:28 +0000 (08:49 +0000)]
Add script to update config/languages.yml from translatewiki language list.

14 years agoRename reload_languages to reload-languages for consistency.
Tom Hughes [Wed, 30 Sep 2009 08:49:00 +0000 (08:49 +0000)]
Rename reload_languages to reload-languages for consistency.

14 years agoRemove untranslated parts in he.yml
Translatewiki [Tue, 29 Sep 2009 17:32:01 +0000 (17:32 +0000)]
Remove untranslated parts in he.yml

14 years agoNew migration to add better auditing to user_roles and better column names there...
Matt Amos [Tue, 29 Sep 2009 16:44:03 +0000 (16:44 +0000)]
New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages.

14 years agoRevert r17851 and just give non-local flash clients access to
Tom Hughes [Tue, 29 Sep 2009 16:24:07 +0000 (16:24 +0000)]
Revert r17851 and just give non-local flash clients access to
the X_HTTP_METHOD_OVERRIDE header.

14 years agoCapitalize JavaScript as suggested on http://translatewiki.net/w/i.php?title=Special...
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 16:21:50 +0000 (16:21 +0000)]
Capitalize JavaScript as suggested on http://translatewiki.net/w/i.php?title=Special:Translate&task=review&group=out-osm&language=qqq&limit=2500

14 years agoMerged from Translatewiki with:
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 15:52:08 +0000 (15:52 +0000)]
Merged from Translatewiki with:
{{{
perl script/locale/merge-from-translatewiki
}}}

14 years agoMerge r17285 from the oauth branch - allow flash access to set headers, even when...
Andy Allan [Tue, 29 Sep 2009 14:18:33 +0000 (14:18 +0000)]
Merge r17285 from the oauth branch - allow flash access to set headers, even when hosted at non-openstreetmap domains

14 years ago * Reconstruct option
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 13:28:23 +0000 (13:28 +0000)]
 * Reconstruct option
 * I hate File::Basename and it hates absolute paths. I'm using my evil hack again

14 years agoMerging 17824:17845 from trunk to blocking branch.
Matt Amos [Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)]
Merging 17824:17845 from trunk to blocking branch.

14 years agoActually make the last commit work. I thought Ruby's string interpolation syntax...
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 10:12:01 +0000 (10:12 +0000)]
Actually make the last commit work. I thought Ruby's string interpolation syntax worked differently

14 years agoEscape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk...
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 09:23:11 +0000 (09:23 +0000)]
Escape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk/2009-September/042846.ht

14 years ago--locales-dir is now config/locales by default
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 09:00:53 +0000 (09:00 +0000)]
--locales-dir is now config/locales by default

14 years agoTests for [17838]
Thomas Wood [Tue, 29 Sep 2009 03:58:33 +0000 (03:58 +0000)]
Tests for [17838]

Why is our testing fixtures such a mess? It took me half an hour to find a useable node. And I'm still not sure if it's ok, since I want to get to bed. kthxbye