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

1106 commits

Author SHA1 Message Date
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
Maxwell Salzberg
72c6efe41c basic specs 2011-06-01 22:38:15 -07:00
Raphael Sofaer
df04b59857 Change :on to :post in the comment and post methods 2011-06-01 16:45:29 -07:00
Raphael Sofaer
06217a0a1d Fix stream query 2011-06-01 14:19:27 -07:00
Raphael Sofaer
ee75426963 Add failing spec for being overloaded with updated pending photos 2011-06-01 14:05:25 -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
Raphael Sofaer
537de1ce4c build_like and build_comment now take only an options hash, and call build_relayable 2011-05-31 12:27:58 -07:00
MrZYX
c937f76433 specs for new methods in user model 2011-05-29 18:46:30 +02:00
Sarah Mei
f16cf223eb This test was not testing how person objects are actually built. Fixed. 2011-05-28 20:14:18 -07:00
Sarah Mei
828cbab792 Keep pod_url and pod_uri settings in sync. 2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
Jakob Kramer
0efaa77c46 fixes bug #1092 2011-05-27 18:59:02 +02:00
danielgrippi
d12944d57e record objectId in post (cant use object_id booo) 2011-05-25 12:16:52 -07:00
Sarah Mei
f29a605a7c Remove photo-related pending specs. 2011-05-25 09:08:49 -07:00
Raphael Sofaer
609439f948 Destroy notifications on contact destroy 2011-05-23 18:33:18 -07:00
Raphael Sofaer
cc84051541 Fall back to author if the diaspora_handle isn't set, that column just needs to be removed 2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0 Fix AS::Photo federation, hopefully 2011-05-23 13:56:42 -07:00
Maxwell Salzberg
d4d3b1e44c MSSM like notification are concatinated, and backfilled some like tests 2011-05-22 13:59:33 -07:00
danielgrippi
c8e31825c5 Bookmark -> ActivitiyStreams::Photo 2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0 only generate new token if admin 2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed. 2011-05-19 11:57:06 -07:00
Raphael Sofaer
c942f76d29 Turn off user collapse and turn up status messages to over 9000 2011-05-17 18:14:35 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
Raphael Sofaer
84779c6773 typo in a test 2011-05-11 16:13:59 -07:00
Raphael Sofaer
970190fb7a OMG SO MANY EMAILS, fixed 2011-05-11 16:07:24 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
7e838fc778 only display contacts you are sharing with in aspect edit panes 2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e added a pane for people sharing with you on all aspect page 2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32 split 'mutual' flag into 'sharing' and 'receiving' on Contact 2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
Arzumy MD
cdf94a0275 #1019 comment/post handles multiple youtube links properly 2011-05-05 00:05:59 +08:00
Maxwell Salzberg
c20cd5381e create a new notifciation if previous was read, only concatinate when it is the same unread message 2011-05-02 18:18:30 -07:00
Raphael Sofaer
efe79eb351 Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
Raphael Sofaer
92b50c3d90 Add some comments, a test for pagination 2011-04-13 10:45:11 -07: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
danielgrippi
352d1c6abf fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
Raphael Sofaer
080f08187d Disable typhoeus everywhere but the HTTPMulti specs 2011-04-11 14:52:21 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -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
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Raphael Sofaer
a172e56290 Make the ordering in querying spec less brittle 2011-04-06 12:33:20 -07:00
Raphael Sofaer
3fb822c6c5 Fix distinct problem 2011-04-06 12:29:05 -07:00
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -07:00
danielgrippi
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
Raphael Sofaer
fa41c1fc52 Stream query... FIXED????? 2011-04-05 14:56:56 -07:00
danielgrippi
07f7eff782 fixed all specs 2011-04-05 10:00:54 -07:00
Raphael Sofaer
fdb6675f28 Make things more postgres compatible 2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
Raphael Sofaer
79e3438b11 Fix CI? 2011-04-04 14:32:37 -07:00
Raphael Sofaer
b48b483eab Still working on stream query 2011-04-04 13:06:15 -07:00
Raphael Sofaer
d09bf35213 Add tests for raw_visible_posts 2011-04-04 12:07:19 -07:00
danielgrippi
c800b0bfef use fixtures in request spec; collapsed xml specs 2011-04-04 11:57:25 -07:00
MrZYX
9829f11498 fixed posting spec 2011-04-02 14:01:16 +02:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
maxwell
6364f2a332 clean activity streams, fix test 2011-03-30 14:27:20 -07:00