rails.git
10 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Mon, 19 Apr 2010 20:30:42 +0000 (21:30 +0100)]
Merge branch 'master' into openstreetbugs

10 years agoIgnore yet more files.
Tom Hughes [Mon, 19 Apr 2010 19:06:50 +0000 (20:06 +0100)]
Ignore yet more files.

10 years agoIgnore some more files.
Tom Hughes [Mon, 19 Apr 2010 15:48:10 +0000 (16:48 +0100)]
Ignore some more files.

10 years agoIgnore some files which aren't committed.
Tom Hughes [Mon, 19 Apr 2010 14:20:13 +0000 (15:20 +0100)]
Ignore some files which aren't committed.

10 years agoNormalise line endings.
Tom Hughes [Mon, 19 Apr 2010 14:17:18 +0000 (15:17 +0100)]
Normalise line endings.

10 years agoRemoved old copy of OpenLayers that was hanging around.
Tom Hughes [Mon, 19 Apr 2010 14:14:47 +0000 (15:14 +0100)]
Removed old copy of OpenLayers that was hanging around.

10 years agoLocalisation updates from translatewiki.net (2010-04-18)
Translatewiki [Sun, 18 Apr 2010 21:39:43 +0000 (21:39 +0000)]
Localisation updates from translatewiki.net (2010-04-18)

10 years agoLocalisation updates from translatewiki.net (2010-04-18)
Translatewiki [Sun, 18 Apr 2010 21:39:30 +0000 (21:39 +0000)]
Localisation updates from translatewiki.net (2010-04-18)

10 years agoIgnore whitespace around the commas when splitting a user's list of
Tom Hughes [Sun, 18 Apr 2010 11:44:53 +0000 (11:44 +0000)]
Ignore whitespace around the commas when splitting a user's list of
preferred languages. Closes #2891.

10 years agoEscape geocoder errors. Closes #2892.
Tom Hughes [Sun, 18 Apr 2010 11:41:15 +0000 (11:41 +0000)]
Escape geocoder errors. Closes #2892.

10 years agoLocalisation updates from translatewiki.net (2010-04-14)
Translatewiki [Wed, 14 Apr 2010 08:33:42 +0000 (08:33 +0000)]
Localisation updates from translatewiki.net (2010-04-14)

10 years agoLocalisation updates from translatewiki.net (2010-04-14)
Translatewiki [Wed, 14 Apr 2010 08:33:10 +0000 (08:33 +0000)]
Localisation updates from translatewiki.net (2010-04-14)

10 years agoMerge duplicate "support" keys.
Tom Hughes [Tue, 13 Apr 2010 11:50:47 +0000 (11:50 +0000)]
Merge duplicate "support" keys.

10 years agoAdd Finnish translations for words_connector, two_words_connector and last_word_connector
Teemu Koskinen [Tue, 13 Apr 2010 11:36:03 +0000 (11:36 +0000)]
Add Finnish translations for words_connector, two_words_connector and last_word_connector

10 years agoDon't send "408 Request timeout" responses from the data browser as it
Tom Hughes [Mon, 12 Apr 2010 13:21:03 +0000 (13:21 +0000)]
Don't send "408 Request timeout" responses from the data browser as it
seems to make some browsers automatically retry.

10 years agoFix typo.
Tom Hughes [Sun, 11 Apr 2010 23:37:09 +0000 (23:37 +0000)]
Fix typo.

10 years agoAdd a keyid attribute to each layer and use it when requesting the
Tom Hughes [Sun, 11 Apr 2010 23:35:10 +0000 (23:35 +0000)]
Add a keyid attribute to each layer and use it when requesting the
key instead of trying to use the layer name, which can be translated
which will stop it working. Closes #2876.

10 years agoLocalisation updates from translatewiki.net (2010-04-09)
Translatewiki [Thu, 8 Apr 2010 23:20:43 +0000 (23:20 +0000)]
Localisation updates from translatewiki.net (2010-04-09)

10 years agoLocalisation updates from translatewiki.net (2010-04-09)
Translatewiki [Thu, 8 Apr 2010 23:20:27 +0000 (23:20 +0000)]
Localisation updates from translatewiki.net (2010-04-09)

10 years agoalways forget this one
Richard Fairhurst [Thu, 8 Apr 2010 08:28:20 +0000 (08:28 +0000)]
always forget this one

10 years agolast point release of Potlatch 1.x...
Richard Fairhurst [Thu, 8 Apr 2010 00:29:32 +0000 (00:29 +0000)]
last point release of Potlatch 1.x...

10 years agoLocalisation updates from translatewiki.net (2010-04-08)
Translatewiki [Wed, 7 Apr 2010 23:17:31 +0000 (23:17 +0000)]
Localisation updates from translatewiki.net (2010-04-08)

10 years agoLocalisation updates from translatewiki.net (2010-04-08)
Translatewiki [Wed, 7 Apr 2010 23:17:14 +0000 (23:17 +0000)]
Localisation updates from translatewiki.net (2010-04-08)

10 years agoUpdate Spanish rails translation from upstream.
Tom Hughes [Wed, 7 Apr 2010 15:29:14 +0000 (15:29 +0000)]
Update Spanish rails translation from upstream.

10 years agoAdd translation to date.abbr_day_names for Saturday.
Tom Hughes [Wed, 7 Apr 2010 13:17:17 +0000 (13:17 +0000)]
Add translation to date.abbr_day_names for Saturday.

10 years agoLoad timecop in the test environment only.
Tom Hughes [Wed, 7 Apr 2010 10:59:19 +0000 (10:59 +0000)]
Load timecop in the test environment only.

10 years agoRevert copyright page from the trunk for now.
Tom Hughes [Wed, 7 Apr 2010 09:45:41 +0000 (09:45 +0000)]
Revert copyright page from the trunk for now.

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:32:09 +0000 (22:32 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:30:21 +0000 (22:30 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:25:20 +0000 (22:25 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoLocalisation updates from translatewiki.net (2010-04-07)
Translatewiki [Tue, 6 Apr 2010 22:20:45 +0000 (22:20 +0000)]
Localisation updates from translatewiki.net (2010-04-07)

10 years agoTweak the new copyright page a bit.
Tom Hughes [Tue, 6 Apr 2010 20:11:33 +0000 (20:11 +0000)]
Tweak the new copyright page a bit.

10 years agoadd OS StreetView (and a D keypress for the Ubuntu types)
Richard Fairhurst [Tue, 6 Apr 2010 14:22:21 +0000 (14:22 +0000)]
add OS StreetView (and a D keypress for the Ubuntu types)

10 years agoNew, more helpful and compliant copyright page
Richard Fairhurst [Tue, 6 Apr 2010 13:55:33 +0000 (13:55 +0000)]
New, more helpful and compliant copyright page

10 years agoSeems that the Rails.env doesn't consistently work. Removing condition in config...
Shaun McDonald [Sat, 3 Apr 2010 21:31:35 +0000 (21:31 +0000)]
Seems that the Rails.env doesn't consistently work. Removing condition in config/environment.rb

10 years agoAdding timecop as a gem dependency when in development env. This allows for time...
Shaun McDonald [Sat, 3 Apr 2010 21:02:20 +0000 (21:02 +0000)]
Adding timecop as a gem dependency when in development env. This allows for time based tests to be accurate/consistent. It will stop the random error on the api_controller_test#test_changes_simple, when you are on a slow machine/have bad timing.

10 years agoLocalisation updates from translatewiki.net (2010-04-03)
Translatewiki [Sat, 3 Apr 2010 13:36:40 +0000 (13:36 +0000)]
Localisation updates from translatewiki.net (2010-04-03)

10 years agoLocalisation updates from translatewiki.net (2010-04-03)
Translatewiki [Sat, 3 Apr 2010 13:35:56 +0000 (13:35 +0000)]
Localisation updates from translatewiki.net (2010-04-03)

10 years agoFixed some minor bugs and add tests to spot them
Kai Krueger [Sat, 27 Mar 2010 11:45:36 +0000 (11:45 +0000)]
Fixed some minor bugs and add tests to spot them

10 years agoLocalisation updates from translatewiki.net (2010-03-23)
Translatewiki [Tue, 23 Mar 2010 20:21:01 +0000 (20:21 +0000)]
Localisation updates from translatewiki.net (2010-03-23)

10 years agoLocalisation updates from translatewiki.net (2010-03-23)
Translatewiki [Tue, 23 Mar 2010 20:20:45 +0000 (20:20 +0000)]
Localisation updates from translatewiki.net (2010-03-23)

10 years agoPatching fix to test from branch.
Matt Amos [Mon, 22 Mar 2010 22:56:45 +0000 (22:56 +0000)]
Patching fix to test from branch.

10 years agoReuse the map_bug_comment table as a more general history table of map_bugs including...
Kai Krueger [Sun, 21 Mar 2010 12:12:05 +0000 (12:12 +0000)]
Reuse the map_bug_comment table as a more general history table of map_bugs including close and reopen events

This helps the rss feed to work on a per event basis rather than on a per bug basis

10 years agominor improvement to the map_bugs tests
Kai Krueger [Sun, 21 Mar 2010 12:04:15 +0000 (12:04 +0000)]
minor improvement to the map_bugs tests

10 years agoRestrict the fragment caching of the reverse geocode result to only cover
Tom Hughes [Sun, 21 Mar 2010 11:33:58 +0000 (11:33 +0000)]
Restrict the fragment caching of the reverse geocode result to only cover
that lookup and not anything else as the geocode result is only cached once
for all languages.

10 years agoConvert openstreetbugs javascript to new style api
Kai Krueger [Sat, 20 Mar 2010 12:34:59 +0000 (12:34 +0000)]
Convert openstreetbugs javascript to new style api

10 years agoDon't limit get map_bugs to a small Area, by disabling the quadtile index for those...
Kai Krueger [Sat, 20 Mar 2010 11:59:23 +0000 (11:59 +0000)]
Don't limit get map_bugs to a small Area, by disabling the quadtile index for those searches

The volumn of bugs seem small enough to get away with normal or GiST indexes (not included yet)

Also includes some other fixes

10 years agoRemove old segment view directory.
Tom Hughes [Sat, 20 Mar 2010 00:02:37 +0000 (00:02 +0000)]
Remove old segment view directory.

10 years agoDisable autocompletion for the password fields on the settings page.
Tom Hughes [Sat, 20 Mar 2010 00:01:57 +0000 (00:01 +0000)]
Disable autocompletion for the password fields on the settings page.

10 years agoAdd placeholder file for nb translations and arrange to merge nb and
Tom Hughes [Thu, 18 Mar 2010 22:33:05 +0000 (22:33 +0000)]
Add placeholder file for nb translations and arrange to merge nb and
no translations at startup.

10 years agoRename no-NB and no-NN translations to the correct nb and nn codes.
Tom Hughes [Thu, 18 Mar 2010 21:47:02 +0000 (21:47 +0000)]
Rename no-NB and no-NN translations to the correct nb and nn codes.

10 years agoUpdate rails translations.
Tom Hughes [Thu, 18 Mar 2010 21:36:15 +0000 (21:36 +0000)]
Update rails translations.

10 years agoMerge -r 20198:20540 from trunc into openstreetbugs branch
Kai Krueger [Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)]
Merge -r 20198:20540 from trunc into openstreetbugs branch

10 years agoAdd some rudimentary initial tests for the map bugs api
Kai Krueger [Wed, 17 Mar 2010 23:43:32 +0000 (23:43 +0000)]
Add some rudimentary initial tests for the map bugs api

10 years agoFixup some error handling in map bugs
Kai Krueger [Wed, 17 Mar 2010 23:39:59 +0000 (23:39 +0000)]
Fixup some error handling in map bugs

10 years agoLocalisation updates from translatewiki.net (2010-03-17)
Translatewiki [Wed, 17 Mar 2010 21:48:01 +0000 (21:48 +0000)]
Localisation updates from translatewiki.net (2010-03-17)

10 years agoLocalisation updates from translatewiki.net (2010-03-17)
Translatewiki [Wed, 17 Mar 2010 21:47:18 +0000 (21:47 +0000)]
Localisation updates from translatewiki.net (2010-03-17)

10 years agoLoad ethnio script over https to avoid browser warnings.
Tom Hughes [Wed, 17 Mar 2010 21:42:48 +0000 (21:42 +0000)]
Load ethnio script over https to avoid browser warnings.

10 years agoAdd UX review recruiting script to signup page.
Tom Hughes [Tue, 16 Mar 2010 21:13:16 +0000 (21:13 +0000)]
Add UX review recruiting script to signup page.

10 years agoList bugs submited or commented on by user
Kai Krueger [Mon, 15 Mar 2010 00:10:41 +0000 (00:10 +0000)]
List bugs submited or commented on by user

10 years agoUpdate the inbox link in the greeting bar when messages are marked
Tom Hughes [Sun, 14 Mar 2010 16:02:30 +0000 (16:02 +0000)]
Update the inbox link in the greeting bar when messages are marked
as read or unread.

10 years agoMake disabled tabs more obvious. Based on patch from Adrian Cochrane.
Tom Hughes [Sun, 14 Mar 2010 15:48:42 +0000 (15:48 +0000)]
Make disabled tabs more obvious. Based on patch from Adrian Cochrane.

10 years agoRequire the session ID to log somebody out - if it isn't given we just
Tom Hughes [Sun, 14 Mar 2010 15:29:53 +0000 (15:29 +0000)]
Require the session ID to log somebody out - if it isn't given we just
show a confirmation page. Closes #2792.

10 years agoFixup some of the rss output and geocode bugs using nominatim
Kai Krueger [Sun, 14 Mar 2010 10:47:16 +0000 (10:47 +0000)]
Fixup some of the rss output and geocode bugs using nominatim

10 years agoUse Prototype methods to find the anchor nodes to make sure they get
Tom Hughes [Sun, 14 Mar 2010 08:48:48 +0000 (08:48 +0000)]
Use Prototype methods to find the anchor nodes to make sure they get
extended with the Prototype extensions on all browsers.

10 years agoback out the registration of the gpx mime type, as it didn't seem work
Kai Krueger [Sun, 14 Mar 2010 00:14:35 +0000 (00:14 +0000)]
back out the registration of the gpx mime type, as it didn't seem work

10 years agotry and make the OpenStreetBugs API a bit more consistent with the rest of the API
Kai Krueger [Sat, 13 Mar 2010 22:21:48 +0000 (22:21 +0000)]
try and make the OpenStreetBugs API a bit more consistent with the rest of the API

10 years agoAdd a browse page for bugs
Kai Krueger [Sat, 13 Mar 2010 13:45:02 +0000 (13:45 +0000)]
Add a browse page for bugs

10 years agoLocalisation updates from translatewiki.net (2010-03-13)
Translatewiki [Fri, 12 Mar 2010 23:54:23 +0000 (23:54 +0000)]
Localisation updates from translatewiki.net (2010-03-13)

10 years agoLocalisation updates from translatewiki.net (2010-03-13)
Translatewiki [Fri, 12 Mar 2010 23:53:51 +0000 (23:53 +0000)]
Localisation updates from translatewiki.net (2010-03-13)

10 years agoFix warnings.
Tom Hughes [Thu, 11 Mar 2010 18:52:35 +0000 (18:52 +0000)]
Fix warnings.

10 years agoUse the small PanZoom control on the user map instead of the
Tom Hughes [Thu, 11 Mar 2010 18:29:35 +0000 (18:29 +0000)]
Use the small PanZoom control on the user map instead of the
full PanZoomBar control.

10 years agoImprove user popups on friend/nearby mapper maps.
Tom Hughes [Thu, 11 Mar 2010 18:23:22 +0000 (18:23 +0000)]
Improve user popups on friend/nearby mapper maps.

10 years agoUse CSS to style the disabled tabs.
Tom Hughes [Thu, 11 Mar 2010 08:58:48 +0000 (08:58 +0000)]
Use CSS to style the disabled tabs.

10 years agoRecord time of closure of a bug.
Kai Krueger [Wed, 10 Mar 2010 08:42:07 +0000 (08:42 +0000)]
Record time of closure of a bug.

10 years agoEscape javascript in output
Kai Krueger [Wed, 10 Mar 2010 08:38:53 +0000 (08:38 +0000)]
Escape javascript in output

10 years agocouple of little fixes
Richard Fairhurst [Sun, 7 Mar 2010 23:09:26 +0000 (23:09 +0000)]
couple of little fixes

10 years agoyay for case-insensitive systems
Richard Fairhurst [Sun, 7 Mar 2010 21:44:37 +0000 (21:44 +0000)]
yay for case-insensitive systems

10 years agoChange comment type from varchar(255) to text
Kai Krueger [Sun, 7 Mar 2010 19:09:32 +0000 (19:09 +0000)]
Change comment type from varchar(255) to text

Some bug comments in the current OSB have more than 255 characters,
so the format needs to be extended to accomodate

10 years agosupport json format in getBugs, add a limit and name parameter
Kai Krueger [Sun, 7 Mar 2010 18:41:01 +0000 (18:41 +0000)]
support json format in getBugs, add a limit and name parameter

10 years agoLocalisation updates from translatewiki.net (2010-03-07)
Translatewiki [Sat, 6 Mar 2010 23:57:17 +0000 (23:57 +0000)]
Localisation updates from translatewiki.net (2010-03-07)

10 years agoLocalisation updates from translatewiki.net (2010-03-07)
Translatewiki [Sat, 6 Mar 2010 23:56:16 +0000 (23:56 +0000)]
Localisation updates from translatewiki.net (2010-03-07)

10 years agoUse a better HTML sanitizer that makes sure the HTML is well formed and
Tom Hughes [Sat, 6 Mar 2010 15:38:13 +0000 (15:38 +0000)]
Use a better HTML sanitizer that makes sure the HTML is well formed and
can add rel="nofollow" to links.

10 years agoFix broken </div> tag.
Tom Hughes [Sat, 6 Mar 2010 11:37:38 +0000 (11:37 +0000)]
Fix broken </div> tag.

10 years agoFixed small bug where clicking on the "Report a Problem" link would directly create...
Kai Krueger [Sat, 6 Mar 2010 09:44:54 +0000 (09:44 +0000)]
Fixed small bug where clicking on the "Report a Problem" link would directly create a bug-report

10 years agoFix the selection of the message to be deleted.
Tom Hughes [Sat, 6 Mar 2010 00:26:32 +0000 (00:26 +0000)]
Fix the selection of the message to be deleted.

10 years agoAllow for different formats to the getBugs call
Kai Krueger [Thu, 4 Mar 2010 22:30:42 +0000 (22:30 +0000)]
Allow for different formats to the getBugs call

This is a rudimentary initial version of a GPX and a rss
format for looking at bugs in an area.

10 years agoTidy up the stylesheets, removing lots of ancient, unused junk and
Tom Hughes [Wed, 3 Mar 2010 15:46:16 +0000 (15:46 +0000)]
Tidy up the stylesheets, removing lots of ancient, unused junk and
trying to group everything else together in more logical fashion.

10 years agoUpdate robots.txt to Disallow browser [node|way|relation] history. Content now worth...
Grant Slater [Wed, 3 Mar 2010 11:41:43 +0000 (11:41 +0000)]
Update robots.txt to Disallow browser [node|way|relation] history. Content now worth indexing in most cases.

10 years agoDon't try and show distances to friends if the user has no
Tom Hughes [Tue, 2 Mar 2010 16:42:45 +0000 (16:42 +0000)]
Don't try and show distances to friends if the user has no
home location set. Closes #2766.

10 years agoSplit comment field out of map bugs table
Kai Krueger [Mon, 1 Mar 2010 21:05:40 +0000 (21:05 +0000)]
Split comment field out of map bugs table

Rather than have all comments in a single text field, have each comment in its own entry
and only combine them back on output

10 years agoMove image size hint to avoid issues with LTR languages. Closes #2755.
Tom Hughes [Mon, 1 Mar 2010 12:12:02 +0000 (12:12 +0000)]
Move image size hint to avoid issues with LTR languages. Closes #2755.

10 years agoMake friend notification messages include a link to add a reciprocal
Tom Hughes [Mon, 1 Mar 2010 12:08:11 +0000 (12:08 +0000)]
Make friend notification messages include a link to add a reciprocal
friendship if it doesn't already exist. Closes #2754.

10 years agoMonkey patch rails to work around stupid I18n bug where it looks up
Tom Hughes [Mon, 1 Mar 2010 00:55:27 +0000 (00:55 +0000)]
Monkey patch rails to work around stupid I18n bug where it looks up
time.formats in the locale and then looks for the requested format in
that hash, thereby not doing fallback correctly. To make things worse
it then defaults to just using the requested format name as the format...

10 years agoLocalisation updates from translatewiki.net (2010-02-28)
Translatewiki [Sun, 28 Feb 2010 23:07:43 +0000 (23:07 +0000)]
Localisation updates from translatewiki.net (2010-02-28)

10 years agoFix typo
Translatewiki [Sun, 28 Feb 2010 21:08:48 +0000 (21:08 +0000)]
Fix typo

10 years agoAdd a "friendly" date/time format and use it whenever we are printing
Tom Hughes [Sun, 28 Feb 2010 16:57:22 +0000 (16:57 +0000)]
Add a "friendly" date/time format and use it whenever we are printing
dates and times on the web site.

Also try and improve formatting of message pages a but, and include the
image of the recipient when viewing a sent message.

10 years agoGet the location for "Where Am I?" from the view tab's link instead of
Tom Hughes [Sun, 28 Feb 2010 16:04:30 +0000 (16:04 +0000)]
Get the location for "Where Am I?" from the view tab's link instead of
by asking the map so that it works in edit mode as well. Closes #2383.

10 years agoTidy up error handling in the message controller, and make it redirect to
Tom Hughes [Sun, 28 Feb 2010 15:13:06 +0000 (15:13 +0000)]
Tidy up error handling in the message controller, and make it redirect to
the login page if you are logged in as the wrong user. Closes #1569.

10 years agoAllow a logged in user to relogin as a different user just by visiting
Tom Hughes [Sun, 28 Feb 2010 14:36:07 +0000 (14:36 +0000)]
Allow a logged in user to relogin as a different user just by visiting
the login page.