nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7693 commits 4 branches 0 tags 121 MiB
Commit graph

936 commits

Author SHA1 Message Date
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
69c0d8e1d9 A bit of refactoring on the invitation spec. Remove old pending specs. 2011-03-19 23:10:20 -07:00
Sarah Mei
10019bb3db Fix User spec. Also, people_in_aspects now won't let you get people for aspects you don't own. people_in_aspects should probably be arel and/or an association extension. 2011-03-19 13:25:27 -07:00
maxwell
8f9f24f383 fix for photo urls before they are processed 2011-03-18 19:00:24 -07:00
Raphael Sofaer
e2f78a8b8c Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.' 2011-03-18 14:52:27 -07:00
maxwell
924dc13adc profile tagging now federates #FO #REAL 2011-03-17 18:05:49 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
Raphael Sofaer
1c14e2676b Fix another expectation 2011-03-17 16:14:01 -07:00
Raphael Sofaer
bef06d18d8 Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
maxwell
4e419f7d1a photo specs pass 2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe wrote a test for the callback, need to make it pass... 2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f there is a job to process photos and it is called from the controller 2011-03-17 13:59:53 -07:00
Raphael Sofaer
d2cdc20e2b Finish receive local batch job 2011-03-17 12:56:23 -07:00
Raphael Sofaer
72523cc7f9 SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to 2011-03-17 12:56:23 -07:00
danielgrippi
f0df6deed3 added job and spec for BatchLocalReceive. wip 2011-03-17 12:56:23 -07:00
danielgrippi
8c7ad9a0a3 Remove unused receive local job 2011-03-15 16:13:09 -07:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb a user can put tags in their profile and they show up on the person/show page. 2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d breaking out Diaspora::Taggable wip 2011-03-15 13:21:36 -07:00
maxwell
b14ac9606f fix typo, puts in a test, and made the emails types a constant in UserPreferences 2011-03-14 12:21:30 -07:00
Raphael Sofaer
1b0445563e Specs passing with text 2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
maxwell
adbd23ec50 more tests for mailing. the bug was i think we have to restart the resque workers 2011-03-14 11:32:59 -07:00
Sarah Mei
1702081af7 refactor querying spec a bit 2011-03-13 20:08:53 -07:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
maxwell
d825eeaaa0 updated to listen to disable mail 2011-03-11 15:43:40 -08:00
maxwell
52b970098b add specs for updating email settings in the controller, and user#mail 2011-03-11 15:43:29 -08:00
maxwell
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -08:00
Raphael Sofaer
7ac3692a92 Fix specs, migrate to downcase tags, still testing migration 2011-03-11 14:23:03 -08:00
Sarah Mei
a80179e77f Fix requires for 1.9 build. Hopefully now it will just fail for perf reasons :p 2011-03-10 23:18:52 -08:00
zhitomirskiyi
35cabd469f fixed the merge for the author convention 2011-03-10 20:13:52 -08:00
zhitomirskiyi
9b00b2c786 Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends' 
Conflicts:
	app/models/user.rb
	spec/integration/receiving_spec.rb
	spec/models/mention_spec.rb
	spec/models/status_message_spec.rb
 2011-03-10 19:59:12 -08:00
Raphael Sofaer
ea98b1ca81 Tags now link to meaningless query in PostsController 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
Michael Nutt
8c5621158d notification now only created when message is received, not when message is first saved 2011-03-10 16:41:03 -05:00
Raphael Sofaer
8a419a84a6 fix up some specs 2011-03-10 12:55:05 -08:00
maxwell
9d480b0961 remove status_message#public_message: we never use it 2011-03-09 17:14:37 -08:00
maxwell
f9279f9bbc fixed public route not fetching posts, also an error in status_message activity markup 2011-03-09 17:08:41 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
zhitomirskiyi
c252cfa025 added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
zhitomirskiyi
8bcf1b49c7 notifier for the messages, we're so close 2011-03-08 10:53:49 -08:00
danielgrippi
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
Raphael Sofaer
909a198380 Post photos without text 2011-03-07 10:03:43 -08:00
zhitomirskiyi
80a3a3446a pulling in 2011-03-06 21:37:27 -08:00
zhitomirskiyi
e537104fb4 pulling in 2011-03-06 21:36:03 -08:00
danielgrippi
48fff29bf6 fixed conversation receive. made visibilities on conversation :dependent => :destroy 2011-03-04 11:19:01 -08:00
zhitomirskiyi
3812612c86 added a validation of participant, as well as messages controller spec wip 2011-03-01 19:24:07 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
danielvincent
11309574cf messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397 private messages wip 2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b broke out some comment logic to a replayable module 2011-03-01 12:28:33 -08:00
zhitomirskiyi
bd908a9b95 conversations federate 2011-03-01 12:25:55 -08:00
danielvincent
1072806d8f PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
danielvincent
c5801ffb37 basic views / controller actions for private messages 2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881 added PrivateMessage and PrivateMessageVisibility models and migrations 2011-03-01 12:14:31 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
Raphael Sofaer
8a4ca3af0e fix error on account deletion 2011-02-28 11:24:31 -08:00
MrZYX
afecfe5e93 save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db 2011-02-26 14:22:14 +01:00
Raphael Sofaer
22d83ec502 update http_multi to adjust urls when you get a redirect 2011-02-25 14:46:21 -08:00
Sarah Mei
40fa91ead9 Start refactor of comment_spec. 2011-02-24 20:46:05 -08:00
zhitomirskiyi
78b242b110 removed post to services since we are not using it 2011-02-24 17:31:54 -08:00
Raphael Sofaer
50cd06129a Adjust expected string in mention spec' 2011-02-24 16:01:36 -08:00
Raphael Sofaer
faf026dec6 Update dispatcher to use HttpMulti job 2011-02-23 16:06:55 -08:00
maxwell
638311125f typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install 2011-02-23 16:06:55 -08:00
maxwell
c9dd2d5b50 add files 2011-02-23 16:06:54 -08:00
Sarah Mei
dc499293b3 Took 90 seconds off the build. Fixture builder FTFW. 
Cleaned up spec_helper - moved stuff into support files.
 2011-02-20 00:35:51 -08:00
zhitomirskiyi
61dd5a835a default scope on contact 2011-02-18 17:38:02 -08:00
zhitomirskiyi
6dc35c516a added two pending specs for mnutt 2011-02-18 13:15:48 -08:00
zhitomirskiyi
ba779e18d6 aspect memberships are now dependant delete_all on contact 2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
17a801394e work in progress. need to update the views for the controller changes 2011-02-17 18:05:21 -08:00
Raphael Sofaer
cd7e4d6e8f Requests create a read, rather than unread, notification 2011-02-16 23:44:25 -05:00
danielvincent
a636ceec7f search does not wildcard on both sides of search term; is less dumb. 2011-02-16 12:41:45 -05:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
zhitomirskiyi
3b2d323448 fixed the notifications to call the base_class 2011-02-11 11:49:47 -08:00
zhitomirskiyi
36d7973005 fixed the problem where notifications are not keeping track of the target id as well as making notifications for a mention be destroyed when a post is 2011-02-10 19:23:01 -08:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
zhitomirskiyi
7b1abacfe6 wip 2011-02-10 12:39:05 -08:00
Raphael Sofaer
7b3a2b07ee Removed n-query, created mentions table 2011-02-09 16:07:25 -08:00
Raphael Sofaer
f8cec95d7a no authentication, n-query in stream 2011-02-09 16:07:24 -08:00
Raphael
0000185875 Status messages now process mentions and output links 2011-02-09 16:07:24 -08:00
Raphael
216a2c3cdb write formatted_message 2011-02-09 16:07:23 -08:00
zhitomirskiyi
e4d9ec64cd moved tests and slayed the profile not updating bug 2011-02-09 13:33:42 -08:00
zhitomirskiyi
6be63b88f0 added the pending request to the finder 2011-02-08 18:53:18 -08:00
zhitomirskiyi
d147da1b4a invitation text 
setting the invites

added requests to the fb hash

finder has options

remove the requester from the list

typo

making a block

another typo

remove the if statement for the notifications

checking on the right field

translations and correct indenting

fixed stuff added

added a temp puts

added a temp puts

now actually referencing the service

not double nesting

remove stream element

updated remote friends to old style

removed it from the h1 block

putting the stream element back
 2011-02-08 16:40:32 -08:00
zhitomirskiyi
a06ba9105b uniqueness of aspect name through user non case sensitive 2011-02-08 14:52:47 -08:00
zhitomirskiyi
4a925d192f refactored the api 2011-02-05 15:01:05 -08:00
zhitomirskiyi
78c30b847e added files 2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a WIP 2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4 resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01:04 -08:00
Raphael
8a2e0eef7c No semicolons in names 2011-02-02 16:57:04 -08:00
Raphael
7d18e2bcd8 Finish autocomplete 2011-02-01 11:56:56 -08:00
Raphael
518642d0d7 Move image_url defaulting logic into profile 2011-02-01 11:56:56 -08:00
zhitomirskiyi
7a667abc73 unread true on notification receive 2011-01-31 15:09:01 -08:00
zhitomirskiyi
ac50a0119a spec for not raising on already existant actor 2011-01-31 10:23:26 -08:00
zhitomirskiyi
cfef9a747e all green 2011-01-30 20:10:34 -08:00
zhitomirskiyi
a4988a28b4 WIP 2011-01-30 10:00:03 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
zhitomirskiyi
5940292840 build should be green now 2011-01-28 21:21:14 -08:00
zhitomirskiyi
9d091bbf6a facebook invitations actually work 2011-01-28 17:22:18 -08:00
Raphael
8151f3b540 correct partial name 2011-01-28 16:54:30 -08:00
zhitomirskiyi
3b68fc3e9a the friend finder is respecting of searchable 2011-01-28 13:45:58 -08:00
Raphael
a8306f9f37 don't select duplicate people 2011-01-27 13:41:22 -08:00
Raphael
31e4683183 Finished contacts of contacts for local users 2011-01-27 13:41:22 -08:00
Raphael
a23290986a add contacts_visible field in aspects 2011-01-27 13:41:22 -08:00
zhitomirskiyi
01ce26cbf3 fixed errror on services inviter action, specs 2011-01-27 10:58:09 -08:00
Raphael
b67aca0ffc Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns 2011-01-26 18:29:23 -08:00
zhitomirskiyi
a610618057 display resend link if already sent invitation in friend finder 2011-01-26 16:57:39 -08:00
zhitomirskiyi
9e22f4a6e6 checks if you already invited the person 2011-01-26 16:31:34 -08:00
zhitomirskiyi
1a911a8b99 translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier) 2011-01-26 16:01:57 -08:00
zhitomirskiyi
6242ac64ed removed unique index on email to a regular index in order to make inviting users through fb work (no email present) 2011-01-26 15:04:46 -08:00
zhitomirskiyi
be57170bf9 added the empty email spec 2011-01-26 14:22:04 -08:00
zhitomirskiyi
3392f11b64 Job::InviteUser -> Job::InviteUserByEmail 2011-01-26 12:16:48 -08:00
zhitomirskiyi
5c5e450a1e Invitation.new_or_existing_user_by_email -> Invitation.new_or_existing_user_by_service_and_identifier 2011-01-26 12:16:47 -08:00
zhitomirskiyi
d595a64169 new interface to send invitation WIP 2011-01-26 12:16:47 -08:00
zhitomirskiyi
cf45f31712 facebook friend finder is now contact-aware 2011-01-26 12:16:47 -08:00
zhitomirskiyi
f3f38cf4fd fetch person object associated with facebook id in friend finder 2011-01-26 12:16:46 -08:00
zhitomirskiyi
8bc52cdb55 facebook friend finder gathers fb friends. 2011-01-26 12:16:46 -08:00
Raphael
e4ad229a5a Requestors are now high in search 2011-01-25 18:24:11 -08:00
Raphael
def20a4d31 Make person_id on profile unique, delete duplicate profiles in migration 2011-01-25 12:10:24 -08:00
Raphael
5fe0613a97 Remove extra token from search 2011-01-25 10:47:11 -08:00
zhitomirskiyi
190daa76dd getting rid of gruff and it's imagemagic deps. made graphs on stats pending. 2011-01-21 11:11:58 -08:00
zhitomirskiyi
403490364a fixed datapoint_spec. fixed labels on graph 2011-01-21 10:50:53 -08:00
zhitomirskiyi
46b94bc130 all the specs pass with before each 2011-01-21 10:29:07 -08:00
zhitomirskiyi
56831cec63 stats WIP 2011-01-21 10:29:07 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
zhitomirskiyi
f89c442730 statistics class does distributions and averages on its DataPoints 2011-01-21 10:29:07 -08:00
zhitomirskiyi
55bfbfd5b0 added users_with_posts_today to DataPoint 2011-01-21 10:29:07 -08:00
zhitomirskiyi
ecb059b661 added Statistic and DataPoint models 2011-01-21 10:29:06 -08:00
Raphael
7217bba7e7 Allow no 2 character queries 2011-01-20 12:18:42 -08:00
Raphael
971c88da5e Sort search results by friend status 2011-01-20 10:20:17 -08:00
Raphael
e97081e8cd Delete some pending specs, fix a minor bug 2011-01-19 17:11:33 -08:00
maxwell
e7a065a521 make jobs have a base class, which will verify the activerecord connection before trying the job 2011-01-19 14:10:42 -08:00
maxwell
72e10cfad6 remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times 2011-01-18 22:45:43 -08:00
maxwell
7a02a31440 fix invitations#new, and a post spec which was mongo specific 2011-01-18 22:11:58 -08:00
danielvincent
3dd2384458 Merge branch 'fixturebuilder' 
Conflicts:
	spec/controllers/people_controller_spec.rb
	spec/controllers/publics_controller_spec.rb
	spec/lib/diaspora/parser_spec.rb
 2011-01-18 17:05:44 -08:00
danielvincent
1fa39ad20d fixed issue in attack_vectors_spec 2011-01-18 16:58:59 -08:00
zhitomirskiyi
ef1b7644f3 got rid of more hash from 2011-01-18 16:38:31 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
6ccf8a4d2d Fixed connecting spec, magic import failure disappearance 2011-01-18 16:05:50 -08:00
Raphael
88ebd14799 Fixture builder working, need to make specs not require a clean db 2011-01-18 14:53:46 -08:00
Raphael
1353929d44 Made specs work with fixtures, spec_helper needs work 2011-01-18 13:31:10 -08:00
zhitomirskiyi
c28b5a22fb here you go 2011-01-17 18:03:15 -08:00
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Raphael
bd4efe8c2d Escape youtube titles 2011-01-17 15:39:46 -08:00
Raphael
72785a69cb Correct ordering problem in posts_from 2011-01-17 12:21:38 -08:00