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

3353 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ævar Arnfjörð Bjarmason
7ac2f27e64 Updated README to points to the wiki, git etc. 
Link to the documentation page on the wiki, and hint at say how to
send patches.
 2010-05-10 14:21:28 +01:00
Ævar Arnfjörð Bjarmason
8ec85a2796 README is in Markdown format. Move it to README.mkdn 
This way it'll be displayed properly my GitHub and other Markdown
readers.
 2010-05-10 14:21:28 +01:00
Tom Hughes
6ba75a3bb0 Mark OpenID "what is this?" prompt as a minor note 2010-05-10 14:21:22 +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
Ævar Arnfjörð Bjarmason
354a57a9fc Updated README to points to the wiki, git etc. 
Link to the documentation page on the wiki, and hint at say how to
send patches.
 2010-05-09 16:13:15 +00:00
Tom Hughes
a53c7bf623 Rework the signup page 2010-05-09 17:03:51 +01:00
Ævar Arnfjörð Bjarmason
24159b227a README is in Markdown format. Move it to README.mkdn 
This way it'll be displayed properly my GitHub and other Markdown
readers.
 2010-05-09 15:51:22 +00:00
Tom Hughes
59a6b1973b Rework the login page to make it a bit cleaner 2010-05-09 15:33:35 +01:00
Tom Hughes
48d450060b Merge branch 'master' into openid 2010-05-09 12:26:40 +01:00
Tom Hughes
ebd109c946 Replace openID.js with funky rails generated javascript 2010-05-09 12:25:50 +01:00
Tom Hughes
75c7f46a00 Remove an unused resource and fix a few grammar issues 2010-05-09 11:40:08 +01:00
Tom Hughes
7e5c998a87 Only set pending users to active on a password reset 
When resetting a password only activate pending users, otherwise a
confirmed user's account gets set back to active and may then get
suspended by the spam scorer.
 2010-05-09 08:44:17 +01:00
Ævar Arnfjörð Bjarmason
9ab2048f54 Rename open_id_authentication_tables migration to avoid clash 
If there's another migration on master before this gets merged this'll
probably have to be changed again.
 2010-05-08 18:56:42 +00: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
Ævar Arnfjörð Bjarmason
3a54a20af6 Implicitly update config/wiki_pages.yml if it exists, and chmod +x 
This makes:

    script/misc/update-wiki-pages

from the top-level just work.
 2010-05-08 18:09:49 +00:00
Tom Hughes
dd64ba2e7e Add script to update spam block ACLs 
Maintain a set of ACLs which block account creation for an IP address
which has had more than two users suspended or removed in the last 28 days.
 2010-05-08 17:49:27 +01: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
1eba060929 Redirect after processing user changes 
After we have processed the requested user changes, redirect back
to the list so that the resulting page is reloadable without getting
resubmission warnings from the browser.
 2010-05-07 14:27:52 +01:00
Tom Hughes
d50cf2b102 Preserve parameters in pagination links 2010-05-07 14:08:07 +01:00
Tom Hughes
c86e52dee9 Preserve the page number when submitting the form 2010-05-07 14:07:39 +01:00
Tom Hughes
68bb9b3b81 Fix statistics script to reflect changes to user model 2010-05-07 11:09:54 +01:00