Commit graph

1370 commits

Author SHA1 Message Date
Steven Fuchs
a11c8d8a96 javascripts for marking notifications items as unread on both the notifications page and popup menu. 2012-01-17 19:20:42 -05:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
danielgrippi
240d595714 removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...) 2012-01-13 23:33:59 -08:00
Maxwell Salzberg
9dbe644b25 fix app_config spec 2012-01-13 15:03:44 -08:00
danielgrippi
aed413b463 remove unused method and controller action (move_contact) 2012-01-13 12:15:32 -08:00
Maxwell Salzberg
258d55df51 fully reset app_config spec to prevent test polution 2012-01-12 16:11:41 -08:00
Maxwell Salzberg
408bafca09 add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up 2012-01-12 15:04:14 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
Maxwell Salzberg
68f25c8d4e fix app_config spec as we broke out setup into its own method 2012-01-05 19:05:13 -08:00
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
Maxwell Salzberg
71b58fa6fc only queue process_photo jobs if the owner is local. this should cut down on some resque errors 2012-01-04 00:08:29 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until
we find a better way to reimpliment it in a  more sane way
2012-01-03 18:39:54 -08:00
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
robhogg
6571ec2fa9 Added test for nsfw? 2012-01-02 21:24:44 +00:00
danielgrippi
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
Sarah Mei
6236fd22a0 Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others. 2011-12-27 14:48:39 -08:00
Jonne Haß
d063db42aa fix app config spec 2011-12-24 00:04:04 +01:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
danielgrippi
e9b6da605f fix specs; move presence_of_content validation check into a before_destory to play nicely with federation 2011-12-20 10:42:30 -08:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Pistos
a604dd2aa6 Refactor implementation of #reshare_count.
The old implementation which uses Post.where causes

  undefined method `abstract_class?' for Object:Class

in spec/controllers/posts_controller_spec.rb.  Not sure whether that's a problem
with Rails, or rspec, or what.
2011-12-19 17:12:17 -05:00
Pistos
51566ebe0b Improve wording of error message in Reshare#root_must_be_public validation. 2011-12-19 17:12:17 -05: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
Maxwell Salzberg
f800d50a2b i think this works 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
7667029e71 wip, stated the serialized model 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
danielgrippi
644e382cfd DG IZ; remove more stuff associated with user; removed dependant destroys 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
3035f173bd ms iz wip, clearing profile, started deleting post visibilities 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
05612ef733 ms iz wip 2011-12-08 16:32:18 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable"
This reverts commit 0f56ee7b77.
2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
danielgrippi
6408105917 Revert "auto follow back feature"
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
2011-11-14 17:18:43 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b Merge branch 'master' of github.com:diaspora/diaspora 2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a Background sending password reset instructions. 2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Pistos
31b43f315e Corrected the message length spec. 2011-11-09 21:35:16 -05:00
Pistos
e5d37c7949 Whitespace cleanup. 2011-11-09 21:35:08 -05:00
Daniel Grippi
319d72deb9 Merge pull request #2345 from 21echoes/higher_post_limit
higher post limits
2011-11-09 16:11:39 -08:00
Jonne Hass
0a29408497 fixed order dependent spec 2011-11-08 12:03:17 +01:00
David Kettler
74bcc6f06e now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit 2011-11-07 21:21:36 -08:00
Maxwell Salzberg
fe3fe0f5cc MS SM save sync cache if you have some sort of contacts 2011-11-07 19:52:48 -08:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
2011-11-07 12:50:02 -08:00
danielgrippi
fd76cfd4c5 fix construct_shareable_from_others_query to only include posts from contacts within your aspects 2011-11-07 10:52:31 -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
Sarah Mei
4fba9a6989 get rid of all pending specs except the one that is actually pending 2011-11-06 20:20:27 -08:00
Sarah Mei
53dbbfbb15 Fix order-dependent test that would sometimes fail on postgres 2011-11-06 19:10:26 -08:00
Sarah Mei
db223b2a3f Rename and make pending the spec for populating the cache 2011-11-06 12:52:01 -08:00
Jonne Hass
af1558831b Improved reshare receive
- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times
2011-11-06 18:26:10 +01:00
Jonne Hass
9ffeef9d20 Merge branch 'new_user_language' of https://github.com/alda519/diaspora 2011-11-06 15:17:05 +01:00
danielgrippi
c9f069d000 Revert "add participant_users to conversations"
This reverts commit 655558cb95.

Revert "MS DG; for real this time?"

This reverts commit f85a047f6f.

Revert "MS DG; actually fix the bug"

This reverts commit cde12ec232.

Revert "fix small commenting email bug #oops"

This reverts commit a552fc80c0.

Revert "dont ban diasporahq  stuff"

This reverts commit 2c12b94e67.

Revert "Merge branch 'participants'"

This reverts commit 7417801886, reversing
changes made to abd211ba72.
2011-11-05 18:08:32 -07:00
Sarah Mei
92c28857b3 Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory. 2011-11-05 16:05:13 -07:00
Sarah Mei
1ecdba9bae Fix facebook spec 2011-11-04 22:22:39 -07:00
Sarah Mei
0b329bf385 Fix notify local users spec 2011-11-04 22:16:55 -07:00
Maxwell Salzberg
f85a047f6f MS DG; for real this time? 2011-11-04 19:56:53 -07:00
Maxwell Salzberg
a552fc80c0 fix small commenting email bug #oops 2011-11-04 19:24:48 -07:00
Maxwell Salzberg
c3dc3d103b include post author in participats 2011-11-04 18:46:43 -07:00
Maxwell Salzberg
95c206df24 MS DG add participants 2011-11-04 18:46:43 -07:00
Ilya Zhitomirskiy
41db42a7a4 displaying public tags in the multi stream 2011-11-04 18:14:34 -07:00
danielgrippi
9ef0fbfe60 DG MS; fix last failing spec 2011-11-03 21:08:32 -07:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07:00
danielgrippi
07f713f46c change 'mute' to 'ignore' for now; fix specs; repopulate cache upon
contact removal
2011-11-03 12:31:24 -07: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
Dan Hansen & Maxwell Salzberg
0eb33b371b blocked users works for multi stream, cuke passes
fixed scoping stuff
2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
danielgrippi
995996add1 add spec & change syntax in http_multi 2011-11-02 15:00:30 -07:00
Daniel Grippi
ed029b2fbd Merge pull request #2251 from manuels/retry_federations
Retry federation if remote pod is down
2011-11-02 14:09:30 -07:00
danielgrippi
90f990e8dd use the cache if cache size is less than limit 2011-10-31 17:07:30 -07:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
danielgrippi
0512ade65a made name smaller and clickable on aspects/index [ci skip] 2011-10-24 21:43:32 -07:00
danielgrippi
19897df1ec more first_name fixing 2011-10-24 21:34:56 -07:00
danielgrippi
e71fcea762 first_name now takes everything but the last word in the name field 2011-10-24 21:27:21 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
Ilya Zhitomirskiy
51778cb22d storing the entriety of the service profile name in first name 2011-10-24 12:41:50 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
c60adda3a9 WIP, almost done for twitter, just need to figure out how to follow redirects 2011-10-24 11:00:00 -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
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
danielgrippi
c49c76e2a6 DG MS; some refactoring 2011-10-19 15:47:22 -07:00
Maxwell Salzberg
cb89772a6a when connected, external services fill in profile info that you have not yet filled out 2011-10-18 10:02:24 -07:00
Gonzalo Rodriguez
aa1623a95f Fixing person's name construction
* When only has last_name, return last_name not diaspora_handle
* Strip contstructed name to avoid trailing or preceding space
when having only first or last name present
2011-10-18 02:24:29 -02:00
Manuel Schölling
8cfb854fab Quickfixed federation of StatusMessages with photos only (no text) 2011-10-16 14:42:14 +02:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
f959ca0c12 refactor streams to be in a Stream module, hopefully they will auto-reload now 2011-10-13 22:26:15 -07:00
Daniel Grippi
b7f4f81d28 Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql
Explicitly specify order of comments, since we cannot assume MySQL orderi
2011-10-12 16:09:18 -07:00
Maxwell Salzberg
8acd9acb08 tests moved and passing 2011-10-11 16:12:32 -07:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Pistos
15b3cce6ee Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code).
Leaving the #order call in #last_three_comments caused the generated SQL to
have two conflicting ORDER BY components, which caused the query to return
invalid results.  I removed the problem by removing #last_three_comments which
I consider a premature optimization.
2011-10-11 16:06:24 -04:00
Pistos
4774b670de Whitespace cleanup. 2011-10-11 15:50:40 -04:00
danielgrippi
882c0c2170 DG MS; fixed tags autocomplete styling and js 2011-10-10 15:59:13 -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
Maxwell Salzberg
c85209a22c strip whitespace in name call 2011-10-07 12:59:07 -07:00
Your Name
a457ab1ca2 fix dumb post spec 2011-10-06 17:30:21 -07:00
Ilya Zhitomirskiy
018a42b001 assert that prep_opts works; reference BaseStream types in lieu of subclassed AspectStream's 2011-10-06 17:26:29 -07:00
Ilya Zhitomirskiy
7572eaaf0d changed the default order in prep_opts, passing in opts to cache population 2011-10-06 17:14:14 -07:00
Ilya Zhitomirskiy
d891e78652 refactored post receiving; only update cache on verfied received objects 2011-10-06 12:31:09 -07:00
Ilya Zhitomirskiy
c2bb483b21 dg iz updating authors cache on creation of a post 2011-10-04 17:40:44 -07:00
Ilya Zhitomirskiy
b42d675cb7 accounting for the unified receiver interface of the method 2011-10-04 15:51:39 -07:00
Ilya Zhitomirskiy
97342630c4 dg iz added some more documentation and only caching on all aspects 2011-10-04 14:39:56 -07:00
Ilya Zhitomirskiy
6ea540fb94 wip, adding to cache in receiver, caching is only triggered for receiving of posts 2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy
01515725fe WIP trim is still needed, also possible weirdness with the mock 2011-10-04 10:32:16 -07:00
Ilya Zhitomirskiy
8d12a57f37 reding from redis cache 2011-10-04 10:32:16 -07:00
Maxwell Salzberg
008116fa3f IZ MS more tests for status message scopes 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
0f073387ac IZ MS refactor commenting disabled 2011-10-03 15:20:43 -07:00
Dan Hansen
e199010448 remove commented out spec 2011-10-03 15:00:14 -05:00
Dan Hansen
3eaa1c0584 moved photo processing from model to resque job, added tests
removed Photo#not_processed
2011-10-03 14:58:44 -05:00
Ilya Zhitomirskiy
5f29b77b1f fixing wrong datatype on activity streams objectId 2011-10-01 19:07:11 -07:00
Paul Spieker
0c12471feb add username blacklist 2011-09-30 14:17:04 +02:00
Maxwell Salzberg
dfb4c9c920 Merge pull request #2051 from uiri/672-facebook-majority-market-share
Links in the message translate into a proper link on Facebook when sendin
2011-09-29 18:13:33 -07:00
Uiri
0fbda5d077 Modularized and Tested™ 2011-09-29 21:04:18 -04:00
danielgrippi
e3bf03636b pass in mobile as provider_display_name on posts if posting from mobile 2011-09-28 22:15:32 -07:00
Ilya Zhitomirskiy
c3746aec7f passing around arrays instead of object on local batch receive 2011-09-28 21:34:48 -07:00
Gonzalo Rodriguez
24be48d660 Strip full name considering cases where first or last name omitted 2011-09-20 22:18:35 -03:00
danielgrippi
60cb9e43a7 DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route 2011-09-15 15:33:28 -07:00
danielgrippi
ba8e50e34c DG MS; renamed a file; fixed the build 2011-09-15 15:16:34 -07: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
danielgrippi
cfa260927d DG MS; remove unusused job 2011-09-15 11:22:47 -07:00
danielgrippi
930ea6c425 Fix failure, decode in receiver 2011-09-14 21:41:46 -07:00
danielgrippi
fab6f9ccd9 DG MS; fixed tests; explicitly send in dispatcher in httpmulti 2011-09-14 17:51:25 -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
The Lambda Calculus
83fc972c61 Added RSpec test for #1126 2011-09-13 23:27:54 -04:00
Maxwell Salzberg
adaefd0cb5 MS DG rspec is green update gemfile 2011-09-13 13:34:49 -07:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public
dispatcher
2011-09-12 17:02:40 -07:00
Maxwell Salzberg
0ab0526cd6 DG MS; put validates_associated in relayable, removed from receiver logic 2011-09-12 15:06:17 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
87c994fa47 MS DG cleaned up and fleshed out salmon specs 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
34ed07260f MS IZ DG moar salmon refactoring 2011-09-12 14:05:31 -07:00
danielgrippi
1d0bec11f7 Add counter cache for comments on posts 2011-09-11 15:02:24 -07:00
danielgrippi
1bd37038cc fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream 2011-09-11 14:16:48 -07:00
Maxwell Salzberg
91eabf0fce attempt to add muting of notifications when post has a hidden visibility; i am getting a load path error in resque now, but that seems to be independent of this commit 2011-09-08 23:21:13 -07:00
Sarah Mei
37579814c4 More querying_spec refactoring. #visible_posts now has sufficient test coverage to aggressively refactor. 2011-09-08 14:55:21 -07:00
Sarah Mei
d1604a5bb5 Blow out the visible_posts specs so I can more easily see what it's doing 2011-09-08 11:58:14 -07:00
danielgrippi
c5fbe1584a fix the build; don't test on enqueueing a job to fetch facebook friends every time we hit the facebook finder -- only do this on log in 2011-09-08 10:59:35 -07:00
Sarah Mei
7d10b3fdb0 Remove more refs to aspects.first - should make postgres builds green 2011-09-05 19:04:56 -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
Sarah Mei
c678f4732c A bit of refactoring on person_spec since we got an odd failure on travis 2011-09-04 21:34:00 -07:00
Sarah Mei
b6e2e9452f Fix YouTube titles on 1.9. (SIGH.) 2011-08-30 21:04:29 -07:00
danielgrippi
4d1c93d95b Removed , but not the table. Record all in httpmulti success 2011-08-30 10:14:32 -07:00
danielgrippi
0dfcbca51b Revert "removed the pod_stats table (was the cause of bloat on the database)."
This reverts commit 902c40e42d.
2011-08-30 10:03:56 -07:00
danielgrippi
902c40e42d removed the pod_stats table (was the cause of bloat on the database). 2011-08-30 10:01:59 -07:00
Sarah Mei
2255e80b69 So. It turns out that postgresql has a less-consistent idea of what .first means in an association with no default ordering. All the places we were doing bob.aspects.first (& etc.) needed to be more specific. & o ya, POSTGRES IS GREEN. 2011-08-29 22:03:05 -07:00
danielgrippi
bd77560636 cucumber green in postgres (i think?). touched up aspect spec. 2011-08-29 15:53:47 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e45278a043 notification for reshares WIP 2011-08-25 17:16:09 -07:00
Gonzalo Rodríguez
31733e1f9f Merge pull request #1686 from grzuy/1486-invalid-birthday-crash
Fix #1486 profile update was crashing with invalid birthday date
2011-08-25 16:40:57 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
Gonzalo Rodriguez
ceedbb14cb Closes #1486. Profile update was crashing with invalid birthday date 2011-08-20 00:34:59 -03: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
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
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
Gonzalo Rodriguez
2326206586 Refactor conversations creation 2011-08-12 23:07:01 -03:00
Raphael Sofaer
8b743e7e3b Fix stack level too deep error on reshares 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
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -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
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
Maxwell Salzberg
e9d993b8f6 throw 404s when the person is no found 2011-08-09 13:03:45 -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
dde4b30180 Fix rspec specs 2011-08-05 22:29:27 -07:00
Raphael Sofaer
61eea529cb Don't update target.updated_at when updating target.likes_count 2011-08-03 18:36:34 -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
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -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
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
Dan Hansen & Sarah Mei
2d9a709212 Fix contacts spec - default order on the association means we need to reload after adding one 2011-07-28 23:38:17 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32: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
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -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
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
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
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
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -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
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
1f448e8555 as_json wants a string 2011-07-07 10:56:55 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
Raphael Sofaer
a1ee8eb83b stub tests for not n-querying in the publisher 2011-07-07 09:06:24 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys
1137 bad rsa keys
2011-07-06 10:00:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
Ryan Hughes
2f89f19f34 Test sending to people with bad rsa keys. 2011-07-04 18:00:55 -07:00
danielgrippi
511a651377 don't query for mentioned people if mention syntax isn't present in message text. 2011-07-03 20:36:46 -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
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same""
This reverts commit 696779d589.
2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same"
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same
thing. use built in resque inline method for single process mode
2011-07-02 11:57:10 -07:00
Sarah Mei
1bbfa97e5f DH SM MS pending photo spec for Dan 2011-06-30 21:04:18 -07:00
Raphael Sofaer
7ee3fcd811 Fix app_config spec 2011-06-29 14:08:25 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213 Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env. 2011-06-23 14:20:53 -07:00
Ilya Zhitomirskiy
c09fb776fb added a couple of validations on the Oauth models, added an index on a user's authorizations 2011-06-20 18:30:18 -07:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
f0cb2159c7 Make contacts appear at the beginning of search results in postgreSQL 2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
75a1012c1c moved the monkey patching to a model, need to do a couple of validations 2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
Sarah Mei
243699c8e9 Tumblr service swallows exceptions raised by tumblbeasts. 2011-06-04 20:45:09 -07:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
Maxwell Salzberg
7204ef8e26 the test that was failing should not exsist 2011-06-02 19:18:28 -07:00