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

1454 commits

Author SHA1 Message Date
Tom Hughes
3590335221 Add advert for SOTM 2010 to sidebar 2010-06-08 17:09:21 +01:00
Tom Hughes
dc35b597a2 Merge branch 'master' into openid 
Conflicts:
	config/locales/is.yml
 2010-06-07 22:24:24 +01:00
Tom Hughes
406b46e49b Revert "Switch to using oauth-plugin as a gem" 
This reverts commit 41a123334b.
 2010-06-07 16:01:04 +01:00
Siebrand Mazeland
fa11baf5c3 Localisation updates from http://translatewiki.net 2010-06-04 01:33:00 +02:00
Tom Hughes
d516198bbe Update to rails 2.3.8 
Update site to use rails 2.3.8 which also allows us to drop the
globalize2 plugin as the core rails i18n code can now do fallback
and pluralization.
 2010-05-26 19:54:10 +01:00
Siebrand Mazeland
27c812505d Localisation updates from http://translatewiki.net 2010-05-25 16:06:17 +02:00
Tom Hughes
41a123334b Switch to using oauth-plugin as a gem 
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
 2010-05-24 12:58:27 +01:00
Siebrand Mazeland
337c06d4f4 Localisation updates from http://translatewiki.net 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-05-23 19:36:40 +02:00
Tom Hughes
cf682f49b3 Add a timeout to the change list pages 2010-05-21 20:21:41 +01:00
Siebrand Mazeland
09763ab129 Localisation updates from http://translatewiki.net 2010-05-18 23:13:25 +02:00
Tom Hughes
7f8ed822da Resource whose value starts with a colon need to be quoted 
Stop resources looking like symbols when they start with a colon by
quoting them.
 2010-05-18 15:07:46 +01:00
Andrzej Zaborowski
058b94df09 Fix a typo in the native copyright text 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 2010-05-18 13:45:06 +00:00
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
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
Æ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
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
c81b5ab1ac Switch to date stamped migrations to make branching easier to handle 2010-05-13 18:16:00 +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
691f759da4 Update various files to match current rails versions 2010-05-13 10:54:16 +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
66221ba9b8 Fix site name 2010-05-11 19:44:47 +01:00
Tom Hughes
836e926e62 Merge branch 'master' into terms 2010-05-11 19:07:00 +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
Siebrand Mazeland
d1eb6d6041 Localisation updates from translatewiki.net (2010-05-09) 2010-05-09 19:06:31 +02:00
Tom Hughes
61e51f88cc Merge branch 'master' into terms 2010-05-09 17:16:43 +01:00
Tom Hughes
a53c7bf623 Rework the signup page 2010-05-09 17:03:51 +01:00
Tom Hughes
48d450060b Merge branch 'master' into openid 2010-05-09 12:26:40 +01:00
Tom Hughes
75c7f46a00 Remove an unused resource and fix a few grammar issues 2010-05-09 11:40:08 +01:00
Ævar Arnfjörð Bjarmason
50bf6b49a6 Bump config/wiki_pages.yml with script/misc/update-wiki-pages 2010-05-08 18:10:25 +00:00
Tom Hughes
f85681c5ce Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-05-07 22:28:07 +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
9230721a1f Redirect suspended users to an information page 
If the current session is for a logged in user and that user has
been suspended then log them out and redirect them to a page
explaining that their account has been suspended.
 2010-05-07 10:00:24 +01:00
Tom Hughes
7211872790 Don't try and display IP address for users without one 2010-05-07 09:29:38 +01:00
Tom Hughes
b9deb68de1 Display total user count correctly in user list 2010-05-07 09:05:55 +01:00
Tom Hughes
674123e055 Fix typo 2010-05-06 22:01:45 +01:00
Tom Hughes
ae8c0b3baf Add a user list view for administrators 2010-05-06 20:55:02 +01:00
Tom Hughes
5d3992daca Tell users their account has been suspended when they try and login 2010-05-06 17:18:34 +01:00
Tom Hughes
552a647810 Merge all the user status changing methods into one 2010-05-06 17:18:34 +01:00