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

4276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
6ffee1cf4b Sort node ids in test_ways_for_node 
The ways_for_node method on the way controller does not guarantee
to return nodes in any particular order so we shouldn't rely on it
doing so in our tests.
 2012-01-14 13:35:30 +00:00
Tom Hughes
d1727377a8 Explicitly specify the format when expiring RSS feeds 2012-01-14 13:29:00 +00:00
Tom Hughes
1cc57c620f Monkey patch ActionCachePath to fix a bug 
When infer_extension is not set ActionCachePath does not set the
extension from any explicitly specified format, and hence expiry
produces cache keys which don't have any extension and don't match
the keys generated when the cache entry was created.
 2012-01-14 13:26:01 +00:00
Tom Hughes
b83af6ef2c Pluralize message counts properly 2012-01-14 12:19:40 +00:00
Tom Hughes
1bafa8d41c Use the correct logo URL on error pages 2012-01-10 00:16:59 +00:00
Tom Hughes
f7df396cf2 Don't cache user specific diary entry lists 2012-01-07 15:43:27 +00:00
Tom Hughes
63cc3c195a Try really hard to find out if the real exception was a timeout 
Helpfully rails manages to wrap the actual exception that occurred
in at least one, and sometimes two further levels of exception, one
of which does preserve the original exception except as text.
 2012-01-07 15:03:25 +00:00
Tom Hughes
55dda7b184 Recognise wrapped timeout exceptions properly 2012-01-07 14:16:39 +00:00
Tom Hughes
07ebb40ebb Don't show feed icons for friend and nearby user lists 2012-01-07 12:48:09 +00:00
Tom Hughes
c3f73a8028 No need to restrict friend's diary entries to public users 2012-01-07 11:54:07 +00:00
Mikel Maron
d878db0a9b Add some more social features 
Add a view showing changesets by nearby users, and views showing
diary entries by friends and nearby users.
 2012-01-07 11:54:07 +00:00
Tom Hughes
f4307039dc Update Potlatch 2 to 2.3-128-g9aaa1de build 2012-01-06 09:23:01 +00:00
Tom Hughes
3aa1c46aef Use OSM::Timer (and hence SystemTimer) consistently 2012-01-06 09:13:52 +00:00
Tom Hughes
00a605a2a8 Use Timeout if SystemTimer isn't loaded 2012-01-06 09:11:23 +00:00
Tom Hughes
3e99bbf5a9 Remove lib prefix from includes for ruby 1.9 compatibility 2012-01-05 20:33:19 +00:00
Tom Hughes
294b098a0d Don't try and monkey patch database drivers that aren't loaded 2012-01-05 18:18:22 +00:00
Jason Meinzer
1a65b3ac6f Qualify ActiveRecord::IrreversibleMigration 2012-01-04 22:25:53 +00:00
Jason Meinzer
1aa7b3b6a8 Fix ruby 1.9 syntax error caused by space before parens on method call 2012-01-04 22:25:53 +00:00
Tom Hughes
fcaeaf8c44 Remove compatibility code for old versions of rails 2012-01-04 22:25:53 +00:00
Jason Meinzer
3c4dec8ce9 Only use SystemTimer on MRI 1.8 as it is superfluous elsewhere 
See http://ph7spot.com/musings/system-timer for why SystemTimer is
needed on MRI 1.8 and not anywhere else.
 2012-01-04 22:25:52 +00:00
Tom Hughes
7e267d4a0d Fix up case statement syntax for ruby 1.9 compatibility 2012-01-04 22:25:48 +00:00
Jason Meinzer
179fe4f715 Fix up case statement syntax for ruby 1.9 compatibility 2012-01-04 22:25:41 +00:00
Tom Hughes
95360d9fbf User getImageLocation to get the URLs for markers 2012-01-04 00:02:34 +00:00
Tom Hughes
1785caa6d0 Remove unused code that triggered a javascript error 2012-01-02 17:13:15 +00:00
Tom Hughes
6fbdf8cca3 Tell OpenLayers when we have resized the map 2012-01-02 17:10:06 +00:00
Tom Hughes
3b20c87893 Allow the export box to be moved and resized 
Use the new OpenLayers TransformFeature control to allow any box
drawn by the user to select an export area to be moved or resized
after it is drawn.
 2012-01-02 16:34:47 +00:00
Tom Hughes
ae9131bc8e Allow OpenStreetMap.js to work with an unpatched OpenLayers 2011-12-31 00:25:04 +00:00
Tom Hughes
2a84871de6 Serve OpenSearch definition though the assets pipeline 2011-12-30 22:37:11 +00:00
Tom Hughes
b8445ad3b2 Serve the favicon through the assets pipeline 2011-12-30 22:32:55 +00:00
Tom Hughes
283f4b922c Load the 404 tile through the URL rewriter 2011-12-30 22:19:45 +00:00
Tom Hughes
4fb53e9619 Fix OpenLayers image URL rewriting 2011-12-30 19:05:40 +00:00
Tom Hughes
3d4b2176ff Fetch OpenLayers from the same server as the embed page 2011-12-30 18:40:27 +00:00
Tom Hughes
da78800060 Patch OpenLayers to make URL rewriting easier 
This provides a single routine that can be overridden to rewrite
all image URLs to use the asset pipeine.
 2011-12-30 18:32:53 +00:00
Tom Hughes
a46e526cd7 Disable the donation drive message 2011-12-30 11:12:23 +00:00
Tom Hughes
a2563bd6eb Update rails translations 2011-12-29 15:23:21 +00:00
Tom Hughes
0af83bb410 Update Potlatch 2 to 2.3-127-gbce938f build 2011-12-29 15:11:57 +00:00
Tom Hughes
ece52c818f Remove fallback from nb to no 
Now that we are using nb for our translations we can drop the fallback
from nb to no and just have one the other way. This also allows us to
drop the monkey patch to support mutually recursive fallbacks.
 2011-12-29 15:11:45 +00:00
Tom Hughes
441101c877 Fix top level key in nb translation 2011-12-29 15:04:56 +00:00
Siebrand Mazeland
f807b7d243 Add dummy for 'no'. 2011-12-25 11:14:38 +01:00
Siebrand Mazeland
10cc07498b Rename no to nb. 2011-12-25 11:12:00 +01:00
Siebrand Mazeland
92c5bf242d Remove config/locales/nb.yml pending rename from no to nb. 2011-12-25 11:11:18 +01:00
Andrzej Zaborowski
085f3356b9 Fix a nil check in Contributor Terms display 2011-12-23 09:34:47 +00:00
Siebrand Mazeland
b1f5237037 ssl -> SSL 2011-12-20 19:10:33 +01:00
Tom Hughes
c182531149 Allow a special ODBL message to be displayed at login 2011-12-20 00:07:07 +00:00
Tom Hughes
90f119d976 Fix loading of blank tiles on some browsers to use the asset pipeline 2011-12-19 17:56:00 +00:00
Siebrand Mazeland
50017c36c8 Localisation updates from http://translatewiki.net. 2011-12-19 01:37:54 +01:00
Tom Hughes
f093b9a600 Replace @body with @text again... 2011-12-18 17:46:21 +00:00
Tom Hughes
dd46c3f78b Add stub files to allow various country specific rails locales to load 2011-12-18 17:06:04 +00:00
Tom Hughes
046bd29553 Add a dummy sv-SE locale so the corresponding rails locale is loaded 2011-12-18 16:55:34 +00:00
Tom Hughes
d5561dd27a Use normal fallbacks to handle the no/nb confusion 
This requires (for now) a monkey patch to the i18n fallback code, which
has been offered upstream as https://github.com/svenfuchs/i18n/pull/130.
 2011-12-18 16:51:14 +00:00