cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3491 commits 4 branches 1 tag 499 MiB
Commit graph

1846 commits

Author SHA1 Message Date
Tom Hughes
dd7ef37ec0 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	config/locales/en.yml
 2010-09-06 12:49:10 +01:00
Tom Hughes
39a014075a Revert "We can cache the trace list for logged in users now" 
This reverts commit f30dcd1a62.
 2010-09-01 13:47:06 +01:00
Tom Hughes
ba70c100f1 Set the default trace visibility on the upload form 2010-08-24 21:32:07 +01:00
Tom Hughes
2ce394118d Allow uncompressed GPX traces to be fetched from the API 2010-08-24 21:21:02 +01:00
Tom Hughes
b3d92954d3 Use normal notice system to display login banner 2010-08-13 15:13:30 +01:00
Matt Amos
047027c95d Added login banner letting users more aware of the license change 2010-08-13 15:13:30 +01:00
Tom Hughes
6c2089da2d Don't refer to the decline button when there isn't one 2010-08-12 18:09:36 +01:00
Frederik Ramm
9aaafcb425 Add new <contributor-terms> element to user details 2010-08-12 17:47:51 +01:00
Tom Hughes
e055b8e2f8 Fix spelling of referer 2010-08-10 18:13:34 +01:00
Tom Hughes
a99b516962 Allow existing users to voluntarily sign up for the contributor terms 
Based on a patch from Frederik Ramm this change allows users to make a
voluntary decision to sign up for the new contributor terms.
 2010-08-10 18:08:11 +01:00
Tom Hughes
2adcfc1a72 Don't allow paging of the changeset atom feed 
Make any request for a changeset feed with a page argument redirect
to the version with no page argument and ensure that any RSS links on
the HTML version of the changeset list don't have a page argument.
 2010-08-09 13:47:21 +01:00
Matt Amos
838b1ee7e9 Fixed AMF controller to validate changeset comments 
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
 2010-08-08 16:23:11 +01:00
Tom Hughes
4633838e21 Make sure the trace tab always links to the global trace list 2010-08-06 10:40:00 +01:00
Tom Hughes
c5b35406a6 More fixed to trace redirection 
Redirect to list on a delete, not view. Also reorder the routes so
the more specific ones are first.
 2010-08-06 10:31:20 +01:00
Tom Hughes
1ba40521af Really fix the redirect on trace deletion 2010-08-06 09:59:11 +01:00
Tom Hughes
289ab7c19d Fix redirect on deleting a trace 2010-08-06 09:56:49 +01:00
Tom Hughes
cf9cfd10a1 Fix redirect after a trace is uploaded 2010-08-06 09:53:53 +01:00
Tom Hughes
f07819d81a Rework application configuration 
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
 2010-08-04 22:06:05 +01:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
7298467306 Fix scoping of reverse geocode result 2010-07-23 00:53:36 +01:00
Tom Hughes
9f83acfb44 Move the trace upload form from the list to a create trace page 2010-07-22 21:00:39 +01:00
Tom Hughes
f30dcd1a62 We can cache the trace list for logged in users now 2010-07-22 20:47:35 +01:00
Tom Hughes
af70363d02 Don't cache actions with a page number 2010-07-22 20:47:35 +01:00
Tom Hughes
0e19a9290d Remove use of wildcard cache expiry 
Instead of doing wildcard cache expiry, just iterate over the
available locales, expiring the requested entry in each locale.
 2010-07-22 20:47:34 +01:00
Tom Hughes
cd3fc33171 Remove the user type from cache keys 2010-07-22 20:47:34 +01:00
Tom Hughes
b551fef0b7 Present "too many pending traces" message as a warning box 2010-07-22 20:47:34 +01:00
Tom Hughes
5a2ffa227c Convert trace views to use CSS based user specific components 2010-07-22 20:47:29 +01:00
Tom Hughes
6f73468f18 Convert diary views to use CSS based user specific components 2010-07-21 22:24:35 +01:00
Tom Hughes
51195c450d Add support for CSS based control of user specific components 
Define some helper routines which can be used to make page elements
only display when the logged in user matches certain conditions and
add style rules to the layout to trigger those elements based on the
logged in user.
 2010-07-21 21:49:20 +01:00
Tom Hughes
84b39122f1 Make the suspended user view work again 
The suspended user view was broken in 2a2818d so it threw an error
instead of rendering a friendyish message.
 2010-07-20 08:55:08 +01:00
Tom Hughes
f7aeff3dd6 Revert "Add advert for SOTM 2010 to sidebar" 
This reverts commit 3590335221.

Conflicts:

	app/views/layouts/site.html.erb
	config/locales/en.yml
 2010-07-12 22:40:46 +01:00
Tom Hughes
136d6508c2 Remove maintenance notice 2010-07-03 07:44:24 +01:00
Tom Hughes
a7a4dadbd5 Add a notice about the downtime 2010-06-30 12:51:22 +01:00
Tom Hughes
6740cab85b Use the correct name for the interpolation variable 2010-06-29 15:19:54 +01:00
Tom Hughes
2038cd52c6 Include an [OpenStreetMap] prefix on the subject of message notifications 
Put back the [OpenStreetMap] prefix to the subject line of email
notifications of messages, but strip it again from any incoming
email replies.
 2010-06-29 09:43:30 +01:00
Tom Hughes
b4a22eee71 Reject leading and trailing whitespace in display names 2010-06-28 17:47:05 +01:00
Tom Hughes
81f5c72c76 Merge branch 'master' into openid 2010-06-27 16:29:18 +01:00
Tom Hughes
0e40a4f1c4 Make changeset browser show an error when the database is offline 2010-06-27 14:42:47 +01:00
Tom Hughes
e7303fe287 Add language codes to diary bodies 
Wrap diary bodies in a div with the correct language code for the
entry set on the div. Closes #2572.
 2010-06-26 16:35:25 +01:00
Tom Hughes
eefb42334f Use the message title as the subject of notification mails 
Make message notification mails use the message title as the subject
so that it is properly perserved when replying by email. Closes #3051.
 2010-06-26 16:03:47 +01:00
Tom Hughes
7bfcadd385 Add version number based ids to browser history pages 2010-06-26 15:43:17 +01:00
Tom Hughes
68368118a6 Add timeout to describe_location and handle exceptions 2010-06-19 07:53:22 +01:00
Ævar Arnfjörð Bjarmason
4806913e18 browse_helper: Correctly link to wiki pages whose keys or values contain spaces 
The update-wiki-pages script normalizes " " to "_" (since MediaWiki
does it by design), but I didn't normalize it back in the
browse_helper.

Consequently objects with tags like "source=Isle of Man Government
aerial imagery (2001)" were never linked to the wiki correctly.
 2010-06-17 13:33:01 +00:00
Tom Hughes
6a3cadb52d Merge branch 'master' into openid 2010-06-16 21:18:44 +01:00
Tom Hughes
b43f9c4714 Link SOTM advert to the landing page 2010-06-16 21:16:42 +01:00
Tom Hughes
f973bee52b Make database offline work in production 2010-06-15 10:40:47 +01:00
Tom Hughes
180228b7e3 Rename layouts.sotm resource to avoid using stale translations 2010-06-08 18:01:21 +01:00
Tom Hughes
3590335221 Add advert for SOTM 2010 to sidebar 2010-06-08 17:09:21 +01:00
Dan Karran
af217ca140 More historic and tourist-related icons 2010-06-07 22:43:01 +01:00
Dan Karran
2aae01a590 Add strikethrough style to browser when objects are deleted 2010-06-07 22:43:01 +01:00