]> git.openstreetmap.org Git - rails.git/log
rails.git
12 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Sat, 10 Mar 2012 15:30:25 +0000 (15:30 +0000)]
Merge branch 'master' into openstreetbugs

Conflicts:
config/routes.rb
db/structure.sql

12 years agoAvoid mass assignment error in spam observer
Tom Hughes [Sat, 10 Mar 2012 14:42:09 +0000 (14:42 +0000)]
Avoid mass assignment error in spam observer

12 years agoRemoved expiry code for bogus trace URLs that no longer exist
Tom Hughes [Sat, 10 Mar 2012 13:05:55 +0000 (13:05 +0000)]
Removed expiry code for bogus trace URLs that no longer exist

12 years agoSpecify the username when generating a URL for a trace
Tom Hughes [Sat, 10 Mar 2012 13:05:39 +0000 (13:05 +0000)]
Specify the username when generating a URL for a trace

12 years agoFix layout selection to detect OAuth correctly
Tom Hughes [Sat, 10 Mar 2012 12:46:10 +0000 (12:46 +0000)]
Fix layout selection to detect OAuth correctly

12 years agoLoad the piwik tracking code asynchronously
Tom Hughes [Sat, 10 Mar 2012 12:16:20 +0000 (12:16 +0000)]
Load the piwik tracking code asynchronously

12 years agoDon't escape the heading as it contains a link
Tom Hughes [Fri, 9 Mar 2012 23:06:14 +0000 (23:06 +0000)]
Don't escape the heading as it contains a link

12 years agoFix mass assignment errors with user blocks
Tom Hughes [Fri, 9 Mar 2012 23:04:17 +0000 (23:04 +0000)]
Fix mass assignment errors with user blocks

12 years agoFix various routing and route generation errors
Tom Hughes [Fri, 9 Mar 2012 23:01:21 +0000 (23:01 +0000)]
Fix various routing and route generation errors

12 years agoRemove method tests that are now enforced by the routes
Tom Hughes [Fri, 9 Mar 2012 20:19:55 +0000 (20:19 +0000)]
Remove method tests that are now enforced by the routes

12 years agoUpdate schema
Tom Hughes [Fri, 9 Mar 2012 20:17:21 +0000 (20:17 +0000)]
Update schema

12 years agoFix some incorrect tests that relied on the default routes
Tom Hughes [Fri, 9 Mar 2012 20:16:18 +0000 (20:16 +0000)]
Fix some incorrect tests that relied on the default routes

12 years agoRemove some unecessary routes and add lots of method constraints
Tom Hughes [Fri, 9 Mar 2012 20:15:34 +0000 (20:15 +0000)]
Remove some unecessary routes and add lots of method constraints

12 years agoAdd routing tests for all supported routes
Tom Hughes [Fri, 9 Mar 2012 18:28:06 +0000 (18:28 +0000)]
Add routing tests for all supported routes

12 years agoGet the per-user note list view working again
Tom Hughes [Fri, 9 Mar 2012 12:54:19 +0000 (12:54 +0000)]
Get the per-user note list view working again

12 years agoFix some bugs found by the note controller tests
Tom Hughes [Fri, 9 Mar 2012 00:42:43 +0000 (00:42 +0000)]
Fix some bugs found by the note controller tests

12 years agoUpdate note controller tests for new GeoJSON output
Tom Hughes [Fri, 9 Mar 2012 00:42:22 +0000 (00:42 +0000)]
Update note controller tests for new GeoJSON output

12 years agoRemove redundant routes and add default format specifiers
Tom Hughes [Fri, 9 Mar 2012 00:41:15 +0000 (00:41 +0000)]
Remove redundant routes and add default format specifiers

12 years agoUpdate schema
Tom Hughes [Fri, 9 Mar 2012 00:35:23 +0000 (00:35 +0000)]
Update schema

12 years agoFix mass assignment issues
Tom Hughes [Fri, 9 Mar 2012 00:34:16 +0000 (00:34 +0000)]
Fix mass assignment issues

12 years agoUser errors.add(:base) instead of the removed errors.add_to_base()
Tom Hughes [Fri, 9 Mar 2012 00:32:57 +0000 (00:32 +0000)]
User errors.add(:base) instead of the removed errors.add_to_base()

12 years agoMake setting of a default status for new notes work
Tom Hughes [Fri, 9 Mar 2012 00:31:53 +0000 (00:31 +0000)]
Make setting of a default status for new notes work

12 years agoInclude the event type in the JSON output of a note
Tom Hughes [Fri, 9 Mar 2012 00:29:22 +0000 (00:29 +0000)]
Include the event type in the JSON output of a note

12 years agoDrop with_format and user the new :formats render option instead
Tom Hughes [Fri, 9 Mar 2012 00:28:03 +0000 (00:28 +0000)]
Drop with_format and user the new :formats render option instead

12 years agoSave the user record after changing it
Tom Hughes [Fri, 9 Mar 2012 00:21:08 +0000 (00:21 +0000)]
Save the user record after changing it

12 years agoFix typo
Tom Hughes [Thu, 8 Mar 2012 23:17:38 +0000 (23:17 +0000)]
Fix typo

12 years agoUpdate Potlatch 2 to 2.3-212-g774c6a9 build
Tom Hughes [Thu, 8 Mar 2012 22:48:36 +0000 (22:48 +0000)]
Update Potlatch 2 to 2.3-212-g774c6a9 build

12 years agoUse normal assignment instead of mass assignment
Tom Hughes [Thu, 8 Mar 2012 22:41:25 +0000 (22:41 +0000)]
Use normal assignment instead of mass assignment

12 years agoMerge branch 'master' into openstreetbugs
Tom Hughes [Thu, 8 Mar 2012 18:23:27 +0000 (18:23 +0000)]
Merge branch 'master' into openstreetbugs

Conflicts:
Gemfile
Gemfile.lock
lib/migrate.rb

12 years agoUpdate Potlatch 2 to 2.3-210-g4e72cd6 build
Tom Hughes [Wed, 7 Mar 2012 21:20:51 +0000 (21:20 +0000)]
Update Potlatch 2 to 2.3-210-g4e72cd6 build

12 years agoAdd some more unit tests for traces
Tom Hughes [Wed, 7 Mar 2012 21:12:02 +0000 (21:12 +0000)]
Add some more unit tests for traces

12 years agoAdd some more unit tests for users
Tom Hughes [Wed, 7 Mar 2012 16:44:58 +0000 (16:44 +0000)]
Add some more unit tests for users

12 years agoUpdate schema
Tom Hughes [Wed, 7 Mar 2012 16:44:50 +0000 (16:44 +0000)]
Update schema

12 years agoAdd some extra unit tests for diary entries
Tom Hughes [Wed, 7 Mar 2012 15:45:47 +0000 (15:45 +0000)]
Add some extra unit tests for diary entries

12 years agoFix migration to work with mass assignment protection
Tom Hughes [Tue, 6 Mar 2012 19:00:49 +0000 (19:00 +0000)]
Fix migration to work with mass assignment protection

12 years agoUpdate Potlatch 2 to 2.3-209-g749f2c8 build
Tom Hughes [Tue, 6 Mar 2012 17:37:34 +0000 (17:37 +0000)]
Update Potlatch 2 to 2.3-209-g749f2c8 build

12 years agoUpdate Potlatch 2 to 2.3-208-g7b7f802 build
Tom Hughes [Tue, 6 Mar 2012 17:21:33 +0000 (17:21 +0000)]
Update Potlatch 2 to 2.3-208-g7b7f802 build

12 years agoUse cache store for sessions when memcached is not available
Tom Hughes [Tue, 6 Mar 2012 10:42:37 +0000 (10:42 +0000)]
Use cache store for sessions when memcached is not available

Using cookie store is problematic because there is a limit to the
amount of session data you can store, and we sometimes overflow.

12 years agoAdd a temporary hack to suppress some broken rails translations
Tom Hughes [Tue, 6 Mar 2012 09:21:26 +0000 (09:21 +0000)]
Add a temporary hack to suppress some broken rails translations

See https://github.com/svenfuchs/rails-i18n/issues/194 for more
information and progress on an upstream fix.

12 years agoTurn on mass assignment protection
Tom Hughes [Mon, 5 Mar 2012 16:31:11 +0000 (16:31 +0000)]
Turn on mass assignment protection

Require any attribute that is going to be mass assigned to be
whitelisted, and whitelist those attributes which need it

12 years agoUpdate Potlatch 2 to 2.3-207-g44e9559 build
Tom Hughes [Mon, 5 Mar 2012 08:47:39 +0000 (08:47 +0000)]
Update Potlatch 2 to 2.3-207-g44e9559 build

12 years agoCorrect name of simplified Chinese locale
Tom Hughes [Sun, 4 Mar 2012 17:44:50 +0000 (17:44 +0000)]
Correct name of simplified Chinese locale

12 years agoUpdate Potlatch 2 to 2.3-190-g0bb4cb3 build
Tom Hughes [Sun, 4 Mar 2012 17:36:25 +0000 (17:36 +0000)]
Update Potlatch 2 to 2.3-190-g0bb4cb3 build

12 years agoRemove translation reload that is no longer needed
Tom Hughes [Sun, 4 Mar 2012 15:10:51 +0000 (15:10 +0000)]
Remove translation reload that is no longer needed

Now that we are using the rails-i18n gem the rails locales are added
to the path early on and we don't need to reload to get them.

12 years agoRemove dummy locales as they are no longer needed
Tom Hughes [Sun, 4 Mar 2012 14:26:38 +0000 (14:26 +0000)]
Remove dummy locales as they are no longer needed

12 years agoFix interpolation variable errors
Tom Hughes [Sun, 4 Mar 2012 14:24:45 +0000 (14:24 +0000)]
Fix interpolation variable errors

12 years agoAdd a test to check the validity of the translations
Tom Hughes [Sun, 4 Mar 2012 14:24:21 +0000 (14:24 +0000)]
Add a test to check the validity of the translations

12 years agoUpdate Potlatch 2 to 2.3-153-gf0c9bef build
Tom Hughes [Sun, 4 Mar 2012 10:48:24 +0000 (10:48 +0000)]
Update Potlatch 2 to 2.3-153-gf0c9bef build

12 years agoFix some issues with the new tab styling
Tom MacWright [Tue, 28 Feb 2012 23:25:23 +0000 (18:25 -0500)]
Fix some issues with the new tab styling

Uses the parent of the tabnav element to do its positioning, and fixes
this style in RTL and small.

Also move the greetings block into the top-bar div in order to cleanly
have it share a border with tabs.

12 years agoSet overflow to auto to gracefully hide tabs before small mode is engaged
Tom MacWright [Mon, 27 Feb 2012 20:43:40 +0000 (15:43 -0500)]
Set overflow to auto to gracefully hide tabs before small mode is engaged

12 years agoRemove unused image
Tom Hughes [Sun, 26 Feb 2012 12:25:25 +0000 (12:25 +0000)]
Remove unused image

12 years agoRestyle the tabs as simple blocks
Tom MacWright [Fri, 17 Feb 2012 03:44:03 +0000 (22:44 -0500)]
Restyle the tabs as simple blocks

12 years agoUse a consistent host name in cache keys
Tom Hughes [Sat, 3 Mar 2012 12:24:00 +0000 (12:24 +0000)]
Use a consistent host name in cache keys

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