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
Andrzej Zaborowski
3dacce23da Add "UMP-pcPL" as CC-BY-SA source in the list of attributions. 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 2010-05-18 13:44:20 +00:00
Tom Hughes
403121334a Allow the "remember me" label to wrap when showing OpenID URL field 2010-05-18 09:08:04 +01:00
Tom Hughes
9f0ea60679 Merge branch 'master' into openid 2010-05-18 00:16:47 +01:00
Tom Hughes
798cdc1d19 Tweak resource names to make them fit the normal naming scheme 2010-05-18 00:09:29 +01:00
Ævar Arnfjörð Bjarmason
0fd4a61759 Allow for formatting of the nominatim prefix in the i18n system 
It's a pain to translate nominatim as-is because the context forces me
to translate things in the accusative case. Now I can change
"{{name}}" into "{{name}}:" and translate things in the nominative
case.

Not putting the message in search_osm_nominatim so I don't infringe
upon its namespace.
 2010-05-18 00:06:43 +01:00
Tom Hughes
362f237e91 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-17 00:30:43 +01:00
Tom Hughes
473dbfeede Add missing specification file to ROTS gem 2010-05-17 00:27:11 +01:00
Ævar Arnfjörð Bjarmason
fe8a330fd6 user.login.account suspended so translators don't have to type out anchors 2010-05-17 00:10:41 +01:00
Ævar Arnfjörð Bjarmason
2a2818d055 Change user.suspended.body so translators don't have to type out anchors 2010-05-17 00:10:27 +01:00
Ævar Arnfjörð Bjarmason
71b9bee07c Remove user.terms.legale_button. Added in 9a9e13af but since removed 2010-05-16 17:23:49 +01:00
Siebrand Mazeland
400080ecdb Localisation updates from translatewiki.net 2010-05-16 17:50:01 +02:00
Tom Hughes
7b9e852c9d Merge branch 'master' into openid 2010-05-16 14:49:45 +01:00
Tom Hughes
abb2bb74a7 Tidy up addition of icons to relation members 2010-05-16 13:07:25 +01:00
Tom Hughes
6e145a2f38 Rename css_class to link_class for consistency 2010-05-16 12:57:00 +01:00
Tom Hughes
6d3aa7386b Only include tags which affect the icon in the link title 2010-05-16 12:55:10 +01:00
Tom Hughes
f7009c5781 Fix OpenID migration to not create authentication tables 2010-05-16 12:48:01 +01:00
Tom Hughes
7f1ce59f32 Rename browser-icons to browse everywhere and only load CSS when needed 2010-05-16 12:32:51 +01:00
Dan Karran
10dca1b6df Patch from bug #2787 to add icons to data browser pages 2010-05-16 12:12:59 +01:00
Tom Hughes
996e60614d Merge branch 'master' into openid 2010-05-16 12:11:01 +01:00
Tom Hughes
8657cd4724 Fix some bogus down migrations 2010-05-16 12:10:28 +01:00
Tom Hughes
30693acc87 Make OpenID authentication work with the latest plugin 2010-05-16 12:07:23 +01:00
Tom Hughes
23d88a6274 Don't require ruby-openid as the plugin pulls in the required gem(s) 2010-05-16 12:06:59 +01:00
Tom Hughes
a108e9290c Update OpenID authentication plugin to latest version 2010-05-16 10:41:23 +01:00
Tom Hughes
9b10cbccb6 Merge branch 'master' into openid 
Conflicts:
	config/locales/is.yml
 2010-05-14 22:50:17 +01:00
Ævar Arnfjörð Bjarmason
407ba399da Bump config/wiki_pages.yml with script/misc/update-wiki-pages 2010-05-14 14:22:14 +00:00
Siebrand Mazeland
83bed32d35 Localisation updates from translatewiki.net (2010-05-09) 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-05-13 23:14:42 +02:00
Tom Hughes
594960dc63 Add user_id + created_at index to changesets 
Browsing changesets for a user will be much faster if we can get the
user's changesets in date order.
 2010-05-13 18:16:31 +01:00
Tom Hughes
c81b5ab1ac Switch to date stamped migrations to make branching easier to handle 2010-05-13 18:16:00 +01:00
Tom Hughes
6ca26591df Ignore unknown countries when doing geolocation 2010-05-13 15:32:46 +01:00
Tom Hughes
b917a0eba0 Merge branch 'master' into openid 2010-05-13 13:36:31 +01:00
Tom Hughes
70a5a0d9c6 Ubuntu Hardy only has rubygems 1.3.1 and it seems to work 2010-05-13 12:58:22 +01:00
Tom Hughes
b4c1435655 Require yaml so ROTS works 2010-05-13 12:08:29 +01:00
Tom Hughes
58499290eb Add ROTS gem to vendor tree as it's not in the public GEM repos 2010-05-13 12:07:31 +01:00
Tom Hughes
691f759da4 Update various files to match current rails versions 2010-05-13 10:54:16 +01:00
Tom Hughes
bffc0377dd Fix user creation tests to handle terms screen 2010-05-11 22:25:06 +01:00
Tom Hughes
20c3bf6988 Report duplicate OpenID URLs cleanly 2010-05-11 22:08:52 +01:00
Tom Hughes
64f373dc59 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
 2010-05-11 21:22:43 +01:00
Tom Hughes
2e43a275de Merge branch 'master' of git://git.openstreetmap.org/rails 2010-05-11 19:45:48 +01:00
Tom Hughes
66221ba9b8 Fix site name 2010-05-11 19:44:47 +01:00
Tom Hughes
e005926131 Update test to reflect changes in signup page 2010-05-11 19:17:14 +01:00
Tom Hughes
07f0dddc63 Add parentheses to avoid warning 2010-05-11 19:13:38 +01:00
Tom Hughes
836e926e62 Merge branch 'master' into terms 2010-05-11 19:07:00 +01:00
Tom Hughes
89ec02ea0a Renumber migration to avoid conflict with master 2010-05-11 19:06:30 +01:00
Tom Hughes
c6609cce24 Fixup tests to work after changes to user controller 2010-05-11 14:12:57 +01:00
Tom Hughes
56aefb8dcd Merge branch 'master' into openid 2010-05-11 13:37:05 +01:00
Tom Hughes
155ed85bf5 Rework the signup and settings methods to make them a bit clearer 2010-05-11 13:36:51 +01:00
Tom Hughes
703c44eeab Add spam block ACLs with the right key 2010-05-11 08:59:04 +01:00
Tom Hughes
41f024303a Specify version of ruby-openid before lib for consistency 2010-05-10 14:22:48 +01:00
Siebrand Mazeland
6bc6af0a85 Localisation updates from translatewiki.net (2010-05-09) 2010-05-10 14:21:28 +01:00
Tom Hughes
9b8e28f24b Rework the login method to make it a bit clearer 2010-05-10 14:21:28 +01:00