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

285 commits

Author SHA1 Message Date
Kai Krueger
001ff5764b Merge branch 'master' into openstreetbugs2 2011-04-19 22:00:30 -06:00
Tom Hughes
fcb6ce416f Don't use the en_US locale for Potlatch 2 as it doesn't work 2011-04-07 11:16:23 +01:00
Tom Hughes
5f7855fa4d Tell Potlatch 2 which locale to use 2011-04-06 21:22:47 +01:00
Tom Hughes
2d937f94d5 Add support for conditional deletes in changeset uploads 
A delete element in an osmChange upload can now have an if-unused
attribute to indicate that the delete should not be done if the
object is still in use.
 2010-12-15 23:59:06 +00:00
Tom Hughes
aa4a8fdc81 Replace JOSM editing option with generic Remote Control option 2010-12-01 09:25:27 +00:00
Tom Hughes
b90219f1d3 Add Potlatch 2 as an editor option 2010-11-29 12:20:21 +00:00
Matt Amos
cd66a5db99 Initial work on support for multiple editors 2010-11-29 12:20:21 +00:00
Tom Hughes
a1cb0f04d4 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/site/index.html.erb
 2010-10-17 11:02:11 +01:00
Tom Hughes
59e86dc07a The read flag is a boolean 2010-10-08 15:25:10 +01:00
Tom Hughes
b658f5d148 Fix for postgres boolean support 2010-10-08 12:27:37 +01:00
Tom Hughes
6fb8570200 Merge branch 'master' into openstreetbugs 
Conflicts:
	config/environment.rb
	config/routes.rb
 2010-09-06 12:51:50 +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
52395b3cdf Merge branch 'master' into openstreetbugs 2010-07-28 21:30:55 +01:00
Tom Hughes
140455c0f8 Correct some exception names 2010-07-19 12:24:05 +01:00
Tom Hughes
273706ae09 Merge branch 'master' into openstreetbugs 2010-05-14 22:50:38 +01:00
Tom Hughes
6ca26591df Ignore unknown countries when doing geolocation 2010-05-13 15:32:46 +01:00
Tom Hughes
959442d087 Merge branch 'master' into openstreetbugs 2010-05-11 19:53:57 +01:00
Tom Hughes
160429e62d Merge branch 'master' into openstreetbugs 
Conflicts:
	lib/osm.rb
 2010-05-07 22:29:09 +01:00
Tom Hughes
303e5d3eb9 Merge branch 'master' into terms 
Conflicts:
	config/application.yml
	lib/osm.rb
	public/stylesheets/common.css
 2010-05-07 22:23:20 +01:00
Tom Hughes
d80f260b8b Implement OSM.spam_score to return a spam score for a piece of text 2010-05-06 17:18:33 +01:00
Matt Amos
972278a223 Some styling changes. Changed drop-down into radio buttons. Tried, and failed, to get the 'decline' link to look like a button. 2010-04-27 00:36:44 +01:00
Tom Hughes
acbc99ac16 Merge branch 'master' into openstreetbugs 2010-04-19 21:30:42 +01:00
Tom Hughes
4b2ac2ea2b Merge branch 'master' into terms 2010-04-19 21:05:54 +01:00
Tom Hughes
8c95ba7838 Ignore some more files. 2010-04-19 16:48:10 +01:00
Matt Amos
9a9e13af90 Bit more work on the contributor terms page - still very much a work-in-progress. 2010-04-12 23:55:05 +00:00
Kai Krueger
59a6ed0e20 Don't limit get map_bugs to a small Area, by disabling the quadtile index for those searches 
The volumn of bugs seem small enough to get away with normal or GiST indexes (not included yet)

Also includes some other fixes
 2010-03-20 11:59:23 +00:00
Tom Hughes
1844a19f48 Add support for GeoIP lookups using Quova. 2009-11-25 00:52:44 +00:00
Tom Hughes
436daaff15 Catch domain exceptions as we approach the poles and handle them by 
setting the longitude bounds to select a stripe right around the world
which is what they are tending to as we approach the poles.

Closes #2488.
 2009-11-22 13:35:51 +00:00
Ævar Arnfjörð Bjarmason
e0eb2b79b7 [18163] commited by me yesterday (and reverted in [18165]) was 
broken. I didn't restart rails when testing it because I thought lib/
was auto-refreshed as well and that:

    ruby -e 'x = []; x[0]["foo"] = "bar"'

Would work and autovify like it does in Perl. But no, you have to do:

    ruby -e 'x = [{}]; x[0]["foo"] = "bar"'

This commit is equivalent to [18163] aside from that fix to lib/potlatch.rb
 2009-10-15 08:21:57 +00:00
Tom Hughes
d0c63b6d5d Revert r18163 as it is completely broken. 2009-10-15 07:46:54 +00:00
Ævar Arnfjörð Bjarmason
cc9a9ee399 Make the preset list at the bottom of the screen (Airport, Bus stop, 
...) translatable
 2009-10-14 23:42:09 +00:00
Tom Hughes
63f61b5f04 Replace hard coded nwr enumeration support with a more generic 
system for defining enumerations.
 2009-08-04 13:23:36 +00:00
Matt Amos
4826032d18 Added methods to strip those non-XML control characters from tags in AMF controller and give an error if there's invalid UTF-8. 2009-07-27 16:54:00 +00:00
Tom Hughes
291350850d Say which way is too long. 2009-07-15 13:34:14 +00:00
Ævar Arnfjörð Bjarmason
212d56ce88 Delete the old localised.yaml file Potlatch used before it was split into per-language files 2009-07-14 21:40:50 +00:00
Tom Hughes
942ca1ff23 Merge 16355:16480 from trunk. 2009-07-13 23:28:02 +00:00
Richard Fairhurst
1ef85668de and the accompanying SWF 2009-07-09 20:00:29 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Matt Amos
57e571d241 Changed shortlink zoom level correction char to '-', as this seems to fare better with twitter et al.'s URL highlighting. Decoder is backwards-compatible with the old system. 2009-07-02 16:40:29 +00:00
Tom Hughes
6baccfaddd Merge 16110:16216 from trunk. 2009-06-29 16:50:34 +00:00
Matt Amos
1d8e66016c Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc... 2009-06-25 23:31:53 +00:00
Tom Hughes
9cd29b4721 Make creating a bbox object from a string work. 2009-06-07 16:32:24 +00:00
Tom Hughes
5de81dc4b0 More work on optimisation the location of nearby users - it turns out 
that getting the database to do the filtering is much better as it
avoids us constructing thousands of user objects only to then throw
most of them away again.
 2009-06-05 09:30:31 +00:00
Tom Hughes
098e757cf2 Add a remove_foreign_key method and make migration 34 reversible. 2009-05-31 13:53:16 +00:00
Tom Hughes
3d906fe8c6 Merge 15165:15373 from trunk. 2009-05-31 11:32:32 +00:00
Matt Amos
2006c416d2 Fixed typo. 2009-05-21 21:24:29 +00:00
Tom Hughes
4a4d89138c Rationalise API error classes by getting of the render_opts method which 
was never used except to extract the data it contained. Instead each class
now has a status method that returns the HTTP status code to use and a
to_s method to return a textual description of the error.
 2009-05-21 19:28:39 +00:00
Richard Fairhurst
8100be1e8d Potlatch 1.0 2009-05-21 00:30:33 +00:00
Tom Hughes
b38684e59e Add a global timeout that is applied to most API requests. 2009-05-20 22:18:36 +00:00
Matt Amos
3d0ca940d2 Using an around_handler for catching and rendering errors in most of the API controller methods. This simplifies the code and makes errors and error messages a bit more consistent. Also added a utility method for checking the HTTP method. 2009-05-20 17:39:59 +00:00