Commit graph

221 commits

Author SHA1 Message Date
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature""
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
2012-01-04 13:49:56 +01:00
Jonne Hass
d6f98d12e1 even more spec fixing, postgres throws statement invalids for duplicate keys, luckily record not unique is a subsubclass of it so we can just catch the higher error 2011-12-11 04:45:11 +01:00
Maxwell Salzberg
7bf1970dd8 adding account deletion factory, fixed a user spec 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
70dcc5becc rebased this branch onto master 2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy
1552b5bcc2 keep the pivate key, required for retries 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
danielgrippi
e6ed2d397a added close account to user 2011-12-08 16:32:18 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a Background sending password reset instructions. 2011-11-14 12:30:47 -08:00
Sarah Mei
f1d669a024 Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those. 2011-11-06 21:29:22 -08:00
Jonne Hass
9ffeef9d20 Merge branch 'new_user_language' of https://github.com/alda519/diaspora 2011-11-06 15:17:05 +01:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Maxwell Salzberg
484f46d70f add validation which prevent user for signing up with dead username. fix cucumber features 2011-10-20 16:32:09 -07:00
Dan Hansen
f6845c360f Revert "change namespace from Mail to Mailers"
This reverts commit f859904c76.
2011-10-09 23:34:03 -05:00
Dan Hansen
f859904c76 change namespace from Mail to Mailers
locally when Resque tried to constantize Jobs::Mail Object.const_get("Jobs") returned our Jobs module but when it tried to const_get("Mail") it returned the Mail gem.
added copyright
2011-10-09 22:41:01 -05:00
Paul Spieker
0c12471feb add username blacklist 2011-09-30 14:17:04 +02:00
danielgrippi
97f80272b2 DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class 2011-09-15 12:42:53 -07:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
alda519
a9e4b4ce99 fixed broken test, spec added 2011-09-14 20:46:52 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
alda519
0906f21bdd fixed spec 2011-09-14 10:43:30 +02:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public
dispatcher
2011-09-12 17:02:40 -07:00
Sarah Mei
f06b8c7a58 First pass at removing order dependencies so specs will be reliable on postgres and mysql 2011-09-05 17:51:45 -07:00
Maxwell Salzberg
6beeecefd8 add better messages telling a user that they sent share requests if they try and email exsisting users 2011-08-18 18:27:37 -07:00
Raphael Sofaer
31584eed84 It turns out find_for_database_authentication calls find_for_authentication, not the other way around. 2011-08-18 16:05:14 -07:00
Maxwell Salzberg
e0fb8a08cb set the user email if inviting by email 2011-08-17 16:28:21 -07:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
danielgrippi
511517b3c7 cleaned up and documented Invitation. moved an action into a User before_create callback 2011-08-15 16:44:37 -07:00
danielgrippi
b6c26611ef placed all mail jobs in the Job::Mail:: namespace & added into appropriate folders 2011-08-10 15:31:40 -07:00
Maxwell Salzberg
73616a3e7a new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about) 2011-07-29 17:20:10 -07:00
maxwell
7a5852e73a fix a bug with openssl keys in development. note to future max and
rafi.  never monkey patch anything on the top of a completely random
model. never again. ever.

TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
2011-07-24 20:06:07 -07:00
Raphael Sofaer
ad5dba052c First reshare retraction spec is green 2011-07-22 13:12:12 -07:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Raphael Sofaer
a1bf22fe7e More work on retracting posts with reshares, one failing spec on User#retract 2011-07-21 18:23:34 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
danielgrippi
829c86823d remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them 2011-07-03 20:08:11 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
Raphael Sofaer
df04b59857 Change :on to :post in the comment and post methods 2011-06-01 16:45:29 -07:00
Sebastian
ea85daadc4 Added UsersController#confirm_email with route and some specs 2011-06-01 16:26:54 +02:00
Sebastian
f42055ae24 User#confirm_email with specs 2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153 Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update 2011-06-01 16:26:53 +02:00
Sebastian
5b408ecca3 Added User#unconfirmed_email and #confirm_email_token with specs 2011-06-01 16:26:53 +02:00
Sebastian
cd404b9210 Added spec for valid User#email validation 2011-06-01 16:26:53 +02:00
MrZYX
c937f76433 specs for new methods in user model 2011-05-29 18:46:30 +02:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green.
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
maxwell
51b3cd9c77 attempt to fix the problem where people who wanted emails were no longer getting them 2011-04-07 14:05:40 -07:00