]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 3 Mar 2012 12:43:40 +0000 (13:43 +0100)]
Localisation updates from http://translatewiki.net.

12 years agoUpdate the username cookie when the display name is changed
Tom Hughes [Sat, 3 Mar 2012 00:49:03 +0000 (00:49 +0000)]
Update the username cookie when the display name is changed

12 years agoDetect changes to the user image correctly
Tom Hughes [Sat, 3 Mar 2012 00:11:42 +0000 (00:11 +0000)]
Detect changes to the user image correctly

12 years agoUpdate to rails 3.2.2
Tom Hughes [Fri, 2 Mar 2012 09:22:15 +0000 (09:22 +0000)]
Update to rails 3.2.2

12 years agoUpdate rails-i18n to 0.5.1
Tom Hughes [Fri, 2 Mar 2012 09:19:12 +0000 (09:19 +0000)]
Update rails-i18n to 0.5.1

This update allows us to drop our pluralization support, as rails-i18n
now takes care of that, and for a far wider range of locales.

12 years agoFix broken interpolations
Tom Hughes [Thu, 1 Mar 2012 15:47:18 +0000 (15:47 +0000)]
Fix broken interpolations

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 1 Mar 2012 15:27:53 +0000 (16:27 +0100)]
Localisation updates from http://translatewiki.net.

12 years agoRemove references to mapnik in the export pane
Tom Hughes [Thu, 1 Mar 2012 12:19:44 +0000 (12:19 +0000)]
Remove references to mapnik in the export pane

12 years agoRename "Mapnik" to "Standard" in the layer switcher
Tom Hughes [Thu, 1 Mar 2012 12:18:55 +0000 (12:18 +0000)]
Rename "Mapnik" to "Standard" in the layer switcher

12 years agoRemove osmarender export option
Tom Hughes [Thu, 1 Mar 2012 11:21:34 +0000 (11:21 +0000)]
Remove osmarender export option

12 years agoRemove the osmarender map layer
Tom Hughes [Thu, 1 Mar 2012 09:45:41 +0000 (09:45 +0000)]
Remove the osmarender map layer

12 years agoUse the rails-i18n gem instead of local copies of locale data
Tom Hughes [Wed, 29 Feb 2012 00:25:18 +0000 (00:25 +0000)]
Use the rails-i18n gem instead of local copies of locale data

12 years agoSimplify login page
Tom MacWright [Sun, 26 Feb 2012 23:47:49 +0000 (18:47 -0500)]
Simplify login page

Moves action buttons to be with the form instead of way over on
the opposite side of the page.

Reorganizes "remember me" to a more typical spot on the page.

Get rid of separate "create account" panel and replace it with an
above the fold link.

12 years agoRemoved line break
Tom Hughes [Wed, 29 Feb 2012 00:03:31 +0000 (00:03 +0000)]
Removed line break

12 years agoGenerate correct links to diary entries
Tom Hughes [Tue, 28 Feb 2012 22:58:12 +0000 (22:58 +0000)]
Generate correct links to diary entries

12 years agoImprove the diary comments view
Tom Hughes [Tue, 28 Feb 2012 21:49:41 +0000 (21:49 +0000)]
Improve the diary comments view

Make sure all strings are translatable; replace a manually constructed
link with link_to; improve date formatting; and use cycle to alternate
colours for the table rows.

12 years agoAdd a view to show diary comments left by a user
Steve Singer [Sat, 25 Feb 2012 20:46:11 +0000 (15:46 -0500)]
Add a view to show diary comments left by a user

12 years agoAdd additional notice to UMP attribution per request of LWG
Grant Slater [Tue, 28 Feb 2012 12:40:48 +0000 (12:40 +0000)]
Add additional notice to UMP attribution per request of LWG

12 years agoAdd "South Africa Chief Directorate: National Geo-Spatial Information" to copyright...
Grant Slater [Tue, 28 Feb 2012 12:21:50 +0000 (12:21 +0000)]
Add "South Africa Chief Directorate: National Geo-Spatial Information" to copyright notices

12 years agoUpdate README with more information on getting involved
Tom Hughes [Mon, 27 Feb 2012 18:21:00 +0000 (18:21 +0000)]
Update README with more information on getting involved

12 years agoPipeline memcache requests to the cache
Tom Hughes [Thu, 23 Feb 2012 21:43:14 +0000 (21:43 +0000)]
Pipeline memcache requests to the cache

12 years agoDon't use the binary memcache protocol
Tom Hughes [Thu, 23 Feb 2012 21:42:33 +0000 (21:42 +0000)]
Don't use the binary memcache protocol

The binary protocol appears to offer no perforance advantage and
doesn't support pipelining of requests.

12 years agoChange session expiry to 28 days when "remember me" is set
Tom Hughes [Thu, 23 Feb 2012 11:26:02 +0000 (11:26 +0000)]
Change session expiry to 28 days when "remember me" is set

The expiry is passed directly to memcache, which treats any value
over 30 days as an absolute time, so using 1 month leads to sessions
expiring as soon as they are created.

12 years agoSwitch to using memcache as the session store
Tom Hughes [Thu, 23 Feb 2012 11:25:15 +0000 (11:25 +0000)]
Switch to using memcache as the session store

As a temporary measure any session which is not found in memcache
will be looked for in the database instead.

12 years agoRefactor memcache connection handling
Tom Hughes [Thu, 23 Feb 2012 11:16:08 +0000 (11:16 +0000)]
Refactor memcache connection handling

12 years agoRefactor session persistence code
Tom Hughes [Wed, 22 Feb 2012 22:28:48 +0000 (22:28 +0000)]
Refactor session persistence code

12 years agoUpdate Potlatch 2 to 2.3-142-gecedc05 build
Tom Hughes [Sun, 26 Feb 2012 16:24:02 +0000 (16:24 +0000)]
Update Potlatch 2 to 2.3-142-gecedc05 build

12 years agoSimplify Potlatch 2 locale lookup table
Tom Hughes [Sun, 26 Feb 2012 16:22:50 +0000 (16:22 +0000)]
Simplify Potlatch 2 locale lookup table

12 years agoCorrect misspellings of CC BY[-SA]
Siebrand Mazeland [Sat, 25 Feb 2012 14:56:30 +0000 (15:56 +0100)]
Correct misspellings of CC BY[-SA]

12 years agoAdd a stub locale file for "no" so that fallback works
Tom Hughes [Sat, 25 Feb 2012 00:12:04 +0000 (00:12 +0000)]
Add a stub locale file for "no" so that fallback works

12 years agoAdd GPLv2 license file and mention in README
Tom MacWright [Tue, 14 Feb 2012 17:51:37 +0000 (12:51 -0500)]
Add GPLv2 license file and mention in README

12 years agoUpdate schema
Tom Hughes [Thu, 23 Feb 2012 16:05:58 +0000 (16:05 +0000)]
Update schema

12 years agoCommit the generated database schema
Tom Hughes [Thu, 23 Feb 2012 15:58:45 +0000 (15:58 +0000)]
Commit the generated database schema

12 years agoMake sure we don't attach alert handler multiple times
Tom Hughes [Tue, 21 Feb 2012 19:22:01 +0000 (19:22 +0000)]
Make sure we don't attach alert handler multiple times

Before adding a "not zoomed in enough" alert handler, make sure any
existing handler is removed. Fixes #17.

12 years agoDon't escape the user pagination links
Tom Hughes [Tue, 21 Feb 2012 17:01:53 +0000 (17:01 +0000)]
Don't escape the user pagination links

12 years agoServe up paperclip attachments in a cache friendly way
Tom Hughes [Mon, 20 Feb 2012 00:38:05 +0000 (00:38 +0000)]
Serve up paperclip attachments in a cache friendly way

12 years agoRemove unncessary include of RMagick
Tom Hughes [Tue, 21 Feb 2012 10:46:27 +0000 (10:46 +0000)]
Remove unncessary include of RMagick

12 years agoDrop rmagick as paperclip just uses the ImageMagick command line tool
Tom Hughes [Tue, 21 Feb 2012 10:42:12 +0000 (10:42 +0000)]
Drop rmagick as paperclip just uses the ImageMagick command line tool

12 years agoAdd image fingerprints to users
Tom Hughes [Sun, 19 Feb 2012 17:34:52 +0000 (17:34 +0000)]
Add image fingerprints to users

12 years agoDon't escape the title - rails will handle it
Tom Hughes [Mon, 20 Feb 2012 11:45:17 +0000 (11:45 +0000)]
Don't escape the title - rails will handle it

12 years agoDon't escape the name - rails will handle it
Tom Hughes [Mon, 20 Feb 2012 11:44:43 +0000 (11:44 +0000)]
Don't escape the name - rails will handle it

12 years agoFix bad database query for RSS feeds of trace file tags
Tom Hughes [Sun, 19 Feb 2012 11:48:33 +0000 (11:48 +0000)]
Fix bad database query for RSS feeds of trace file tags

12 years agoUpdate Potlatch 2 to 2.3-136-g81ae8fd build
Tom Hughes [Sun, 19 Feb 2012 11:43:54 +0000 (11:43 +0000)]
Update Potlatch 2 to 2.3-136-g81ae8fd build

12 years agoRemove bogus leading slash from image URL
Tom Hughes [Sun, 19 Feb 2012 11:37:22 +0000 (11:37 +0000)]
Remove bogus leading slash from image URL

12 years agoAdd apple-touch-icon link to the layout
Tom Hughes [Sun, 19 Feb 2012 11:29:14 +0000 (11:29 +0000)]
Add apple-touch-icon link to the layout

12 years agoAvoid double render error
Tom Hughes [Sun, 19 Feb 2012 11:04:59 +0000 (11:04 +0000)]
Avoid double render error

12 years agoDon't double up newlines in the log
Tom Hughes [Sun, 19 Feb 2012 10:52:54 +0000 (10:52 +0000)]
Don't double up newlines in the log

12 years agoCompressedMemCacheStore has been replaced by MemCacheStore
Tom Hughes [Sun, 19 Feb 2012 10:43:37 +0000 (10:43 +0000)]
CompressedMemCacheStore has been replaced by MemCacheStore

12 years agoExplicitly disable the layout for actions which don't want it
Tom Hughes [Wed, 15 Feb 2012 10:08:43 +0000 (10:08 +0000)]
Explicitly disable the layout for actions which don't want it

12 years agoRequire version 1.2.0 of deadlock retry for postgres support
Tom Hughes [Wed, 15 Feb 2012 08:35:05 +0000 (08:35 +0000)]
Require version 1.2.0 of deadlock retry for postgres support

12 years agoRemove ancient (and unused) composite_primary_keys gem
Tom Hughes [Mon, 13 Feb 2012 10:43:51 +0000 (10:43 +0000)]
Remove ancient (and unused) composite_primary_keys gem

12 years agoMake sure we don't inherit old tags when parsing XML for objects
Tom Hughes [Mon, 13 Feb 2012 10:29:03 +0000 (10:29 +0000)]
Make sure we don't inherit old tags when parsing XML for objects

12 years agoReplace deprecated methods with modern equivalents
Tom Hughes [Mon, 13 Feb 2012 09:32:10 +0000 (09:32 +0000)]
Replace deprecated methods with modern equivalents

12 years agoequire composite_primary_keys 5.0.0
Tom Hughes [Mon, 13 Feb 2012 08:43:50 +0000 (08:43 +0000)]
equire composite_primary_keys 5.0.0

12 years agoRemove backported code now we are using mail 2.4.1
Tom Hughes [Mon, 30 Jan 2012 22:53:40 +0000 (22:53 +0000)]
Remove backported code now we are using mail 2.4.1

12 years agoUpdate to rails 3.2.1
Tom Hughes [Sun, 29 Jan 2012 23:01:59 +0000 (23:01 +0000)]
Update to rails 3.2.1

12 years agoRemove remnants of old lower case relation member types
Tom Hughes [Tue, 24 Jan 2012 00:26:54 +0000 (00:26 +0000)]
Remove remnants of old lower case relation member types

12 years agoActionController::UnknownAction is now AbstractController::ActionNotFound
Tom Hughes [Mon, 23 Jan 2012 23:10:16 +0000 (23:10 +0000)]
ActionController::UnknownAction is now AbstractController::ActionNotFound

12 years agoRequire composite_primary_keys 5.0.0.rc1
Tom Hughes [Mon, 23 Jan 2012 18:27:47 +0000 (18:27 +0000)]
Require composite_primary_keys 5.0.0.rc1

12 years agoTurn session-persistence plugin into a library
Tom Hughes [Sat, 21 Jan 2012 15:11:35 +0000 (15:11 +0000)]
Turn session-persistence plugin into a library

12 years agoSwitch to using deadlock_retry as a gem
Tom Hughes [Sat, 21 Jan 2012 15:00:56 +0000 (15:00 +0000)]
Switch to using deadlock_retry as a gem

12 years agoReplace the file_column plugin with paperclip
Tom Hughes [Sat, 21 Jan 2012 13:23:27 +0000 (13:23 +0000)]
Replace the file_column plugin with paperclip

12 years agoTurn output_compression plugin into a library
Tom Hughes [Sat, 21 Jan 2012 11:53:14 +0000 (11:53 +0000)]
Turn output_compression plugin into a library

12 years agoTurn classic_pagination plugin into a library
Tom Hughes [Sat, 21 Jan 2012 11:27:04 +0000 (11:27 +0000)]
Turn classic_pagination plugin into a library

12 years agoSwitch to using http_accept_language as a gem
Tom Hughes [Sat, 21 Jan 2012 11:20:39 +0000 (11:20 +0000)]
Switch to using http_accept_language as a gem

12 years agoIgnore db/structure.sql
Tom Hughes [Sat, 21 Jan 2012 11:15:42 +0000 (11:15 +0000)]
Ignore db/structure.sql

12 years agoUpdate to rails 3.2.0
Tom Hughes [Sat, 21 Jan 2012 00:40:09 +0000 (00:40 +0000)]
Update to rails 3.2.0

12 years agoRestore borders to maps on various pages
Tom Hughes [Wed, 15 Feb 2012 17:47:42 +0000 (17:47 +0000)]
Restore borders to maps on various pages

12 years agoReduce the effect of the user description on the spam score
Tom Hughes [Wed, 15 Feb 2012 16:24:43 +0000 (16:24 +0000)]
Reduce the effect of the user description on the spam score

12 years agoRevert "Log locale selection"
Tom Hughes [Tue, 14 Feb 2012 15:47:21 +0000 (15:47 +0000)]
Revert "Log locale selection"

This reverts commit 101ee6ade2a24e8c468badb82d56c17b04e0df37.

12 years agoPrefer an exact language match over a prefix match
Tom Hughes [Tue, 14 Feb 2012 15:26:01 +0000 (15:26 +0000)]
Prefer an exact language match over a prefix match

12 years agoLog locale selection
Tom Hughes [Tue, 14 Feb 2012 14:57:29 +0000 (14:57 +0000)]
Log locale selection

12 years agoDon't remove the content area border on the copyright page
Tom Hughes [Tue, 14 Feb 2012 12:03:54 +0000 (12:03 +0000)]
Don't remove the content area border on the copyright page

12 years agoAllow the copyright page to be requested in any locale
Tom Hughes [Tue, 14 Feb 2012 11:54:22 +0000 (11:54 +0000)]
Allow the copyright page to be requested in any locale

12 years agoPut pretty route for /copyright/locale first
Tom Hughes [Tue, 14 Feb 2012 11:53:44 +0000 (11:53 +0000)]
Put pretty route for /copyright/locale first

12 years agoUse the same subhead style for search results as export
Tom Hughes [Sun, 12 Feb 2012 15:36:02 +0000 (15:36 +0000)]
Use the same subhead style for search results as export

12 years agoTidy up the stylesheets
Tom Hughes [Sun, 12 Feb 2012 10:49:45 +0000 (10:49 +0000)]
Tidy up the stylesheets

12 years agoImprove sidebar styling a little
Tom Hughes [Sun, 12 Feb 2012 10:45:17 +0000 (10:45 +0000)]
Improve sidebar styling a little

12 years agoFix sidebar border and padding, tweak styles to simplify borders
Tom MacWright [Sat, 11 Feb 2012 17:50:01 +0000 (12:50 -0500)]
Fix sidebar border and padding, tweak styles to simplify borders

Move font sizes and line heights up in the stylesheet structure
to make the left element more uniform. Make the padding of the
menu the same as the other elements.

12 years agoTidy up the stylesheets
Tom Hughes [Sat, 11 Feb 2012 13:11:52 +0000 (13:11 +0000)]
Tidy up the stylesheets

12 years agoRead the content area size before making any changes
Tom Hughes [Sat, 11 Feb 2012 11:32:08 +0000 (11:32 +0000)]
Read the content area size before making any changes

Adjusting the position of the map can impact the apparent size of
the content area, so make sure we read that before we start making
any changes to the position and size of the map.

12 years agoCleanup style
Tom MacWright [Thu, 9 Feb 2012 17:44:32 +0000 (12:44 -0500)]
Cleanup style

This is a mild restyling of OpenStreetMap. Changes include:

  * Remove margin from map, add more margin to text content
  * Rearrange permalink & link buttons and gives them a background
  * Pull OpenStreetMap text below logo along with subtitle
  * Simplify sidebar styling
  * Move towards a baseline, start to consolidate text size and line height

This is tested with LTR, RTL, and the compact mode, and looks good. Looks
more uniform in older browsers because it relies less on round corners.

12 years agoMake ACLs match when the address is equal
Tom Hughes [Sun, 12 Feb 2012 14:53:07 +0000 (14:53 +0000)]
Make ACLs match when the address is equal

12 years agoAdd convenience methods to make ACL use simpler
Tom Hughes [Wed, 8 Feb 2012 22:38:02 +0000 (22:38 +0000)]
Add convenience methods to make ACL use simpler

12 years agoDon't check the ACL unless we're creating a new user
Tom Hughes [Wed, 8 Feb 2012 22:35:13 +0000 (22:35 +0000)]
Don't check the ACL unless we're creating a new user

12 years agoDon't escape mailto link on blocked signup page
Tom Hughes [Wed, 8 Feb 2012 21:41:46 +0000 (21:41 +0000)]
Don't escape mailto link on blocked signup page

12 years agoAdd support for domain based ACLs
Tom Hughes [Wed, 8 Feb 2012 21:40:21 +0000 (21:40 +0000)]
Add support for domain based ACLs

12 years agoRemove one more netmask reference
Tom Hughes [Wed, 8 Feb 2012 16:09:32 +0000 (16:09 +0000)]
Remove one more netmask reference

12 years agoBlock any address with more than one suspended user
Tom Hughes [Wed, 8 Feb 2012 16:08:45 +0000 (16:08 +0000)]
Block any address with more than one suspended user

12 years agoUpdate for removal of netmask from ACLs
Tom Hughes [Wed, 8 Feb 2012 16:07:59 +0000 (16:07 +0000)]
Update for removal of netmask from ACLs

12 years agoCombine the address and netmask for an ACL in one column
Tom Hughes [Wed, 8 Feb 2012 14:09:50 +0000 (14:09 +0000)]
Combine the address and netmask for an ACL in one column

12 years agoStop pretending we support MySQL
Tom Hughes [Wed, 8 Feb 2012 14:08:49 +0000 (14:08 +0000)]
Stop pretending we support MySQL

12 years agoUpdate Potlatch 2 to 2.3-134-g8d7993f build
Tom Hughes [Mon, 6 Feb 2012 14:06:16 +0000 (14:06 +0000)]
Update Potlatch 2 to 2.3-134-g8d7993f build

12 years agoLeave https wikipedia URLs unmolested
Tom Hughes [Mon, 6 Feb 2012 08:54:10 +0000 (08:54 +0000)]
Leave https wikipedia URLs unmolested

12 years agoUpdate Potlatch 2 to 2.3-133-g5bcdfba build
Tom Hughes [Sun, 5 Feb 2012 22:21:33 +0000 (22:21 +0000)]
Update Potlatch 2 to 2.3-133-g5bcdfba build

12 years agoDon't eager load models when the database is offline
Tom Hughes [Sat, 4 Feb 2012 00:42:47 +0000 (00:42 +0000)]
Don't eager load models when the database is offline

12 years agoHandle character encodings in single part emails correctly
Tom Hughes [Fri, 3 Feb 2012 22:40:35 +0000 (22:40 +0000)]
Handle character encodings in single part emails correctly

12 years agoFixes and cleanups suggested by JSHint
Tom MacWright [Tue, 31 Jan 2012 22:50:31 +0000 (17:50 -0500)]
Fixes and cleanups suggested by JSHint

12 years agoCorrect mistakenly translated interpolation variable name
Tom Hughes [Mon, 30 Jan 2012 22:33:41 +0000 (22:33 +0000)]
Correct mistakenly translated interpolation variable name

12 years agoMonkey patch mail to handle character encodings on ruby 1.8
Tom Hughes [Mon, 30 Jan 2012 21:36:46 +0000 (21:36 +0000)]
Monkey patch mail to handle character encodings on ruby 1.8