]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 14 Oct 2009 14:42:09 +0000 (14:42 +0000)]
Add experimental support (disabled by default) for new geocoder.
Tom Hughes [Tue, 13 Oct 2009 20:27:38 +0000 (20:27 +0000)]
Merge 17130 from trunk.
Tom Hughes [Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)]
Merged 17073:17076 from trunk.
Tom Hughes [Tue, 13 Oct 2009 20:20:13 +0000 (20:20 +0000)]
Merged 17047 from trunk.
Tom Hughes [Tue, 13 Oct 2009 20:16:03 +0000 (20:16 +0000)]
Merge 17067 from trunk.
Tom Hughes [Tue, 13 Oct 2009 20:06:24 +0000 (20:06 +0000)]
Merged 17256:18123 from trunk.
Matt Amos [Tue, 13 Oct 2009 14:36:15 +0000 (14:36 +0000)]
Fixed merge fail - this branch doesn't have javascript_strings.
Matt Amos [Tue, 13 Oct 2009 14:23:20 +0000 (14:23 +0000)]
Another version of the media-queries CSS stuff. Works better for more pages now.
Ævar Arnfjörð Bjarmason [Mon, 12 Oct 2009 15:52:51 +0000 (15:52 +0000)]
Add the language the user is using to Potlatch's created_by string. Like JOSM
Matt Amos [Mon, 12 Oct 2009 10:12:12 +0000 (10:12 +0000)]
Added a :display_name option for the changesets query code.
Ævar Arnfjörð Bjarmason [Mon, 12 Oct 2009 08:54:19 +0000 (08:54 +0000)]
Don't make the text accompanying a checkbox a question
Richard Fairhurst [Mon, 12 Oct 2009 08:18:27 +0000 (08:18 +0000)]
clearly a fantastic feature, but still...
Richard Fairhurst [Mon, 12 Oct 2009 08:17:32 +0000 (08:17 +0000)]
add 1:25k as background layer
Tom Hughes [Mon, 12 Oct 2009 08:00:59 +0000 (08:00 +0000)]
Add some administrator only actions to the user page.
Translatewiki [Sat, 10 Oct 2009 23:14:36 +0000 (23:14 +0000)]
Remove a trailing newline and rename duplicate second "Page 4" to "Page 5"
Richard Fairhurst [Sat, 10 Oct 2009 22:11:03 +0000 (22:11 +0000)]
add OS7 to autocomplete
Translatewiki [Sat, 10 Oct 2009 19:24:32 +0000 (19:24 +0000)]
Localisation 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)
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
Tom Hughes [Fri, 9 Oct 2009 09:13:13 +0000 (09:13 +0000)]
Fix tests which do logins to handle the cookie test.
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
Translatewiki [Thu, 8 Oct 2009 22:11:35 +0000 (22:11 +0000)]
localisation 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)
Tom Hughes [Thu, 8 Oct 2009 12:25:55 +0000 (12:25 +0000)]
Fix output of javascript strings - use english strings to walk the
Translatewiki [Tue, 6 Oct 2009 23:03:08 +0000 (23:03 +0000)]
* 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)
Tom Hughes [Tue, 6 Oct 2009 17:29:44 +0000 (17:29 +0000)]
Rename .htaccess to htacess.example to stop it causing problems when
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
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.
Matt Amos [Tue, 6 Oct 2009 14:19:54 +0000 (14:19 +0000)]
Fixed bug in _blocks partial when used by the index view.
Tom Hughes [Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)]
Merge blocking branch to head.
Tom Hughes [Mon, 5 Oct 2009 20:28:15 +0000 (20:28 +0000)]
Add parentheses to avoid warning.
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.
projects / rails.git / log