cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

Browse source
This commit is contained in:
Kai Krueger 2011-04-29 20:52:59 -06:00
commit 43e12e7d02
4 changed files with 3351 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/example.application.yml
View file

@ -57,6 +57,8 @@ standard_settings: &standard_settings
gpx_image_dir: "/home/osm/images" gpx_image_dir: "/home/osm/images"
# Location of data for file columns # Location of data for file columns
#file_column_root: "" #file_column_root: ""
# List of memcache servers to use for caching
#memcache_servers: []
# Enable legacy OAuth 1.0 support # Enable legacy OAuth 1.0 support
oauth_10_support: true oauth_10_support: true
# URL of Nominatim instance to use for geocoding # URL of Nominatim instance to use for geocoding
@ -73,7 +75,6 @@ development:
production: production:
<<: *standard_settings <<: *standard_settings
require_terms_seen: false
test: test:
<<: *standard_settings <<: *standard_settings

BIN
public/favicon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

BIN
public/images/osm_logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

3349
public/images/osm_logo.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 160 KiB