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

1552 commits

Author SHA1 Message Date
Tom Hughes
4d64b178b8 Add credit for Vienna data to copyright page 2011-05-31 21:04:55 +01:00
Tom Hughes
652dbf5044 Merge branch 'master' into openid 
Conflicts:
	config/locales/en.yml
 2011-05-31 19:10:31 +01:00
Tom Hughes
beeb77721f Update to Rails 2.3.11 
Update the site to use Rails 2.3.11 which also required switching to
the new syntax for interpolated variables in translation strings.
 2011-05-31 18:11:31 +01:00
Siebrand Mazeland
f106c93357 Localisation updates from http://translatewiki.net. 2011-05-31 19:04:05 +02:00
Tom Hughes
26b42dbe97 Replace MySpace with AOL in the OpenID login buttons 2011-05-28 00:17:52 +01:00
Tom Hughes
f539c79a56 Make titles on OpenID icons a bit more friendly 2011-05-27 20:41:37 +01:00
Tom Hughes
a37e1b8f70 Merge branch 'master' into openid 
Conflicts:
	app/views/user/login.html.erb
 2011-05-22 18:01:15 +01:00
Tom Hughes
023050840a Improve presentation of supporting links on the terms page 2011-05-22 17:48:16 +01:00
Grant Slater
20cab5b9bf Add summary + informal translations links to terms page 2011-05-22 15:10:30 +01:00
Matt Amos
9105a7e66d Updated to libxml-ruby 2.0.5 and fixed code accordingly. 
I've tested this through the unit tests and by hitting it with
bulk_upload.py and neither fail or cause the server to crash or
go into an infinite loop. Both of these things happened randomly
with 1.1.3/4 due to an apparent early deregistration of the
expanded nodes.
 2011-05-21 17:36:58 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Tom Hughes
d49e3b0f09 Use a pessimistic version constraint for libxml 
It seems that rails doesn't handle gems wth multiple version
constraints right - it generates invalid install commands. So
we use a pessimistic constraint instead.
 2011-05-17 21:35:59 +01:00
Tom Hughes
db9420ba57 Make "all traces" and "your traces" links more consistent 
Make sure we always show the "all traces" and "your traces" links
in the same place and that they don't accidentally inherit parameter
values that we don't really want.

Based on work by Andrzej Zaborowski <balrog@zabor.org>.
 2011-05-13 10:06:16 +01:00
Tom Hughes
2c92bf895f Don't allow libxml 2.0.0 and later to be used 2011-05-11 23:06:19 +01:00
Siebrand Mazeland
cb24fccb8a Fix unclosed list. Spotted by Mormegil. 2011-05-06 17:08:24 +02:00
Siebrand Mazeland
7dc25a55a9 Localisation updates from http://translatewiki.net. 2011-05-05 23:22:14 +02:00
Tom Hughes
d4c8c3ad18 Use "Deleted at/by" instead of "Edited at/by" for deletes 2011-05-05 20:25:58 +01:00
Tom Hughes
c738c964aa Removed duplicate require_terms_seen definition 2011-04-29 22:59:39 +01:00
Tom Hughes
75d311c5a6 Add config file entry for memcache server list 2011-04-29 21:23:58 +01:00
Siebrand Mazeland
0ca91134e8 Rename incorrectly named file. 2011-04-26 08:52:50 +02:00
Siebrand Mazeland
54c4e7939f Remove incorrect language file. 2011-04-26 08:50:23 +02:00
Siebrand Mazeland
658762a603 Localisation updates from http://translatewiki.net. 2011-04-20 09:58:59 +02:00
Tom Hughes
7a8d021dc8 Add credit to Direction Générale des Impôts for French data 2011-04-19 00:29:17 +01:00
Matt Amos
c21aa5933a Added flash notice for CTs decline 
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
 2011-04-18 00:29:15 +01:00
Tom Hughes
2fd52ddf60 Add memcache support 2011-04-17 18:56:50 +01:00
Matt Amos
696fbb4e16 Renumbered sections to be more consistent with subsection numbering style 2011-04-13 13:17:21 +01:00
Matt Amos
2491328270 Reformatting contributor terms box based on suggestions by Tom 2011-04-13 13:17:17 +01:00
Matt Amos
55cc2e0fcf Updated French and UK terms to 1.2.4 2011-04-13 13:17:13 +01:00
Siebrand Mazeland
2bcb052cce Localisation updates from http://translatewiki.net. 2011-04-11 14:49:51 +02:00
Siebrand Mazeland
ccd0cb7bbd Localisation updates from http://translatewiki.net 2011-04-07 13:52:04 +02:00
Tom Hughes
10033fded1 Switch to i18n version 0.5.0 but keep old style interpolation 
It's impossible to stop rails 2 loading a newer i18n gem if it is
installed, so go with the flow and use the latest one but override
the interpolation pattern for now.
 2011-04-06 20:39:20 +01:00
Tom Hughes
1171bd3d8d Spell adapter correctly 2011-04-03 18:22:22 +01:00
Tom Hughes
a9e8f14e6d Monkey patch postgres adapter for postgres 9 support 2011-04-03 17:39:06 +01:00
Tom Hughes
cb6d6c2463 Report a friendly(ish) error if no OAauth key is set for Potlatch 2 2011-04-03 15:40:05 +01:00
Tom Hughes
5777c5e925 Tidy up the data browser javascript 2011-04-03 14:59:43 +01:00
Tom Hughes
62d9dbdc23 Make Potlatch 2 the default editor in the example configuration 2011-04-03 14:40:51 +01:00
Tom Hughes
7fd956260e Default REQUIRE_TERMS_SEEN to false for now 2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
82db7eccc8 Added SOTM 2011 banner to the side bar 2011-04-03 13:46:15 +01:00
Siebrand Mazeland
b770bc1661 Localisation updates from http://translatewiki.net. 2011-03-06 13:15:58 +01:00
Siebrand Mazeland
04efc39a49 Localisation updates from http://translatewiki.net. 2011-02-24 12:28:42 +01:00
Siebrand Mazeland
b2e490e6fa Localisation updates from http://translatewiki.net. 2011-02-14 19:35:23 +01:00
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
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
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
7d900f15dc Use the normal rails asset tagging mechanisms for the SWF files 2011-01-14 22:51:02 +00:00
Siebrand Mazeland
9f4395a743 Localisation updates from http://translatewiki.net. 2011-01-14 11:52:29 +01:00