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

3651 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
d9f9cf4056 Mention help.openstreetmap.org in the welcome message 2010-09-10 11:20:00 +01:00
Tom Hughes
f3132f94f8 Link to help.openstreetmap.org from the sidebar 2010-09-10 11:14:00 +01:00
Tom Hughes
b477cd5492 Remove unused/non-functional tag searching methods 2010-09-09 21:32:15 +01:00
Tom Hughes
d28457b005 Update to OpenLayers 2.10 2010-09-09 16:27:50 +01:00
Tom Hughes
945d60ea5a Merge branch 'master' into openid 2010-09-09 09:07:13 +01:00
Tom Hughes
8f5c54f805 Fix typo 2010-09-09 09:06:58 +01:00
Tom Hughes
79276fb43a Merge branch 'master' into openid 2010-09-09 09:06:12 +01:00
Tom Hughes
1980cf1da8 Fix typo 2010-09-09 09:05:59 +01:00
Tom Hughes
a22b0c1b64 Fix typo 2010-09-09 09:05:25 +01:00
Tom Hughes
d8006be822 Use the keyid to identify the layer to using when exporting to an 
embeddable map. Fixes #3221.
 2010-09-08 17:13:54 +01:00
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
6669253f9c Suppress deprecation warning from i18n 2010-09-02 20:00:43 +01:00
Tom Hughes
782ddc9c3e Require i18n version 0.4.1 and fix monkey patch to work with it 
Rails 3 pulls in i18n version 0.4.1 as a separate gem which then
breaks our code if it is running on a machine with rails 3 installed
as it tries to monkey patch i18n and fails, so this fix allows us
to run on a machine with rails 3 installed.
 2010-09-02 19:01:21 +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
Siebrand Mazeland
75aa771498 Localisation updates from http://transatewiki.net 2010-08-30 20:18:13 +02:00
Siebrand Mazeland
da24a83748 Localisation updates from http://translatewiki.net 2010-08-29 13:19:34 +02: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
232337c08b Update cyclemap layer to use new tile server 2010-08-15 17:35:08 +01:00
Tom Hughes
b17523c893 Rename application.yml to example.application.yml 2010-08-13 22:50:18 +01:00
Ævar Arnfjörð Bjarmason
bf2149cfcb config/legales/FR.yml: Invalid YAML killed the French contributor terms 2010-08-13 15:13:31 +01:00
Tom Hughes
dbfb7c1e1d Add french version of text for when there is no decline button 2010-08-13 15:13:30 +01:00
Tom Hughes
2def7c187e Don't process overlay layers in old-style layer configurations 
There are no overlay layers that we actually want to be persistent, and
the removal of the maplint layer means that old configurations generally
open the wrong overlays now anyway.
 2010-08-13 15:13:30 +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
Grant Slater
5857871924 CT Intro text amend. 2010-08-11 15:23:40 +01:00
Tom Hughes
027312fa7e Reorder routes so correct one is selected 2010-08-11 15:23:40 +01:00
Grant Slater
292975b1d5 Change consider_pd_why_url to OSMF site. 2010-08-11 15:23:37 +01:00
Grant Slater
051be3013f Fix OpenLayers 404 image URL to not redirect 2010-08-11 15:23:34 +01:00
Grant Slater
49ffd3cd08 Set zero Openlayers Buffer to test influence on server. 2010-08-11 15:23:14 +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
Siebrand Mazeland
13c60137c2 Localisation updates from http://translatewiki.net 2010-08-07 20:12:55 +02:00
Tom Hughes
f7ebb905f1 Put global changeset list route after more specific ones 2010-08-06 11:15:27 +01:00
Tom Hughes
2edd80f465 More reordering routes to put more specific ones first 2010-08-06 11:13:21 +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
37795719e8 Allow the root directory for data for file columns to be configured 2010-08-05 00:14:58 +01:00
Tom Hughes
f660d1e7e3 Move configuration of GPX file locations to application.yml 2010-08-05 00:10:44 +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
8b9cacd3c2 Bring configuration files ino sync with current rails default ones 2010-08-04 19:47:10 +01:00
Siebrand Mazeland
50b42628f1 Localisation updates from http://translatewiki.net 2010-07-30 11:50:18 +02:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00