Commit graph

1651 commits

Author SHA1 Message Date
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
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
Raphael Sofaer
8231ce2239 Don't log big xml things 2011-08-17 18:59:25 -07:00
danielgrippi
a99e69edd6 down to 2 failures in postgres 2011-08-17 16:51:54 -07:00
Maxwell Salzberg
ad1b122e20 test batch_invite 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
e0fb8a08cb set the user email if inviting by email 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
19eb549889 fixed up update controller action and building users #scary #gladsofaerisstillhere 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
e039aabeef senders must now own aspects 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
Maxwell Salzberg
cc6618d294 some progress 2011-08-17 16:28:21 -07:00
danielgrippi
159fce3ef2 refactor wip 2011-08-17 16:28:21 -07:00
danielgrippi
bf0eb3dac3 4 failures left in postgres 2011-08-17 14:18:51 -07:00
Maxwell Salzberg
a06f25b297 Merge pull request #1763 from grzuy/conversation-creation-refactor
Refactor conversations creation
2011-08-16 10:26:54 -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
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
danielgrippi
669cd8578e scoped invite_user_by_email job into Mail module 2011-08-15 12:35:32 -07:00
Raphael Sofaer
f0583de36c Some optimizations to ServicesController#finder. Apparently setting an association on an unsaved record to an empty array hits the database. 2011-08-13 09:40:31 -07:00
Gonzalo Rodriguez
2326206586 Refactor conversations creation 2011-08-12 23:07:01 -03:00
Raphael Sofaer
3831c13a4a Move the app/models/jobs folder to match the name of the module 2011-08-12 15:56:26 -07:00
Raphael Sofaer
8b743e7e3b Fix stack level too deep error on reshares 2011-08-12 13:20:25 -07:00
Raphael Sofaer
31b55aef0b Start saving the usernames of facebook users 2011-08-12 13:20:25 -07:00
Raphael Sofaer
3c34749dd7 Put a select limit on the person query on contactsController index, since we know exactly what we're doing with the data 2011-08-12 10:13:29 -07:00
Raphael Sofaer
78a637f251 Take out useless line in Reshare#receive 2011-08-11 14:42:44 -07:00
Raphael Sofaer
3594d3ba8b Fix error raising in message after_receive 2011-08-11 14:01:27 -07:00
Raphael Sofaer
0b00616b8c Create appConfig option for following diasporahq 2011-08-11 12:01:14 -07:00
Raphael Sofaer
a2043671ce Move comment email subject line code into models 2011-08-11 10:46:15 -07:00
Raphael Sofaer
350a4b4f6d Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations? 2011-08-10 16:42:08 -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
Raphael Sofaer
a2bfc4a487 Limit the length of some log statements 2011-08-10 10:56:23 -07:00
danielgrippi
aa3d626ada validate instead of throwing a db error 2011-08-10 10:38:28 -07:00
Maxwell Salzberg
4fb4f71169 prevent duplicate services from being created 2011-08-09 19:01:38 -07:00
Maxwell Salzberg
86e374b8ce add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible 2011-08-09 16:54:24 -07:00
Raphael Sofaer
015879a96a Move the unserialized_attribute override into the youtube_titles module. 2011-08-09 14:23:50 -07:00
Raphael Sofaer
a4e54a7b05 Protect ourselves from problems with youtube title serialization by rescuing type mismatches in the marshaller. 2011-08-09 14:04:31 -07:00
Maxwell Salzberg
e9d993b8f6 throw 404s when the person is no found 2011-08-09 13:03:45 -07:00
Maxwell Salzberg
77cb93be24 fix up the inviter sidebar 2011-08-08 17:53:04 -07:00
Raphael Sofaer
201574c53a Check for nil before building ServiceUser objects 2011-08-06 14:02:27 -07:00
Sarah Mei
421bfe6d8f Handle the case in which the pod owner has not set up featured users. 2011-08-06 12:47:46 -07:00
Raphael Sofaer
8b7f938a63 Order the results of ServicesController#finder 2011-08-05 16:42:09 -07:00
Raphael Sofaer
c7360fe6ce Document contact.sharing and receiving a little 2011-08-05 15:25:26 -07:00
danielgrippi
d51e495925 fetch featured users from remote servers on app init unless already in the db 2011-08-03 18:02:56 -07:00
Maxwell Salzberg
7e8f17cc31 refactoring this stuff 2011-08-03 16:58:55 -07:00
Raphael Sofaer
1aac60bee3 Make sure that not deleting the service_users doesn't leave them stale 2011-08-03 15:39:23 -07:00
Raphael Sofaer
7d0c796762 Make sure that related data for fb users is attached to them 2011-08-03 15:30:58 -07:00
Raphael Sofaer
4d786d687c Forget about postgres for now, depend on On duplicate key update 2011-08-03 14:39:38 -07:00
Raphael Sofaer
406ab7a073 Delete a stray file, some cleanup 2011-08-02 09:47:17 -07:00
Raphael Sofaer
983d4e5598 Hopefully make youtube_titles a little less ridiculous 2011-08-01 12:30:21 -07:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
Maxwell Salzberg
bbf8f2a15b for tests, only try to connect with an actual person 2011-07-29 21:52:46 -07:00
danielgrippi
9037748d23 fixed search 2011-07-29 19:21:18 -07:00
danielgrippi
905a982d35 add two more default aspects for new users 2011-07-29 19:21:18 -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
Raphael Sofaer
b8df1dca5c remove pretty print 2011-07-29 14:56:06 -07:00
danielgrippi
2b550906fc downcase query string for search 2011-07-29 14:05:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
16bd3e4c2f less delay on search; start on 2 chars instead of 3 2011-07-29 12:26:04 -07:00
danielgrippi
f560321626 optimized people search 2011-07-29 12:04:10 -07:00
Raphael Sofaer
ddd4424df8 Merge remote branch 'manuels/842-sortable-aspects'
Conflicts:
	app/models/user.rb
	db/schema.rb
2011-07-28 14:36:41 -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
99aafb18cd Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice 2011-07-22 17:13:31 -07:00
Raphael Sofaer
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -07:00
Raphael Sofaer
5a12636967 Clarify Reshare#after_parse 2011-07-22 14:38:56 -07:00
Raphael Sofaer
4b1d5b772d Failing spec for the second retraction for a reshared post, reshares need to refer to guids 2011-07-22 14:19:58 -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
Raphael Sofaer
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
537766d0d7 Started working on repost integration test 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
987d44c41c fixed reshare specs; all specs green 2011-07-21 18:22:18 -07:00
danielgrippi
a8400ad460 2 more specs failing. wip 2011-07-21 18:22:18 -07:00
danielgrippi
a32ef3c1d8 added xml response to the post 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
danielgrippi
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
Ilya Zhitomirskiy
ce94779766 not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Raphael Sofaer
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Maxwell Salzberg
eee2225f04 rspec is green 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
b01ffb4489 We don't use perform_delegate anymore 2011-07-19 10:55:23 -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
Raphael Sofaer
37e939d476 Use activerecord-import in ReceiveLocalBatch. The default behavior of it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway. 2011-07-14 21:27:16 -07:00
Raphael Sofaer
55009a8381 Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch. 2011-07-13 10:59:41 -07:00
Raphael Sofaer
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f6bf17897d actually displaying the facebook results(first time connection), updating attributes instead of discarding the changes 2011-07-11 16:52:30 -07:00
danielgrippi
67882c775e Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable. 2011-07-11 15:06:35 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
797a6f5ca9 like comments js response wip 2011-07-11 15:02:46 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Manuel Schölling
0855144a0a Issue #842: Sortable aspects
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
2011-07-10 20:37:11 +02:00
Raphael Sofaer
c83276a9d9 OK, now I get what was going on. 2011-07-07 22:17:42 -07:00
Raphael Sofaer
d0ce257107 Revert "Revert "Merge branch 'hashtags-in-comments'""
This reverts commit d2e26f6937.
2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937 Revert "Merge branch 'hashtags-in-comments'"
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
2011-07-07 13:39:15 -07:00
danielgrippi
310b9969f3 hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here... 2011-07-07 12:21:57 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00