Kai Krueger
a6f45adede
Merge branch 'openstreetbugs' of git://git.openstreetmap.org/rails into openstreetbugs2
2011-04-29 20:49:38 -06:00
Kai Krueger
3b3896da08
Don't enable OSB layer by default
2011-04-29 20:42:26 -06:00
Kai Krueger
c322b0c298
Only show "Report a problem" link at zoom level 12 and higher
2011-04-29 19:55:29 -06:00
Tom Hughes
0a3087cd7d
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
2011-04-29 17:06:10 +01:00
Tom Hughes
af68e07272
Merge branch 'master' into openstreetbugs
2011-04-29 17:05:59 +01:00
Kai Krueger
b3d62bb85a
Send notification emails when someone comments on a map bug report
2011-04-27 12:01:52 -06:00
Kai Krueger
8cb83adf84
Deactivate OSB controller immediately after clicking a new bug
2011-04-22 10:07:36 -06:00
Kai Krueger
5e335b6a55
Link the openstreetbugs browse pages
2011-04-22 09:41:10 -06:00
Kai Krueger
4a23ee8baf
Grey out username text field for bugs when logged in.
2011-04-21 09:05:44 -06:00
Kai Krueger
d7afad9395
Use local files rather than remote ones for osb images
2011-04-21 08:01:23 -06:00
Tom Hughes
02e186ee5b
Allow user details to be fetched without agreeing terms
2011-04-20 21:17:59 +01:00
Kai Krueger
3d3f3982a0
users.visible has changed to users.status
2011-04-19 23:59:50 -06:00
Kai Krueger
91b9b65a41
Minor fix to updated OpenLayers
2011-04-19 22:49:10 -06:00
Kai Krueger
001ff5764b
Merge branch 'master' into openstreetbugs2
2011-04-19 22:00:30 -06:00
Tom Hughes
37b6418f72
Revert "Allow user details to be fetched without agreeing terms"
...
This reverts commit ddd12b03e1
2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1
Allow user details to be fetched without agreeing terms
2011-04-18 22:23:48 +01:00
Tom Hughes
6f7eb8f0e8
Don't require terms to be agreed when logging out
2011-04-18 09:04:57 +01:00
Matt Amos
c21aa5933a
Added flash notice for CTs decline
...
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
2011-04-18 00:29:15 +01:00
Tom Hughes
2ba5067fcf
Use report_error so Potlatch can see the errors
2011-04-17 21:45:04 +01:00
Tom Hughes
8024a38be4
Make sure "please read the terms" error is issued in the right language
2011-04-17 20:33:49 +01:00
Matt Amos
696fbb4e16
Renumbered sections to be more consistent with subsection numbering style
2011-04-13 13:17:21 +01:00
Matt Amos
2491328270
Reformatting contributor terms box based on suggestions by Tom
2011-04-13 13:17:17 +01:00
Matt Amos
55cc2e0fcf
Updated French and UK terms to 1.2.4
2011-04-13 13:17:13 +01:00
Tom Hughes
9f0cc74832
Make Potlatch 2 default to the en locale if there is nothing better
2011-04-06 21:42:03 +01:00
Tom Hughes
5f7855fa4d
Tell Potlatch 2 which locale to use
2011-04-06 21:22:47 +01:00
Tom Hughes
b77c6fe8ae
Improve recognition of OAuth referers for triggering of slim mode
2011-04-06 13:24:08 +01:00
Tom Hughes
685a35524a
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.
2011-04-04 22:44:43 +01:00
Tom Hughes
8f101a3759
Trigger mobile mode at 640px instead of 480px for iPhone 4 support
2011-04-03 18:02:27 +01:00
Tom Hughes
89bd91e7d8
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.
2011-04-03 16:11:20 +01:00
Tom Hughes
9e6e6c2e23
Fixup the user map code to match existing code style
2011-04-03 16:00:06 +01:00
Harry Wood
41589b6ef9
fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial
2011-04-03 15:43:41 +01:00
Tom Hughes
cb6d6c2463
Report a friendly(ish) error if no OAauth key is set for Potlatch 2
2011-04-03 15:40:05 +01:00
Dan Karran
d62da73ad7
Add a smaller version of the site logo and title for small screens
2011-04-03 15:16:35 +01:00
Tom Hughes
5777c5e925
Tidy up the data browser javascript
2011-04-03 14:59:43 +01:00
Frederik Ramm
59dcc8b253
Add 'hide areas' button to data view
2011-04-03 14:54:32 +01:00
Harry Wood
940995c816
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.
2011-04-03 13:46:18 +01:00
Tom Hughes
4b20afd51e
Preserve the referer at the end of account creation
2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8
Only show login/signup in slim mode when used from oauth
2011-04-03 13:46:18 +01:00
Tom Hughes
bb83f28a5e
Factor out comment code from layouts into partials
2011-04-03 13:46:17 +01:00
Andy Allan
6edbcc12df
Use slim layout for OAuth pages too
2011-04-03 13:46:17 +01:00
Andy Allan
7d7416894a
New version of slim layout with grey background and centered, auto-adjusting page
2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146
Another approach, but this time without scattering stuff all over the methods
2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1
Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect
2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34
Use the slim layout on the login page
2011-04-03 13:46:16 +01:00
Andy Allan
873fe81f71
Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest
2011-04-03 13:46:16 +01:00
Tom Hughes
aa8fef0f94
Don't display deleted marker for nodes
2011-04-03 13:46:16 +01:00
Frederik Ramm
935c238626
Show the position of a deleted node in browse mode
2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855
Make sure the user is redirect correctly after seeing the terms
2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015
Tidy up a few things
2011-04-03 13:46:16 +01:00
Tom Hughes
b3bcbbeb3b
Move SOTM advert above the optionals
2011-04-03 13:46:16 +01:00
