]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoDon't use hard coded value in "one" pluralization rule
Tom Hughes [Thu, 15 Nov 2012 15:22:56 +0000 (15:22 +0000)]
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.

12 years agoUpdated Potlatch 2 to 2.3-529-g5446b49 build
Tom Hughes [Tue, 13 Nov 2012 15:32:16 +0000 (15:32 +0000)]
Updated Potlatch 2 to 2.3-529-g5446b49 build

12 years agoOnly call force_encoding on ruby 1.9
Tom Hughes [Mon, 12 Nov 2012 20:19:07 +0000 (20:19 +0000)]
Only call force_encoding on ruby 1.9

12 years agoFix bogus test
Tom Hughes [Mon, 12 Nov 2012 19:27:09 +0000 (19:27 +0000)]
Fix bogus test

12 years agoMonkey patch field_changed? support until CPK is updated
Tom Hughes [Mon, 12 Nov 2012 19:14:31 +0000 (19:14 +0000)]
Monkey patch field_changed? support until CPK is updated

12 years agoUpdate to rails 3.2.9
Tom Hughes [Mon, 12 Nov 2012 19:13:54 +0000 (19:13 +0000)]
Update to rails 3.2.9

12 years agoFixing typo and outdated information
Eric Theise [Sun, 11 Nov 2012 04:59:12 +0000 (21:59 -0700)]
Fixing typo and outdated information

12 years agoUse counter caches to improve spam scoring
Tom Hughes [Mon, 12 Nov 2012 09:39:44 +0000 (09:39 +0000)]
Use counter caches to improve spam scoring

Now that we have the counter caches we can take all edits and traces
into account without incurring the cost of having to scan the database
to count them all.

12 years agoFix interpolation variables
Tom Hughes [Sat, 10 Nov 2012 19:52:30 +0000 (19:52 +0000)]
Fix interpolation variables

12 years agoUpdate Potlatch 2 to 2.3-515-gd4558d1 build
Tom Hughes [Sat, 10 Nov 2012 19:43:54 +0000 (19:43 +0000)]
Update Potlatch 2 to 2.3-515-gd4558d1 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sat, 10 Nov 2012 19:43:18 +0000 (19:43 +0000)]
Potlatch 2 localisation updates

12 years agoFixing two typos
Eric Theise [Sat, 10 Nov 2012 19:17:34 +0000 (12:17 -0700)]
Fixing two typos

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 7 Nov 2012 12:11:28 +0000 (12:11 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoRework signup emails a bit
Tom Hughes [Mon, 5 Nov 2012 09:54:58 +0000 (09:54 +0000)]
Rework signup emails a bit

Remove "lego" strings and try and reduce duplication between the
text and HTML versions of the mails.

12 years agoSupport semicolon as parameter delimiter
John Firebaugh [Sun, 4 Nov 2012 21:53:31 +0000 (13:53 -0800)]
Support semicolon as parameter delimiter

http://lists.openstreetmap.org/pipermail/rails-dev/2012-November/001259.html

12 years agoAllow mass assignment of user preference keys and values
Tom Hughes [Sun, 4 Nov 2012 14:40:24 +0000 (14:40 +0000)]
Allow mass assignment of user preference keys and values

12 years agoUse binary mode for trace files
Tom Hughes [Sun, 4 Nov 2012 14:35:34 +0000 (14:35 +0000)]
Use binary mode for trace files

We don't want to try and do any enoding conversions (or indeed any
newline conversions) on uploaded trace files.

12 years agoTweak Potlatch maximisation a bit more
Tom Hughes [Thu, 1 Nov 2012 17:02:11 +0000 (17:02 +0000)]
Tweak Potlatch maximisation a bit more

12 years agoMake full screen mode in Potlatch work properly again
Tom Hughes [Thu, 1 Nov 2012 16:56:36 +0000 (16:56 +0000)]
Make full screen mode in Potlatch work properly again

12 years agoMake sure we always read the body of a PUT or POST request
Tom Hughes [Thu, 1 Nov 2012 12:45:37 +0000 (12:45 +0000)]
Make sure we always read the body of a PUT or POST request

Unfortunately if a PUT or POST request that has a body fails to
read it then Apache will sometimes fail to return the response it
is given to the client properly, instead erroring:

  https://issues.apache.org/bugzilla/show_bug.cgi?id=44782

To work round this we call rewind on the body for every request using
a filter, which forces it to be fetched from Apache into a file.

12 years agoRevert "Add a newline to the end of the body when reporting an error"
Tom Hughes [Thu, 1 Nov 2012 12:42:47 +0000 (12:42 +0000)]
Revert "Add a newline to the end of the body when reporting an error"

This reverts commit 59c97f4866652c025ec4f61cabcaaedd3124ab33.

12 years agoAdd a newline to the end of the body when reporting an error
Tom Hughes [Thu, 1 Nov 2012 09:13:43 +0000 (09:13 +0000)]
Add a newline to the end of the body when reporting an error

There seems to be some sort problem with ruby 1.9 where a response
body that is a single line with no newline causes the response not
to be sent properly.

12 years agoUse zip instead of SyncEnumerator in statistics script
Tom Hughes [Thu, 1 Nov 2012 00:35:31 +0000 (00:35 +0000)]
Use zip instead of SyncEnumerator in statistics script

12 years agoForce encoding in AMF controller
Tom Hughes [Wed, 31 Oct 2012 20:39:31 +0000 (20:39 +0000)]
Force encoding in AMF controller

Although the strings are UTF-8 we need to treat them as byte
strings for the purposes of encoding AMF responses.

12 years agoFix history sidebar for small screens
Saman Bemel-Benrud [Tue, 30 Oct 2012 23:00:49 +0000 (19:00 -0400)]
Fix history sidebar for small screens

12 years agoUse the asset pipeline to load the sprite
Tom Hughes [Tue, 30 Oct 2012 22:41:07 +0000 (22:41 +0000)]
Use the asset pipeline to load the sprite

12 years agoSimplify handling of verified emails in OpenID signup
Tom Hughes [Tue, 30 Oct 2012 18:53:58 +0000 (18:53 +0000)]
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.

12 years agoTrust Google and Yahoo to return valid email addresses
Kai Krueger [Sat, 13 Oct 2012 06:26:04 +0000 (00:26 -0600)]
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.

12 years agoFix editor view
Saman Bemel-Benrud [Tue, 30 Oct 2012 16:10:48 +0000 (12:10 -0400)]
Fix editor view

12 years agoChange approach to layout in order to fix some weird CSS problems
Saman Bemel-Benrud [Wed, 24 Oct 2012 23:25:51 +0000 (19:25 -0400)]
Change approach to layout in order to fix some weird CSS problems

Move away from using an absolute positioned #content div as this was
causing some weird problems when users scrolled down, like not showing
bottom padding, and prematurely cutting off the left keyline.

Now, the content area uses relative positioning most of the time, and
fixed positioning when the full screen map is in place.

Using fixed positioning on the big map is nice because you can now scroll
down to see more sidebar content, but you won't end up with an ugly block
of white space under the map.

12 years agoMove OL control styling to OL theme
Tom Hughes [Mon, 29 Oct 2012 18:59:39 +0000 (18:59 +0000)]
Move OL control styling to OL theme

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 27 Oct 2012 13:37:36 +0000 (13:37 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoFix RTL issues with the search and donate icons
Tom Hughes [Fri, 26 Oct 2012 20:51:26 +0000 (21:51 +0100)]
Fix RTL issues with the search and donate icons

12 years agoMake it easier to test alternative locales
Tom Hughes [Fri, 26 Oct 2012 20:41:03 +0000 (21:41 +0100)]
Make it easier to test alternative locales

Allow a locale=xx parameter in the URL to select the locale.

12 years agoMake it easier to test RTL layout
John Firebaugh [Fri, 26 Oct 2012 18:05:26 +0000 (11:05 -0700)]
Make it easier to test RTL layout

Instead of fiddling with settings so the site appears in Arabic
or Hebrew, you can add a dir=rtl param to the URL.

12 years agoMinor style overhaul to sidebar
Saman Bemel-Benrud [Wed, 24 Oct 2012 22:47:03 +0000 (18:47 -0400)]
Minor style overhaul to sidebar

A number of small usability improvements / fixes, including:

* Small inconsistencies in spacing fixed
* Links now visually differentiated from headings in the menu
* Search bar actually looks right (or at least not as broken) in IE7 now
* New heart on the donate button + larger click area on the donate button!

12 years agoRemoved incorrect margin between zoom in and zoom out controls
Saman Bemel-Benrud [Fri, 26 Oct 2012 18:27:39 +0000 (19:27 +0100)]
Removed incorrect margin between zoom in and zoom out controls

12 years agoAdd /user_blocks/ to robots.txt disallow
Grant [Wed, 24 Oct 2012 09:33:55 +0000 (11:33 +0200)]
Add /user_blocks/ to robots.txt disallow

Add Disallow: /user_blocks/ as the content is not suitable for indexing.

12 years agoImproved user icons
Saman Bemel-Benrud [Fri, 19 Oct 2012 21:17:53 +0000 (17:17 -0400)]
Improved user icons

12 years agoRevert "Add SoTM Scotland banner"
Grant Slater [Mon, 22 Oct 2012 20:02:27 +0000 (21:02 +0100)]
Revert "Add SoTM Scotland banner"

This reverts commit 749caaff73596e284c39ce7d0a840f8a0a50687d.

12 years agoUpdate bundle
Tom Hughes [Mon, 22 Oct 2012 18:08:16 +0000 (19:08 +0100)]
Update bundle

12 years agoAllow cross-origin requests to API
John Firebaugh [Sat, 20 Oct 2012 23:11:51 +0000 (16:11 -0700)]
Allow cross-origin requests to API

12 years agoAvoid unnecessary array allocations
John Firebaugh [Mon, 22 Oct 2012 03:31:29 +0000 (20:31 -0700)]
Avoid unnecessary array allocations

12 years agoUpdate Potlatch 2 to 2.3-509-g0221790 build
Tom Hughes [Sun, 21 Oct 2012 18:27:35 +0000 (19:27 +0100)]
Update Potlatch 2 to 2.3-509-g0221790 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Sun, 21 Oct 2012 18:26:27 +0000 (19:26 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 20 Oct 2012 16:19:22 +0000 (16:19 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate Potlatch 2 to 2.3-502-g0247dab build
Tom Hughes [Thu, 18 Oct 2012 18:02:31 +0000 (19:02 +0100)]
Update Potlatch 2 to 2.3-502-g0247dab build

12 years agoAdd SoTM Scotland banner
Grant Slater [Thu, 18 Oct 2012 14:59:11 +0000 (15:59 +0100)]
Add SoTM Scotland banner

12 years agoUpdate database schema
Tom Hughes [Thu, 18 Oct 2012 17:58:42 +0000 (18:58 +0100)]
Update database schema

12 years agoImprove the user image selection UI
Tom Hughes [Wed, 17 Oct 2012 12:05:05 +0000 (13:05 +0100)]
Improve the user image selection UI

12 years agoImplemented Gravatar support
Paweł Paprota [Fri, 12 Oct 2012 05:35:19 +0000 (07:35 +0200)]
Implemented Gravatar support

12 years agoUpdate Potlatch 2 to 2.3-500-g740307e build
Tom Hughes [Mon, 15 Oct 2012 18:28:30 +0000 (19:28 +0100)]
Update Potlatch 2 to 2.3-500-g740307e build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 15 Oct 2012 18:28:09 +0000 (19:28 +0100)]
Potlatch 2 localisation updates

12 years agoRemove SOTM US advert
Tom Hughes [Mon, 15 Oct 2012 18:15:10 +0000 (19:15 +0100)]
Remove SOTM US advert

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Oct 2012 11:10:25 +0000 (11:10 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUse ejs templates in browse JS
John Firebaugh [Thu, 11 Oct 2012 18:50:54 +0000 (11:50 -0700)]
Use ejs templates in browse JS

12 years agoUse proj/unproj consistently
John Firebaugh [Mon, 8 Oct 2012 05:29:58 +0000 (22:29 -0700)]
Use proj/unproj consistently

12 years agoMove browse-related JS to browse.js
John Firebaugh [Fri, 5 Oct 2012 23:13:46 +0000 (16:13 -0700)]
Move browse-related JS to browse.js

12 years agoMove export-related JS to export.js
John Firebaugh [Fri, 5 Oct 2012 23:11:54 +0000 (16:11 -0700)]
Move export-related JS to export.js

12 years agoProvide example of correct attribution
Richard Fairhurst [Thu, 11 Oct 2012 10:30:57 +0000 (11:30 +0100)]
Provide example of correct attribution

12 years agoRemove Potlatch 1 from edit menu
Richard Fairhurst [Thu, 11 Oct 2012 10:16:24 +0000 (11:16 +0100)]
Remove Potlatch 1 from edit menu

12 years agoUpdate Potlatch 2 stylesheet and presets
Tom Hughes [Fri, 12 Oct 2012 19:58:08 +0000 (20:58 +0100)]
Update Potlatch 2 stylesheet and presets

12 years agoPotlatch 2 localisation updates
Tom Hughes [Fri, 12 Oct 2012 19:57:01 +0000 (20:57 +0100)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 7 Oct 2012 22:08:10 +0000 (22:08 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate Potlatch 2 to 2.3-491-gc7ccf78 build
Tom Hughes [Sun, 7 Oct 2012 15:08:13 +0000 (16:08 +0100)]
Update Potlatch 2 to 2.3-491-gc7ccf78 build

12 years agoDisplay a diary entry count on the user page
Paweł Paprota [Fri, 5 Oct 2012 17:54:58 +0000 (19:54 +0200)]
Display a diary entry count on the user page

12 years agoMatch wikipedia language prefixes case insensitively
Paweł Paprota [Fri, 5 Oct 2012 18:38:46 +0000 (20:38 +0200)]
Match wikipedia language prefixes case insensitively

Without this values like "PL:Article" are linked to the English Wikipedia.

12 years agoDon't remove language prefixes from wikipedia tags
Paweł Paprota [Fri, 5 Oct 2012 18:23:40 +0000 (20:23 +0200)]
Don't remove language prefixes from wikipedia tags

Removing the language prefix from the displayed value of a wikipedia
tag is confusing, so don't do it. Fixes trac #4135.

12 years agoSplit long line
Tom Hughes [Fri, 5 Oct 2012 23:13:54 +0000 (00:13 +0100)]
Split long line

12 years agoClean up diary_entry.js
John Firebaugh [Fri, 5 Oct 2012 19:03:26 +0000 (12:03 -0700)]
Clean up diary_entry.js

12 years agoMove diary entry JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 18:58:45 +0000 (11:58 -0700)]
Move diary entry JS to page-specific script file

12 years agoEliminate interpolation in diary entry JS
John Firebaugh [Fri, 5 Oct 2012 18:54:13 +0000 (11:54 -0700)]
Eliminate interpolation in diary entry JS

12 years agoUpdate Potlatch 2 to 2.3-486-g109b096 build
Tom Hughes [Fri, 5 Oct 2012 21:47:19 +0000 (22:47 +0100)]
Update Potlatch 2 to 2.3-486-g109b096 build

12 years agoSimplify further by using OSM.home
John Firebaugh [Fri, 5 Oct 2012 19:59:03 +0000 (12:59 -0700)]
Simplify further by using OSM.home

12 years agoRemove unused params code
John Firebaugh [Fri, 5 Oct 2012 19:40:46 +0000 (12:40 -0700)]
Remove unused params code

12 years agoRemove unnecessary call to closeMapPopup()
John Firebaugh [Fri, 5 Oct 2012 18:38:14 +0000 (11:38 -0700)]
Remove unnecessary call to closeMapPopup()

In the 'set_location' case no popups are ever opened.

12 years agoUse jQuery
John Firebaugh [Fri, 5 Oct 2012 17:29:20 +0000 (10:29 -0700)]
Use jQuery

12 years agoMove user JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 17:01:38 +0000 (10:01 -0700)]
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.

12 years agoRemove unnecessary delete statement
John Firebaugh [Fri, 5 Oct 2012 16:10:13 +0000 (09:10 -0700)]
Remove unnecessary delete statement

12 years agoDon't try and dereference an object that may not exist
Tom Hughes [Fri, 5 Oct 2012 17:01:02 +0000 (18:01 +0100)]
Don't try and dereference an object that may not exist

12 years agoRefactor updatelinks to avoid exceptions in updateLocation
Tom Hughes [Fri, 5 Oct 2012 15:02:26 +0000 (16:02 +0100)]
Refactor updatelinks to avoid exceptions in updateLocation

12 years agoRefactor mapParams to compose better with apiUrl
John Firebaugh [Fri, 5 Oct 2012 02:35:06 +0000 (19:35 -0700)]
Refactor mapParams to compose better with apiUrl

12 years agoExtract OSM.apiUrl
John Firebaugh [Fri, 5 Oct 2012 02:15:24 +0000 (19:15 -0700)]
Extract OSM.apiUrl

12 years agoMerge globals.js.erb and params.js
John Firebaugh [Fri, 5 Oct 2012 02:09:56 +0000 (19:09 -0700)]
Merge globals.js.erb and params.js

12 years agoRemove unused assign of @bbox which is no longer used
John Firebaugh [Fri, 5 Oct 2012 00:00:40 +0000 (17:00 -0700)]
Remove unused assign of @bbox which is no longer used

12 years agoMove remaining inline changeset JS to changeset.js
John Firebaugh [Thu, 4 Oct 2012 23:59:48 +0000 (16:59 -0700)]
Move remaining inline changeset JS to changeset.js

12 years agoMove changeset JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 00:32:14 +0000 (17:32 -0700)]
Move changeset JS to page-specific script file

12 years agoEliminate interpolation in changeset JS
John Firebaugh [Thu, 4 Oct 2012 23:52:45 +0000 (16:52 -0700)]
Eliminate interpolation in changeset JS

12 years agoRemove unused function
John Firebaugh [Thu, 4 Oct 2012 21:48:36 +0000 (14:48 -0700)]
Remove unused function

12 years agoAdd Polish translations to OpenLayers configuration.
Tom Hughes [Fri, 5 Oct 2012 07:55:18 +0000 (08:55 +0100)]
Add Polish translations to OpenLayers configuration.

12 years agoUpdate Potlatch 2 to 2.3-476-g1bce25a build
Tom Hughes [Thu, 4 Oct 2012 17:03:02 +0000 (18:03 +0100)]
Update Potlatch 2 to 2.3-476-g1bce25a build

12 years agoRestrict the embedded map to the declared extent
Tom Hughes [Thu, 4 Oct 2012 16:58:01 +0000 (17:58 +0100)]
Restrict the embedded map to the declared extent

12 years agoRemove redundant parameters from embedded map constructor
Tom Hughes [Thu, 4 Oct 2012 16:55:53 +0000 (17:55 +0100)]
Remove redundant parameters from embedded map constructor

12 years agoTidy up some CSS to match house style
Tom Hughes [Tue, 2 Oct 2012 18:40:53 +0000 (19:40 +0100)]
Tidy up some CSS to match house style

12 years agoFix cut and paste errors in inbox/outbox redesign
Tom Hughes [Tue, 2 Oct 2012 18:17:27 +0000 (19:17 +0100)]
Fix cut and paste errors in inbox/outbox redesign

12 years agoRedesign inbox
Tom MacWright [Thu, 9 Aug 2012 19:15:08 +0000 (15:15 -0400)]
Redesign inbox

Cuts down on buttons, grey, and bold clutter.

12 years agoPotlatch 2 localisation updates
Tom Hughes [Tue, 2 Oct 2012 17:40:44 +0000 (18:40 +0100)]
Potlatch 2 localisation updates

12 years agoRemove unnecessary $(window).load() callbacks
John Firebaugh [Tue, 2 Oct 2012 02:22:39 +0000 (19:22 -0700)]
Remove unnecessary $(window).load() callbacks

All this is already inside a $(document).ready() callback.

12 years agoAvoid a JS error on (e.g.) ?way=nnnnn
John Firebaugh [Tue, 2 Oct 2012 02:21:37 +0000 (19:21 -0700)]
Avoid a JS error on (e.g.) ?way=nnnnn

When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.

Registering the events earlier avoids the need to call
updateLocation manually at all.

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 2 Oct 2012 13:13:29 +0000 (13:13 +0000)]
Localisation updates from http://translatewiki.net.