]> git.openstreetmap.org Git - rails.git/log
rails.git
9 years agoSet default formats in the database now that rails handles enums
Tom Hughes [Sat, 10 Jan 2015 15:34:03 +0000 (15:34 +0000)]
Set default formats in the database now that rails handles enums

Because rails now reads the defaults from the database correctly it
no longer works to set them conditionally in after_initialise as they
have already been set.

9 years agoUpdated for changes in rails HTML testing
Tom Hughes [Sat, 10 Jan 2015 12:40:41 +0000 (12:40 +0000)]
Updated for changes in rails HTML testing

9 years agoReplace deprecated reset method with restore method
Tom Hughes [Sat, 10 Jan 2015 12:37:52 +0000 (12:37 +0000)]
Replace deprecated reset method with restore method

9 years agoReplace deprecated deliver method with deliver_now
Tom Hughes [Sat, 10 Jan 2015 11:46:57 +0000 (11:46 +0000)]
Replace deprecated deliver method with deliver_now

9 years agoCleanup migrations
Tom Hughes [Sat, 10 Jan 2015 11:45:39 +0000 (11:45 +0000)]
Cleanup migrations

Cleanup our migrations, replacing as much of our custom code
and monkey patching with modern standard rails methods.

9 years agoUpdate to rails 4.2.0
Tom Hughes [Sat, 20 Dec 2014 15:08:16 +0000 (15:08 +0000)]
Update to rails 4.2.0

9 years agoFix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 17:38:32 +0000 (17:38 +0000)]
Fix invalid CSS selectors

9 years agoRestore removal of div and style elements when sanitizing HTML
Tom Hughes [Sat, 10 Jan 2015 17:37:15 +0000 (17:37 +0000)]
Restore removal of div and style elements when sanitizing HTML

9 years agoFix login tests to check whether logins succeed/fail as expected
Tom Hughes [Sat, 10 Jan 2015 17:04:58 +0000 (17:04 +0000)]
Fix login tests to check whether logins succeed/fail as expected

9 years agoUse correct URL
Tom Hughes [Sat, 10 Jan 2015 16:51:28 +0000 (16:51 +0000)]
Use correct URL

9 years agoFix broken translations
Tom Hughes [Sat, 10 Jan 2015 15:51:41 +0000 (15:51 +0000)]
Fix broken translations

9 years agoUse assert_dom_equal to compare HTML text
Tom Hughes [Sat, 10 Jan 2015 15:20:20 +0000 (15:20 +0000)]
Use assert_dom_equal to compare HTML text

9 years agoFix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 15:19:28 +0000 (15:19 +0000)]
Fix invalid CSS selectors

9 years agoDon't pass ActiveRecord objects to find and exists?
Tom Hughes [Sat, 10 Jan 2015 12:35:52 +0000 (12:35 +0000)]
Don't pass ActiveRecord objects to find and exists?

9 years agoFix invalid CSS selectors
Tom Hughes [Sat, 10 Jan 2015 12:33:36 +0000 (12:33 +0000)]
Fix invalid CSS selectors

9 years agoRemove unused performance test stub
Tom Hughes [Sat, 10 Jan 2015 11:48:35 +0000 (11:48 +0000)]
Remove unused performance test stub

9 years agoUpdate to rails 4.1.9
Tom Hughes [Thu, 8 Jan 2015 10:06:22 +0000 (10:06 +0000)]
Update to rails 4.1.9

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 2 Jan 2015 10:04:15 +0000 (11:04 +0100)]
Localisation updates from https://translatewiki.net.

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 27 Dec 2014 16:05:10 +0000 (17:05 +0100)]
Localisation updates from https://translatewiki.net.

10 years agoUpdate Potlatch 2 to 2.3-650-gad99430 build
Tom Hughes [Sat, 20 Dec 2014 11:41:47 +0000 (11:41 +0000)]
Update Potlatch 2 to 2.3-650-gad99430 build

10 years agoDon't raise APIAlreadyDeletedError when deleting with if-unused
Bryan Housel [Tue, 16 Dec 2014 04:39:46 +0000 (23:39 -0500)]
Don't raise APIAlreadyDeletedError when deleting with if-unused
related: openstreetmap/iD#2475

10 years agoDon't render the offline page for XHR requests
Tom Hughes [Sun, 14 Dec 2014 00:28:26 +0000 (00:28 +0000)]
Don't render the offline page for XHR requests

10 years agoMake development mode work when the database is offline
Tom Hughes [Sun, 14 Dec 2014 00:27:48 +0000 (00:27 +0000)]
Make development mode work when the database is offline

10 years agoDisable the "add note" button in database offline mode
Tom Hughes [Sun, 14 Dec 2014 00:27:31 +0000 (00:27 +0000)]
Disable the "add note" button in database offline mode

10 years agoQuery mode doesn't need the database
Tom Hughes [Sun, 14 Dec 2014 00:18:46 +0000 (00:18 +0000)]
Query mode doesn't need the database

10 years agoUpdate bundle
Tom Hughes [Mon, 8 Dec 2014 08:02:00 +0000 (08:02 +0000)]
Update bundle

10 years agoRemove unnecessary local variable
Adam Conrad [Mon, 8 Dec 2014 00:04:21 +0000 (19:04 -0500)]
Remove unnecessary local variable

The local variable `app` was unused and therefore not needed
to be declared with initialization

10 years agoLosslessly compressed all images using optipng and advpng
David Gumberg [Mon, 8 Dec 2014 00:36:39 +0000 (16:36 -0800)]
Losslessly compressed all images using optipng and advpng

10 years agoFix typo
Sean Hussey [Wed, 3 Dec 2014 16:24:07 +0000 (11:24 -0500)]
Fix typo

10 years agoFix exception when message limit is hit
Tom Hughes [Tue, 2 Dec 2014 21:29:12 +0000 (21:29 +0000)]
Fix exception when message limit is hit

10 years agoPrefer a key=value match over a key only match for object descriptions
Tom Hughes [Mon, 24 Nov 2014 11:00:24 +0000 (11:00 +0000)]
Prefer a key=value match over a key only match for object descriptions

10 years agoInclude number of recent diary entries in spam scoring
Tom Hughes [Thu, 20 Nov 2014 21:18:00 +0000 (21:18 +0000)]
Include number of recent diary entries in spam scoring

10 years agoMake sure button_to buttons are separated by whitespace
Tom Hughes [Wed, 19 Nov 2014 00:21:58 +0000 (00:21 +0000)]
Make sure button_to buttons are separated by whitespace

10 years agoDon't paginate redactions
Tom Hughes [Wed, 19 Nov 2014 00:11:51 +0000 (00:11 +0000)]
Don't paginate redactions

The index view doesn't render any pagination controls, and there
aren't enough redactions for pagination to be necessary yet.

Fixes #735

10 years agoUpdate ohauth
Tom Hughes [Tue, 18 Nov 2014 17:58:45 +0000 (17:58 +0000)]
Update ohauth

10 years agoUpdate jQuery plugins
Tom Hughes [Tue, 18 Nov 2014 17:57:21 +0000 (17:57 +0000)]
Update jQuery plugins

10 years agoUpdate html5shiv
Tom Hughes [Tue, 18 Nov 2014 17:57:09 +0000 (17:57 +0000)]
Update html5shiv

10 years agoUpdate vendor URLs
Tom Hughes [Tue, 18 Nov 2014 17:56:42 +0000 (17:56 +0000)]
Update vendor URLs

10 years agoUpdate attribution for embedded maps
Tom Hughes [Tue, 18 Nov 2014 17:41:45 +0000 (17:41 +0000)]
Update attribution for embedded maps

Fixes #838

10 years agoUpdate to rails 4.1.8
Tom Hughes [Mon, 17 Nov 2014 19:09:22 +0000 (19:09 +0000)]
Update to rails 4.1.8

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 14 Nov 2014 12:56:13 +0000 (13:56 +0100)]
Localisation updates from https://translatewiki.net.

10 years agoStringify user ID
Tom Hughes [Wed, 12 Nov 2014 09:44:21 +0000 (09:44 +0000)]
Stringify user ID

10 years agoRevert "Add SOTM advert"
Tom Hughes [Sun, 9 Nov 2014 23:03:04 +0000 (23:03 +0000)]
Revert "Add SOTM advert"

This reverts commit 15a7276a9f50821a7728b4da3af16849284f251b.

10 years agoUpdate to rails 4.1.7
Tom Hughes [Sun, 9 Nov 2014 22:41:12 +0000 (22:41 +0000)]
Update to rails 4.1.7

10 years agoTrack users in piwik
Tom Hughes [Sun, 9 Nov 2014 22:41:01 +0000 (22:41 +0000)]
Track users in piwik

10 years agoHandle unknown admin_level values
Tom Hughes [Fri, 7 Nov 2014 19:17:34 +0000 (19:17 +0000)]
Handle unknown admin_level values

10 years agoAllow query mode to be turned off at low zoom
Tom Hughes [Fri, 7 Nov 2014 15:58:05 +0000 (15:58 +0000)]
Allow query mode to be turned off at low zoom

Fixes #830

10 years agoLook for locale specific names
Tom Hughes [Fri, 7 Nov 2014 15:19:30 +0000 (15:19 +0000)]
Look for locale specific names

10 years agoDon't do the admin boundary special case unless admin_level is set
Tom Hughes [Fri, 7 Nov 2014 15:00:22 +0000 (15:00 +0000)]
Don't do the admin boundary special case unless admin_level is set

10 years agoMerge branch 'overpass'
Tom Hughes [Fri, 7 Nov 2014 08:40:18 +0000 (08:40 +0000)]
Merge branch 'overpass'

10 years agoRecommend PostgreSQL 9.1+ in database.yml
Paul Norman [Fri, 7 Nov 2014 05:41:15 +0000 (21:41 -0800)]
Recommend PostgreSQL 9.1+ in database.yml

Postgres 8.3 is EOL and the minimum version supported by PostgreSQL
is 9.0. The production servers run 9.1, and the extension setup is
easier with it too.

10 years agoLink to Phusion Passenger docs for production
Paul Norman [Fri, 7 Nov 2014 05:17:30 +0000 (21:17 -0800)]
Link to Phusion Passenger docs for production

Phusion Passenger has documentation for common web servers, so we can
link to them, as most users will be using one of them in production.

10 years agoAdd KSJ2 tags to uninteresting list
Paul Norman [Thu, 6 Nov 2014 21:02:17 +0000 (13:02 -0800)]
Add KSJ2 tags to uninteresting list

The KSJ2 tags often appear on nodes with no interesting tags
as import cruft.

10 years agoDon't enable query mode when loading a query URL
Tom Hughes [Wed, 5 Nov 2014 20:19:21 +0000 (20:19 +0000)]
Don't enable query mode when loading a query URL

10 years agoAdd comments_feed action to various filters
Tom Hughes [Wed, 5 Nov 2014 20:34:45 +0000 (20:34 +0000)]
Add comments_feed action to various filters

Fixes #825

10 years agoAllow query mode to be disabled when the sidebar is open
Tom Hughes [Wed, 5 Nov 2014 13:57:52 +0000 (13:57 +0000)]
Allow query mode to be disabled when the sidebar is open

10 years agoLeave overpass result links coloured blue
Dan Stowell [Mon, 13 Oct 2014 20:17:12 +0000 (21:17 +0100)]
Leave overpass result links coloured blue

Closes #47.

10 years agoSort enclosing features by size
Tom Hughes [Tue, 4 Nov 2014 09:55:26 +0000 (09:55 +0000)]
Sort enclosing features by size

10 years agoAdd some missing browse icons
Dan Karran [Tue, 28 Oct 2014 20:15:40 +0000 (20:15 +0000)]
Add some missing browse icons

Icons for highway=tertiary, highway=track, highway=path and barrier=wall.

10 years agoDon't centre on load if the location is already in view
Tom Hughes [Sat, 1 Nov 2014 17:20:26 +0000 (17:20 +0000)]
Don't centre on load if the location is already in view

10 years agoUse new overpass geometry output support to get geometeries
Tom Hughes [Sat, 1 Nov 2014 16:11:12 +0000 (16:11 +0000)]
Use new overpass geometry output support to get geometeries

10 years agoMerge branch 'master' into overpass
Tom Hughes [Sat, 1 Nov 2014 12:46:42 +0000 (12:46 +0000)]
Merge branch 'master' into overpass

10 years agoMerge branch 'comments'
Tom Hughes [Sat, 1 Nov 2014 11:43:21 +0000 (11:43 +0000)]
Merge branch 'comments'

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 27 Oct 2014 17:58:16 +0000 (18:58 +0100)]
Localisation updates from https://translatewiki.net.

10 years agoFixes for offline mode
Tom Hughes [Sun, 26 Oct 2014 11:39:00 +0000 (11:39 +0000)]
Fixes for offline mode

10 years agoUpdate to iD v1.6.2
John Firebaugh [Fri, 24 Oct 2014 16:26:09 +0000 (09:26 -0700)]
Update to iD v1.6.2

10 years agoUpdate to iD v1.6.1
John Firebaugh [Thu, 23 Oct 2014 22:29:26 +0000 (15:29 -0700)]
Update to iD v1.6.1

10 years agoMove changeset comment feeds out of the API namespace
Tom Hughes [Thu, 23 Oct 2014 20:40:13 +0000 (21:40 +0100)]
Move changeset comment feeds out of the API namespace

10 years agoTidy up changeset comment tests and beef them up a bit
Tom Hughes [Sun, 19 Oct 2014 20:34:50 +0000 (21:34 +0100)]
Tidy up changeset comment tests and beef them up a bit

10 years agoTidy up changeset comment code
Tom Hughes [Sun, 19 Oct 2014 20:31:23 +0000 (21:31 +0100)]
Tidy up changeset comment code

10 years agoChangeset discussions
Łukasz Gurdek [Sun, 7 Sep 2014 13:25:56 +0000 (14:25 +0100)]
Changeset discussions

Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 23 Oct 2014 19:37:57 +0000 (21:37 +0200)]
Localisation updates from https://translatewiki.net.

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 20 Oct 2014 17:07:29 +0000 (19:07 +0200)]
Localisation updates from https://translatewiki.net.

10 years agoUpdate Potlatch 2 to 2.3-648-g9cab056 build
Tom Hughes [Mon, 20 Oct 2014 08:04:15 +0000 (09:04 +0100)]
Update Potlatch 2 to 2.3-648-g9cab056 build

10 years agoMerge remote-tracking branch 'osmlab/iD-1.6.0'
Tom Hughes [Fri, 17 Oct 2014 16:21:37 +0000 (17:21 +0100)]
Merge remote-tracking branch 'osmlab/iD-1.6.0'

10 years agoAdd some more model tests for notes and note comments
Tom Hughes [Thu, 16 Oct 2014 19:36:40 +0000 (20:36 +0100)]
Add some more model tests for notes and note comments

10 years agoValidate note comments for control characters
Tom Hughes [Wed, 15 Oct 2014 23:59:34 +0000 (00:59 +0100)]
Validate note comments for control characters

10 years agoAdd missing event types to note comment fixtures
Tom Hughes [Wed, 15 Oct 2014 23:59:24 +0000 (00:59 +0100)]
Add missing event types to note comment fixtures

10 years agoUpdate Potlatch 2 to 2.3-645-g81e8bcb build
Tom Hughes [Tue, 14 Oct 2014 10:10:06 +0000 (11:10 +0100)]
Update Potlatch 2 to 2.3-645-g81e8bcb build

10 years agoDon't pass the hash when routing an empty search query
Tom Hughes [Mon, 13 Oct 2014 13:04:19 +0000 (14:04 +0100)]
Don't pass the hash when routing an empty search query

Fixes #793

10 years agoUpdate to CPK 7.0.11 and drop monkey patch
Tom Hughes [Fri, 10 Oct 2014 11:31:42 +0000 (12:31 +0100)]
Update to CPK 7.0.11 and drop monkey patch

10 years agoUpdate to iD v1.6.0
John Firebaugh [Mon, 6 Oct 2014 21:58:08 +0000 (14:58 -0700)]
Update to iD v1.6.0

10 years agoForward the `comment` hash parameter to iD
John Firebaugh [Mon, 6 Oct 2014 21:47:36 +0000 (14:47 -0700)]
Forward the `comment` hash parameter to iD

See https://github.com/openstreetmap/iD/commit/21da76cf8060832e36d341d9bd41dd1142810b08

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 6 Oct 2014 10:11:58 +0000 (12:11 +0200)]
Localisation updates from https://translatewiki.net.

10 years agoTest that reserved usernames are not allowed
Tom Hughes [Thu, 2 Oct 2014 18:54:26 +0000 (19:54 +0100)]
Test that reserved usernames are not allowed

10 years agoUpdate to rails 4.1.6
Tom Hughes [Thu, 11 Sep 2014 19:03:43 +0000 (20:03 +0100)]
Update to rails 4.1.6

10 years agoBan usernames which match special URLs
Tom Hughes [Thu, 2 Oct 2014 12:36:46 +0000 (13:36 +0100)]
Ban usernames which match special URLs

Trac #5236

10 years agoExplain how to load data for testing
Paul Norman [Tue, 9 Sep 2014 00:12:10 +0000 (17:12 -0700)]
Explain how to load data for testing

This is a fairly common query, and not too complicated where the data only needs to be loaded.

Loading data then editing it is more complex, and not covered here.

10 years agoMove noscript message clear of the sidebar
Tom Hughes [Sun, 7 Sep 2014 12:48:28 +0000 (13:48 +0100)]
Move noscript message clear of the sidebar

Fixes #808

10 years agoAdd SOTM advert
Tom Hughes [Thu, 4 Sep 2014 14:25:56 +0000 (15:25 +0100)]
Add SOTM advert

10 years agoAdd an imagery blacklist to capabilities
Paul Norman [Sat, 30 Aug 2014 08:32:35 +0000 (01:32 -0700)]
Add an imagery blacklist to capabilities

This blacklist is for imagery which is of an incompatible license or ToS
but is incorrectly used with some frequency.

This adds a <policy> element to the capabilities XML which contains the
blacklist information within it

10 years agoMove ICO favion into an IE conditional comment
Tom Hughes [Tue, 19 Aug 2014 09:55:01 +0000 (10:55 +0100)]
Move ICO favion into an IE conditional comment

10 years agoUpdate to rails 4.1.5
Tom Hughes [Tue, 19 Aug 2014 08:26:34 +0000 (09:26 +0100)]
Update to rails 4.1.5

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sun, 10 Aug 2014 09:46:50 +0000 (11:46 +0200)]
Localisation updates from https://translatewiki.net.

10 years agoAddd some missing quotes
Tom Hughes [Sun, 10 Aug 2014 07:55:06 +0000 (08:55 +0100)]
Addd some missing quotes

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 9 Aug 2014 14:21:12 +0000 (16:21 +0200)]
Localisation updates from https://translatewiki.net.

10 years agoadding detail to configure.md
Martijn van Exel [Thu, 7 Aug 2014 21:38:32 +0000 (15:38 -0600)]
adding detail to configure.md

10 years agoRevert "Localisation updates from https://translatewiki.net."
Tom Hughes [Wed, 6 Aug 2014 15:04:13 +0000 (16:04 +0100)]
Revert "Localisation updates from https://translatewiki.net."

This reverts commit e25fbfa13af4b5b2ffa0b998b45d8706d38b2c88.

10 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 6 Aug 2014 14:50:27 +0000 (16:50 +0200)]
Localisation updates from https://translatewiki.net.

10 years agoPrecompile expressInstall.swf
Tom Hughes [Wed, 6 Aug 2014 07:58:47 +0000 (08:58 +0100)]
Precompile expressInstall.swf