Tom Hughes
11aff90f63
Merge branch 'master' into openid
...
Conflicts:
app/controllers/user_controller.rb
app/views/user/login.html.erb
public/stylesheets/common.css
2011-02-10 14:10:19 +00:00
Siebrand Mazeland
e37a9ec0b5
Localisation updates from http://translatewiki.net .
2011-02-03 01:16:13 +01:00
Tom Hughes
7d60707647
Update Potlatch 2 to r25217 build
2011-02-02 19:47:53 +00:00
Tom Hughes
984d73d61b
Interpolation variables should not be translated...
2011-01-31 11:06:02 +00:00
Andy Allan
7b8b9104cc
Already got -> already have
2011-01-31 11:02:38 +00:00
Tom Hughes
e34ce3cb4c
Update Potlatch 2 to r25177 build
2011-01-29 12:19:37 +00:00
Tom Hughes
a28b987212
Update Potlatch 2 to r25171 build
2011-01-28 17:04:32 +00:00
Siebrand Mazeland
adbee9a552
Localisation updates from http://translatewiki.net .
2011-01-22 20:02:20 +01:00
Patrick Kilian
8c4419412f
Improve the Osmarender key
2011-01-17 10:16:52 +00:00
Tom Hughes
5a5db3932f
Update Potlatch 2 to r25074 build
2011-01-16 17:33:18 +00:00
Tom Hughes
65be0e3158
Escape remote control failed message
2011-01-16 17:12:47 +00:00
Tom Hughes
7d900f15dc
Use the normal rails asset tagging mechanisms for the SWF files
2011-01-14 22:51:02 +00:00
Tom Hughes
13743ae8d5
Update Potlatch 2 to r25050 build
2011-01-14 15:10:11 +00:00
Siebrand Mazeland
9f4395a743
Localisation updates from http://translatewiki.net .
2011-01-14 11:52:29 +01:00
Tom Hughes
1f5f6856bf
Add a client access policy for Silverlight applications
2011-01-10 17:29:17 +00:00
Tom Hughes
fc93cbd8c0
Update Potlatch 2 to r24969 build
2011-01-04 15:35:49 +00:00
Tom Hughes
2e5fa5848f
Update Potlatch 2 to r24923 build
2010-12-31 13:34:32 +00:00
Tom Hughes
3c2e3ecb8f
Close the editor menu as soon as a choice is made
2010-12-22 18:29:50 +00:00
Tom Hughes
2e8d7f9f1d
Update Potlatch 2 to r24834 build
2010-12-22 08:38:25 +00:00
Tom Hughes
60cdce60b5
Don't look any further for a location if we are given a bounding box
2010-12-22 00:39:12 +00:00
Andy Allan
237394bc39
Change the home zoom level to 15
2010-12-21 17:26:03 +00:00
Andy Allan
51971248c1
Rework the login page to explain better what to do if you're new
2010-12-21 17:26:03 +00:00
Andy Allan
385dbed0ab
Round corners on content-area notice boxes
2010-12-21 17:26:02 +00:00
Jonas Krückel
2ec1418db5
Reduce left and right padding for the "Go" button
...
Firefox keeps the text on a button centered if it overflows the content
area but Webkit keeps the left edge fixed and pushes all the overflow to
the right so reducing the padding improves the look in Webkit when the
text is too long.
2010-12-21 17:21:20 +00:00
Tom Hughes
a3b167902d
Make capitalisation of menu entries consistent
2010-12-20 18:28:13 +00:00
Tom Hughes
bdb7685594
Remove unused language resources
2010-12-20 18:26:09 +00:00
Andy Allan
97261143d6
Split the help and wiki into two links - help centre and documentation
2010-12-20 18:26:08 +00:00
Andy Allan
b2f7c71fc9
link to the foundation
2010-12-20 18:26:08 +00:00
Andy Allan
22c7d4c3f9
Remove link to the shop - it's not a very big part of openstreetmap
2010-12-20 18:26:08 +00:00
Andy Allan
1a49f8eff1
News blog -> Community blogs
...
I suspect the text came from pointing at opengeodata.org in a bygone era.
2010-12-20 18:26:01 +00:00
Andy Allan
0aec1c5fa0
Use a list for the main menu, rather than br-separated links
2010-12-20 18:22:33 +00:00
Andy Allan
244d1f81c2
Padding / margin updates for the introduction sidebar panel
2010-12-20 18:22:16 +00:00
Tom Hughes
a491174efa
Only shut down the current process when the memory limit is reached
...
Contrary to what the ruby documentation says, sending a signal
to PID 0 actually signals the whole process group, not just the
current process. So use Process.pid to make sure we only signal
the current process.
2010-12-19 00:15:24 +00:00
Philipp Borgers
a998a0bb20
Added tabindex="1" for search input on the main side
2010-12-18 18:01:21 +00:00
Tom Hughes
a8fa21c5ea
Restore the transitionEffect on the OpenStreetMap layers
...
The OSM map layers used to have transitionEffect set but it was
accidentally lost during the OL 2.8 upgrade.
2010-12-18 14:50:07 +00:00
Tom Hughes
f6eae0c725
Update Potlatch 2 to r24796 build
2010-12-18 11:49:57 +00:00
Andy Allan
e52d101fc7
Rounded corners baby
2010-12-17 17:37:12 +00:00
Andy Allan
e103de12b1
Make the search box 17% longer, yay!
2010-12-17 17:37:07 +00:00
Andy Allan
0c5854dada
Reduce the margins on the sidebar
2010-12-17 17:37:02 +00:00
Andy Allan
33a039e849
Show the latest changeset for each of the contacts on the user page
2010-12-17 13:36:53 +00:00
Andy Allan
6d51e77880
Use configuration variables for limiting nearby users, and bump the number to 30
2010-12-17 13:18:26 +00:00
Andy Allan
b5e28f092f
Fix the popup image - was updated in OL 2.10 release with a new size
2010-12-16 19:09:11 +00:00
Siebrand Mazeland
ac10e97cfe
Localisation updates from http://translatewiki.net .
2010-12-16 16:25:34 +01:00
Tom Hughes
e09d968270
Update Potlatch 2 to r24750 build
2010-12-15 23:59:07 +00:00
Tom Hughes
5454bf3ec9
Add support for the tileurl parameter to Potlatch 2
2010-12-15 23:59:07 +00:00
Tom Hughes
2204974420
Require i18n 0.4.1 specifically as some later versions don't work
2010-12-15 23:59:06 +00: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
f20a85a5c5
Allow the client to request errors as an XML document
2010-12-15 23:58:59 +00:00
Tom Hughes
3472c1d429
Channel all error reporting through report_error
2010-12-12 16:25:01 +00:00
Tom Hughes
afc8f40bcd
Update Potlatch 2 to r24694 build
2010-12-11 00:11:39 +00:00