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

232 commits

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
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
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
89ec02ea0a Renumber migration to avoid conflict with master 2010-05-11 19:06:30 +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
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
5a54630b57 Add support for suspended and confirmed users 
Replace the existing "active" and "visible" with an enumerated status
that allows for extra cases. Currently we have "suspended" for users
who hve triggered the spam detector and "confirmed" for users that have
triggered the detector but have been confirmed as vald by an admin.
 2010-05-06 17:18:34 +01:00
Tom Hughes
752f737497 Add a user index to diary comments 2010-05-06 17:18:34 +01:00
Tom Hughes
6729272444 Merge branch 'master' into terms 2010-04-27 11:22:25 +01:00
Ævar Arnfjörð Bjarmason
9448eab143 Merge branch 'master' into openID 2010-04-20 23:41:14 +00:00
Tom Hughes
e3fc033c1e Ignore some more generated files 2010-04-20 21:41:57 +01:00
Matt Amos
b99e870291 Initial version of contributor terms changes. 2010-03-22 22:51:09 +00:00
Kai Krueger
84db1d66b7 merge 19364:19600 of rails_port into the openID branch 
renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb
 2010-01-23 15:31:01 +00:00
Tom Hughes
8de014935a Add the changeset id to the user index so the next/previous user links 
can be resolved quickly.
 2010-01-14 18:37:52 +00:00
Kai Krueger
ca558c692e This is the initial implementation of login via OpenID 
This is the patch presented in trac ticket #2500

With this commit, it is possible to assosciate an openID
to an existing OSM account. Once associated, it is possible
to either login via OpenID, or as always via username and password.

Other aspects, such as account creation and the need for a valid email
are unchanged.
 2010-01-10 17:41:32 +00:00
Tom Hughes
6e5f284135 Add some indexes to diary entries to let recent entries be found 
efficiently for the various diary entry lists and feeds.
 2010-01-03 11:56:41 +00:00
Tom Hughes
634565c5d3 Add support for logical deletion of diary entries and comments. 2009-11-14 15:57:08 +00:00
Tom Hughes
864a688dd3 Add an explicit require of rexml/document as ruby doesn't seem to 
want to autoload it for some reason.
 2009-11-04 09:29:35 +00:00
Tom Hughes
4708992f1c Don't bother creating the user index on user_roles as migration 48 will 
create one on user+role that will do the same job.

Removing it here is a bit of a hack as it will not get dropped from
existing databases but as it was not given an explicit name it is hard
to write a migration to drop it.
 2009-10-01 20:04:33 +00:00
Matt Amos
ca06b3c7b1 New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages. 2009-09-29 16:44:03 +00:00
Matt Amos
daa2496024 First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these. 2009-09-28 16:01:00 +00:00
Tom Hughes
7b632da44a Add xid_to_int4() function for Postgres. 2009-09-07 16:44:54 +00:00
Tom Hughes
73340e1780 Add support for reloading the language table. 2009-09-03 21:55:42 +00:00
Matt Amos
b34b898451 Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same. 2009-08-25 15:00:32 +00:00
Tom Hughes
908a6ef409 Merge 16891:17044 from trunk. 2009-08-13 17:18:08 +00:00
Tom Hughes
565171486f Add extra visibility options for GPS traces, and enhance the API call 
that returns trace data to return more information if the owner of the
trace has allowed it. Based on a patch from Matt Amos.
 2009-08-13 17:06:11 +00:00
Matt Amos
0d5be22cb5 Merging 16820:16891 from trunk. 2009-08-06 16:24:39 +00:00
Tom Hughes
63f61b5f04 Replace hard coded nwr enumeration support with a more generic 
system for defining enumerations.
 2009-08-04 13:23:36 +00:00
Tom Hughes
9c89bd53bf Require the migration helper code in some more migrations. 2009-08-04 13:17:29 +00:00
Tom Hughes
59eebc05b2 Merge 16817:16819 from trunk. 2009-08-03 23:59:17 +00:00
Tom Hughes
60303ee06b Fixed migration - rails uses remove_index not drop_index. 2009-08-03 23:55:51 +00:00
Tom Hughes
cbbfdf3948 Merge 16743:16811 from trunk. 2009-08-03 23:50:47 +00:00
Tom Hughes
72402ebc3e Add an index on message sender. 2009-08-03 23:04:41 +00:00
Matt Amos
6e146bfba9 Added foreign keys to some oauth tables. 2009-08-03 13:58:10 +00:00
Matt Amos
05e2120273 Merged 16488:16743 from trunk. 2009-07-31 10:42:06 +00:00
Tom Hughes
581c243e0e Allow messages to be deleted from the outbox as well as the inbox. 2009-07-23 17:41:50 +00:00
Tom Hughes
f3bf0c8b14 Add the ability for a recipient to (logically) delete a message from 
their INBOX so they no longer see it.
 2009-07-23 15:22:44 +00:00
Tom Hughes
f4571eeb7c Revert r16046. 
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
 2009-06-23 02:48:38 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Štefan Baebler
1472a16516 documented some additional requirements when installing on a cleaner ubuntu box 2009-06-10 05:27:54 +00:00
Tom Hughes
bb1198fb61 Tweak migration to ensure that migrating from a database with existing 
diary entries sets a default language for those entries.
 2009-06-07 10:01:28 +00:00
Tom Hughes
51010abe83 More missing files from I18N merge. 2009-05-31 17:41:25 +00:00
Tom Hughes
11b1f7d739 Missing migrations from I18N merrge. 2009-05-31 17:29:49 +00:00
Tom Hughes
d0b845fc60 Merged I18N branch to head. 2009-05-31 17:26:41 +00:00
Tom Hughes
0e96027a20 Sort out storage and use of user preferred languages. 2009-05-31 14:55:45 +00:00
Tom Hughes
098e757cf2 Add a remove_foreign_key method and make migration 34 reversible. 2009-05-31 13:53:16 +00:00
Tom Hughes
3d906fe8c6 Merge 15165:15373 from trunk. 2009-05-31 11:32:32 +00:00
Tom Hughes
7c6d4e9076 Fix foreign key. 2009-05-30 17:01:43 +00:00
Tom Hughes
5b3b288fc2 Add a list of languages and fix a few issues with the schema. Also get 
language selection for diary entries working.
 2009-05-30 16:37:21 +00:00