]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 5 Oct 2009 20:25:45 +0000 (20:25 +0000)]
Merge 17944:17988 from trunk.
Richard Fairhurst [Mon, 5 Oct 2009 12:36:01 +0000 (12:36 +0000)]
OS7 tile layer support
Richard Fairhurst [Mon, 5 Oct 2009 11:50:24 +0000 (11:50 +0000)]
still tidy properties when icon has changed
Translatewiki [Mon, 5 Oct 2009 08:20:20 +0000 (08:20 +0000)]
* localisation updates from translatewiki.net (2009-10-05)
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...
Translatewiki [Sun, 4 Oct 2009 11:32:30 +0000 (11:32 +0000)]
Fix syntax error in r17978
Translatewiki [Sun, 4 Oct 2009 11:28:57 +0000 (11:28 +0000)]
Localisation 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)
Ævar Arnfjörð Bjarmason [Sun, 4 Oct 2009 08:40:37 +0000 (08:40 +0000)]
Make Mail/Revert in History dialog i18n-able
Ævar Arnfjörð Bjarmason [Sun, 4 Oct 2009 07:54:27 +0000 (07:54 +0000)]
Synced from Translatewiki. Including one new language (gl)
Tom Hughes [Fri, 2 Oct 2009 23:41:19 +0000 (23:41 +0000)]
Modify the existing i18n() javascript function to lookup strings in
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
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
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:58:59 +0000 (20:58 +0000)]
Synced from Translatewiki
Æ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!
Æ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
Matt Amos [Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)]
Merging 17905:17944 from trunk.
Tom Hughes [Fri, 2 Oct 2009 14:40:25 +0000 (14:40 +0000)]
Add parentheses to avoid warnings.
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 13:04:47 +0000 (13:04 +0000)]
Amend [17942]:
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.
Translatewiki [Fri, 2 Oct 2009 11:28:35 +0000 (11:28 +0000)]
Localisation updates from translatewiki.net (2009-10-02)
Translatewiki [Fri, 2 Oct 2009 11:20:57 +0000 (11:20 +0000)]
* Remove trailing newline from help_html
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.
Matt Amos [Fri, 2 Oct 2009 10:46:19 +0000 (10:46 +0000)]
Fix wrong comment.
Æ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
Richard Fairhurst [Fri, 2 Oct 2009 07:05:05 +0000 (07:05 +0000)]
fix GPS offset
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
Tom Hughes [Thu, 1 Oct 2009 21:13:13 +0000 (21:13 +0000)]
Swap two translations so they are the right way round.
Tom Hughes [Thu, 1 Oct 2009 20:39:04 +0000 (20:39 +0000)]
Replace a couple calls to inject with more readble constructs.
Æ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
Tom Hughes [Thu, 1 Oct 2009 20:24:53 +0000 (20:24 +0000)]
Correct comment.
Æ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
Tom Hughes [Thu, 1 Oct 2009 20:22:52 +0000 (20:22 +0000)]
Correct comment.
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:18:24 +0000 (20:18 +0000)]
* <title> for /blocks/new/*
Æ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
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
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:02:54 +0000 (20:02 +0000)]
use h() to avoid XSS in usernames
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:59:02 +0000 (19:59 +0000)]
title/links for revoke page
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:55:25 +0000 (19:55 +0000)]
Oops. Mixed up heading/title
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:45:36 +0000 (19:45 +0000)]
title/heading & XSS fix for /edit
Æ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
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:18:23 +0000 (19:18 +0000)]
Set title on /blocks/:id and link to usernames
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:10:31 +0000 (19:10 +0000)]
Back -> View all blocks
Æ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.
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:49:38 +0000 (18:49 +0000)]
* use h() on username to avoid XSS
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:42:45 +0000 (18:42 +0000)]
More specific alt/title text
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.
Æ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
Æ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
Matt Amos [Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)]
Merging 17846:17904 from trunk.
Matt Amos [Thu, 1 Oct 2009 17:15:34 +0000 (17:15 +0000)]
Refactored user_role and controller. Now much more DRY.
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 16:48:31 +0000 (16:48 +0000)]
Synced from Translatewiki
Richard Fairhurst [Thu, 1 Oct 2009 16:01:12 +0000 (16:01 +0000)]
compile avar's latest commit
Translatewiki [Thu, 1 Oct 2009 13:42:46 +0000 (13:42 +0000)]
* Localisation updates from translatewiki.net (2009-10-01)
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 13:41:51 +0000 (13:41 +0000)]
Translatewiki URLs changed. Adjust script to match
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 13:18:45 +0000 (13:18 +0000)]
RichardF forgot to nuke cz.yml in [17664]. Nuking
Richard Fairhurst [Thu, 1 Oct 2009 11:04:00 +0000 (11:04 +0000)]
Potlatch 1.2c
Æ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
Æ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
Æ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
Richard Fairhurst [Wed, 30 Sep 2009 23:54:25 +0000 (23:54 +0000)]
show buildings in pink
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
Tom Hughes [Wed, 30 Sep 2009 23:26:47 +0000 (23:26 +0000)]
Import extra rails translations from http://github.com/svenfuchs/rails-i18n.
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:43:17 +0000 (17:43 +0000)]
comment out dupe purging debug message
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:43:02 +0000 (17:43 +0000)]
compile error in previous commit
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:42:06 +0000 (17:42 +0000)]
--cache option
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.
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.
Æ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
Æ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''
Tom Hughes [Wed, 30 Sep 2009 08:50:21 +0000 (08:50 +0000)]
Update 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.
Tom Hughes [Wed, 30 Sep 2009 08:49:00 +0000 (08:49 +0000)]
Rename reload_languages to reload-languages for consistency.
Translatewiki [Tue, 29 Sep 2009 17:32:01 +0000 (17:32 +0000)]
Remove untranslated parts in he.yml
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.
Tom Hughes [Tue, 29 Sep 2009 16:24:07 +0000 (16:24 +0000)]
Revert r17851 and just give non-local flash clients access to
Æ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
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 15:52:08 +0000 (15:52 +0000)]
Merged from Translatewiki with:
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
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 13:28:23 +0000 (13:28 +0000)]
* Reconstruct option
Matt Amos [Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)]
Merging 17824:17845 from trunk to blocking branch.
Æ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
Æ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
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 09:00:53 +0000 (09:00 +0000)]
--locales-dir is now config/locales by default
Thomas Wood [Tue, 29 Sep 2009 03:58:33 +0000 (03:58 +0000)]
Tests for [17838]
Thomas Wood [Tue, 29 Sep 2009 02:55:35 +0000 (02:55 +0000)]
5 character patch to only output duplicated nodes once in a way/full call
Tom Hughes [Mon, 28 Sep 2009 21:34:10 +0000 (21:34 +0000)]
Remove corrupt message from Dutch translation.
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 21:02:47 +0000 (21:02 +0000)]
Importing new messages to existing languages from Translatewiki. See
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:52:53 +0000 (20:52 +0000)]
more SYNOPSIS instructions
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:50:03 +0000 (20:50 +0000)]
Remove comment saying when these files were generated
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:43:48 +0000 (20:43 +0000)]
Actualy having autogenerated timestamps at the top of files which are
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:38:39 +0000 (20:38 +0000)]
Commiting 26 new language translations (although some are really
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:27:50 +0000 (20:27 +0000)]
Report on download progress
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:25:19 +0000 (20:25 +0000)]
--only-new option
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:17:36 +0000 (20:17 +0000)]
* Add more keys from the optional list that we don't want to ignor
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 19:06:34 +0000 (19:06 +0000)]
A hacky in-process script for merging translations from Translatewiki
Matt Amos [Mon, 28 Sep 2009 17:35:39 +0000 (17:35 +0000)]
Added a confirmation step to the process of granting and revoking user roles.
Matt Amos [Mon, 28 Sep 2009 17:30:10 +0000 (17:30 +0000)]
Truncate long reason texts to not overwhelm the browser window.
Matt Amos [Mon, 28 Sep 2009 16:01:00 +0000 (16:01 +0000)]
First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these.
Matt Amos [Mon, 28 Sep 2009 15:55:23 +0000 (15:55 +0000)]
Creating branch for blocking feature work.
projects / rails.git / log