]>
git.openstreetmap.org Git - rails.git/log
Kai Krueger [Sat, 30 Apr 2011 02:49:38 +0000 (20:49 -0600)]
Merge branch 'openstreetbugs' of git://git.openstreetmap.org/rails into openstreetbugs2
Kai Krueger [Sat, 30 Apr 2011 02:42:26 +0000 (20:42 -0600)]
Don't enable OSB layer by default
Kai Krueger [Sat, 30 Apr 2011 02:38:32 +0000 (20:38 -0600)]
Increase font-size of the "report a problem" link
Kai Krueger [Sat, 30 Apr 2011 02:37:51 +0000 (20:37 -0600)]
Make the bug popups look a little nicer
Kai Krueger [Sat, 30 Apr 2011 01:55:29 +0000 (19:55 -0600)]
Only show "Report a problem" link at zoom level 12 and higher
Tom Hughes [Fri, 29 Apr 2011 16:06:10 +0000 (17:06 +0100)]
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
Tom Hughes [Fri, 29 Apr 2011 16:05:59 +0000 (17:05 +0100)]
Merge branch 'master' into openstreetbugs
Tom Hughes [Thu, 28 Apr 2011 22:05:11 +0000 (23:05 +0100)]
Update Potlatch 2 to
2.0-16-g106bbd1 build
Kai Krueger [Wed, 27 Apr 2011 18:01:52 +0000 (12:01 -0600)]
Send notification emails when someone comments on a map bug report
Siebrand Mazeland [Tue, 26 Apr 2011 06:52:50 +0000 (08:52 +0200)]
Rename incorrectly named file.
Siebrand Mazeland [Tue, 26 Apr 2011 06:50:23 +0000 (08:50 +0200)]
Remove incorrect language file.
Kai Krueger [Fri, 22 Apr 2011 17:20:10 +0000 (11:20 -0600)]
Add a note that the OSB client side js library has been adapted from the original
Kai Krueger [Fri, 22 Apr 2011 17:17:32 +0000 (11:17 -0600)]
Update OSB internationalisation to match the rails_port way
Kai Krueger [Fri, 22 Apr 2011 16:07:36 +0000 (10:07 -0600)]
Deactivate OSB controller immediately after clicking a new bug
Kai Krueger [Fri, 22 Apr 2011 16:06:33 +0000 (10:06 -0600)]
Forgott to copy over an image from openstreetbugs.schokokeks.org
Kai Krueger [Fri, 22 Apr 2011 15:47:25 +0000 (09:47 -0600)]
Remove references to old server location
Kai Krueger [Fri, 22 Apr 2011 15:41:10 +0000 (09:41 -0600)]
Link the openstreetbugs browse pages
Kai Krueger [Thu, 21 Apr 2011 15:05:44 +0000 (09:05 -0600)]
Grey out username text field for bugs when logged in.
Kai Krueger [Thu, 21 Apr 2011 14:16:53 +0000 (08:16 -0600)]
Change bug comment to a textarea to make it easier to input longer comments
Kai Krueger [Thu, 21 Apr 2011 14:01:23 +0000 (08:01 -0600)]
Use local files rather than remote ones for osb images
Tom Hughes [Wed, 20 Apr 2011 19:57:01 +0000 (20:57 +0100)]
Allow user details to be fetched without agreeing terms
Tom Hughes [Wed, 20 Apr 2011 18:24:54 +0000 (19:24 +0100)]
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
Tom Hughes [Wed, 20 Apr 2011 18:23:39 +0000 (19:23 +0100)]
Merge branch 'master' into openstreetbugs
Siebrand Mazeland [Wed, 20 Apr 2011 07:58:59 +0000 (09:58 +0200)]
Localisation updates from http://translatewiki.net.
Kai Krueger [Wed, 20 Apr 2011 05:59:50 +0000 (23:59 -0600)]
users.visible has changed to users.status
Kai Krueger [Wed, 20 Apr 2011 04:49:10 +0000 (22:49 -0600)]
Minor fix to updated OpenLayers
Kai Krueger [Wed, 20 Apr 2011 04:00:30 +0000 (22:00 -0600)]
Merge branch 'master' into openstreetbugs2
Tom Hughes [Mon, 18 Apr 2011 23:29:17 +0000 (00:29 +0100)]
Add credit to Direction Générale des Impôts for French data
Tom Hughes [Mon, 18 Apr 2011 22:04:42 +0000 (23:04 +0100)]
Revert "Allow user details to be fetched without agreeing terms"
This reverts commit
ddd12b03e1e7e1a674350a1eb98d90a2155df26d .
Tom Hughes [Mon, 18 Apr 2011 21:23:48 +0000 (22:23 +0100)]
Allow user details to be fetched without agreeing terms
Tom Hughes [Mon, 18 Apr 2011 11:49:36 +0000 (12:49 +0100)]
Update Potlatch 2 to
2.0-14-gc925264 build
Tom Hughes [Mon, 18 Apr 2011 08:04:57 +0000 (09:04 +0100)]
Don't require terms to be agreed when logging out
Matt Amos [Sun, 17 Apr 2011 23:03:39 +0000 (00:03 +0100)]
Added flash notice for CTs decline
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
Tom Hughes [Sun, 17 Apr 2011 20:45:04 +0000 (21:45 +0100)]
Use report_error so Potlatch can see the errors
Tom Hughes [Sun, 17 Apr 2011 19:33:49 +0000 (20:33 +0100)]
Make sure "please read the terms" error is issued in the right language
Tom Hughes [Sun, 17 Apr 2011 17:56:50 +0000 (18:56 +0100)]
Add memcache support
Matt Amos [Wed, 13 Apr 2011 08:29:55 +0000 (09:29 +0100)]
Renumbered sections to be more consistent with subsection numbering style
Matt Amos [Sun, 10 Apr 2011 23:31:01 +0000 (00:31 +0100)]
Reformatting contributor terms box based on suggestions by Tom
Matt Amos [Sun, 10 Apr 2011 22:40:19 +0000 (23:40 +0100)]
Updated French and UK terms to 1.2.4
Siebrand Mazeland [Mon, 11 Apr 2011 12:49:51 +0000 (14:49 +0200)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Fri, 8 Apr 2011 19:03:39 +0000 (20:03 +0100)]
Update Potlatch 2 to
2.0-10-g07a59e4 build
Siebrand Mazeland [Thu, 7 Apr 2011 11:52:04 +0000 (13:52 +0200)]
Localisation updates from http://translatewiki.net
Tom Hughes [Thu, 7 Apr 2011 10:16:23 +0000 (11:16 +0100)]
Don't use the en_US locale for Potlatch 2 as it doesn't work
Tom Hughes [Wed, 6 Apr 2011 20:42:03 +0000 (21:42 +0100)]
Make Potlatch 2 default to the en locale if there is nothing better
Tom Hughes [Wed, 6 Apr 2011 20:26:18 +0000 (21:26 +0100)]
Update Potlatch 2 to
2.0-6-g929356f build
Tom Hughes [Wed, 6 Apr 2011 20:22:47 +0000 (21:22 +0100)]
Tell Potlatch 2 which locale to use
Tom Hughes [Wed, 6 Apr 2011 19:21:37 +0000 (20:21 +0100)]
Switch to i18n version 0.5.0 but keep old style interpolation
It's impossible to stop rails 2 loading a newer i18n gem if it is
installed, so go with the flow and use the latest one but override
the interpolation pattern for now.
Tom Hughes [Wed, 6 Apr 2011 12:24:08 +0000 (13:24 +0100)]
Improve recognition of OAuth referers for triggering of slim mode
Tom Hughes [Tue, 5 Apr 2011 09:12:23 +0000 (10:12 +0100)]
Update Potlatch 2 to
2.0-5-gabe766c build
Matt Amos [Mon, 4 Apr 2011 23:46:48 +0000 (00:46 +0100)]
Changed button text to match http://stateofthemap.org banner heading.
Tom Hughes [Mon, 4 Apr 2011 21:44:43 +0000 (22:44 +0100)]
Try and patch up poor browser language selections
The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.
Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.
Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.
Tom Hughes [Mon, 4 Apr 2011 11:52:53 +0000 (12:52 +0100)]
Update Potlatch 2 to
2.0-4-g7d1d145 build
Tom Hughes [Sun, 3 Apr 2011 17:22:22 +0000 (18:22 +0100)]
Spell adapter correctly
Dan Karran [Sun, 3 Apr 2011 16:50:31 +0000 (17:50 +0100)]
Fixing the user settings page for mobile use
Also add a quick workaround for the occasions when the top right
links overlap the logo and site name. We'll need a better fix for
this in the longer run.
Tom Hughes [Sun, 3 Apr 2011 17:02:27 +0000 (18:02 +0100)]
Trigger mobile mode at 640px instead of 480px for iPhone 4 support
Tom Hughes [Sun, 3 Apr 2011 16:39:06 +0000 (17:39 +0100)]
Monkey patch postgres adapter for postgres 9 support
Tom Hughes [Sun, 3 Apr 2011 16:13:24 +0000 (17:13 +0100)]
Update Potlatch 2 to
2.0-2-g954c74a build
Dan Karran [Sun, 3 Apr 2011 15:45:42 +0000 (16:45 +0100)]
Make the changeset browser more mobile friendly
Floating some of the cells in the changeset browser onto the following
line should mean we don't need to scroll horizontally through that table.
Dan Karran [Sun, 3 Apr 2011 15:08:21 +0000 (16:08 +0100)]
Making more of the site smartphone friendly
For example limiting field widths to 100%, extending other elements
to full width, etc.
Tom Hughes [Sun, 3 Apr 2011 15:11:20 +0000 (16:11 +0100)]
Link from a diary entry to the relevant user's diary
Fix #2956 by making the title on a diary entry a link back to the
diary list page for the author.
Tom Hughes [Sun, 3 Apr 2011 15:00:06 +0000 (16:00 +0100)]
Fixup the user map code to match existing code style
Harry Wood [Sun, 3 Apr 2011 14:24:09 +0000 (15:24 +0100)]
fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial
Tom Hughes [Sun, 3 Apr 2011 14:40:05 +0000 (15:40 +0100)]
Report a friendly(ish) error if no OAauth key is set for Potlatch 2
Dan Karran [Sun, 3 Apr 2011 13:50:39 +0000 (14:50 +0100)]
Add a smaller version of the site logo and title for small screens
Tom Hughes [Sun, 3 Apr 2011 13:59:43 +0000 (14:59 +0100)]
Tidy up the data browser javascript
Frederik Ramm [Sat, 1 May 2010 18:14:53 +0000 (20:14 +0200)]
Add 'hide areas' button to data view
Tom Hughes [Sun, 3 Apr 2011 13:40:51 +0000 (14:40 +0100)]
Make Potlatch 2 the default editor in the example configuration
Tom Hughes [Sun, 3 Apr 2011 13:33:55 +0000 (14:33 +0100)]
Update Potlatch 2 to 2.0 build
Harry Wood [Sat, 2 Apr 2011 17:53:37 +0000 (18:53 +0100)]
Make home location setting map default to the whole world
Defaulting to western europe doesn't seem very reasonable these
days as we have users all over the world now.
Tom Hughes [Sun, 3 Apr 2011 10:22:39 +0000 (11:22 +0100)]
Preserve the referer at the end of account creation
Tom Hughes [Sun, 3 Apr 2011 10:16:57 +0000 (11:16 +0100)]
Only show login/signup in slim mode when used from oauth
Tom Hughes [Sun, 3 Apr 2011 09:52:59 +0000 (10:52 +0100)]
Make CTs full width in slim mode
Tom Hughes [Sun, 3 Apr 2011 09:27:08 +0000 (10:27 +0100)]
Factor out comment code from layouts into partials
Andy Allan [Mon, 21 Mar 2011 16:29:30 +0000 (16:29 +0000)]
Tweaks to the contributor terms styling
The 60% trick doesn't work now that the terms are what defines the height (rather than the sidebar). Also, add a margin to bring the floating buttons within range of the slim container.
Andy Allan [Mon, 21 Mar 2011 16:23:53 +0000 (16:23 +0000)]
No longer needed, and messes up the login page
Andy Allan [Mon, 21 Mar 2011 16:21:55 +0000 (16:21 +0000)]
Change around how this works - the container adjusts to the right height, and it's the (fixed-size) header that's absolute positioned instead of the content
Andy Allan [Mon, 21 Mar 2011 16:18:17 +0000 (16:18 +0000)]
Use slim layout for OAuth pages too
Andy Allan [Wed, 16 Feb 2011 17:13:14 +0000 (17:13 +0000)]
Add a grey box around login dialog
Andy Allan [Wed, 16 Feb 2011 17:12:48 +0000 (17:12 +0000)]
New version of slim layout with grey background and centered, auto-adjusting page
Andy Allan [Thu, 27 Jan 2011 17:55:36 +0000 (17:55 +0000)]
Another approach, but this time without scattering stuff all over the methods
Andy Allan [Thu, 27 Jan 2011 17:28:25 +0000 (17:28 +0000)]
Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect
Andy Allan [Thu, 27 Jan 2011 14:53:59 +0000 (14:53 +0000)]
Use the slim layout on the login page
Andy Allan [Thu, 27 Jan 2011 14:53:39 +0000 (14:53 +0000)]
Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest
Tom Hughes [Sun, 3 Apr 2011 09:01:23 +0000 (10:01 +0100)]
Don't display deleted marker for nodes
Frederik Ramm [Sat, 2 Apr 2011 14:58:44 +0000 (16:58 +0200)]
Show the position of a deleted node in browse mode
Tom Hughes [Sat, 2 Apr 2011 16:41:14 +0000 (17:41 +0100)]
Make sure the user is redirect correctly after seeing the terms
Tom Hughes [Sat, 2 Apr 2011 15:40:51 +0000 (16:40 +0100)]
Default REQUIRE_TERMS_SEEN to false for now
Tom Hughes [Sat, 2 Apr 2011 15:35:20 +0000 (16:35 +0100)]
Don't run the user terms tests unless REQUIRE_TERMS_SEEN is set
Tom Hughes [Sat, 2 Apr 2011 15:20:29 +0000 (16:20 +0100)]
Tidy up a few things
Tom Hughes [Sat, 2 Apr 2011 15:00:32 +0000 (16:00 +0100)]
Move SOTM advert above the optionals
Matt Amos [Tue, 22 Mar 2011 10:26:10 +0000 (10:26 +0000)]
Phase 2 CTs implementation and tests, with config parameter
Matt Amos [Fri, 1 Apr 2011 09:03:00 +0000 (10:03 +0100)]
Added SOTM 2011 banner to the side bar
Tom Hughes [Sat, 2 Apr 2011 14:48:56 +0000 (15:48 +0100)]
Make diary locations into a link and drop the separate view link
Harry Wood [Sat, 2 Apr 2011 14:26:37 +0000 (15:26 +0100)]
Remove edit links from geo-located diary entries
Jumping straight into the editor from a diary entry is not a
particularly useful thing to do. Fixes trac ticket #3626.
Tom Hughes [Sat, 2 Apr 2011 14:40:12 +0000 (15:40 +0100)]
Add a marker to the edit tab to indicate that it has a menu
Tom Hughes [Fri, 1 Apr 2011 07:50:31 +0000 (08:50 +0100)]
Rebuild OpenLayers with patch for OpenLayers ticket #2848
OpenStreetMap ticket #3399 reports than the transition effects are
not working properly on the map - brining in this upstream patch is
an attempt to fix that.
Tom Hughes [Tue, 29 Mar 2011 14:11:28 +0000 (15:11 +0100)]
Update Potlatch 2 to
0.5-295-g3fdb3c2 build
Tom Hughes [Tue, 29 Mar 2011 10:56:02 +0000 (11:56 +0100)]
Update Potlatch 2 to
0.5-294-g58c9d2c build
Tom Hughes [Fri, 25 Mar 2011 22:51:39 +0000 (22:51 +0000)]
Handle changesets with an empty string as the comment
Tom Hughes [Tue, 15 Mar 2011 14:38:22 +0000 (14:38 +0000)]
Update Potlatch 2 to
0.5-293-g6780e5b build