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

771 commits

Author SHA1 Message Date
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
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -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
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 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
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
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
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
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -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
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
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
Raphael Sofaer
2857de5f1b doc a user method 2011-06-24 10:38:06 -07:00
danielgrippi
890dc7efd5 put some dependent destroys on models for better sqlite compatability 2011-06-19 23:39:57 +02:00
Raphael Sofaer
800e701f89 Document User#accept_invitation 2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1 Take loop out of remove_mentions 2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2 Document liked? and like_for 2011-06-14 10:15:32 -07:00
danielgrippi
b446404348 Revert "Without loaded? I was confused by the liked? and like_for methods." 
This reverts commit 2103d54fe4.
 2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4 Without loaded? I was confused by the liked? and like_for methods. 2011-06-13 17:14:00 -07:00
Raphael Sofaer
480d7c47cf Documentation is so rad. 2011-06-13 17:02:18 -07:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
MrZYX
668c4ddfc5 d'oh 
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
 2011-06-02 12:32:21 +02:00
Raphael Sofaer
283e376712 Move initialize_signatures method out of user and into relayable 2011-06-01 16:45:30 -07:00
Raphael Sofaer
df04b59857 Change :on to :post in the comment and post methods 2011-06-01 16:45:29 -07: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
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
cd887e9373 fixed unlike the right way 2011-05-29 18:15:46 +02:00
Raphael Sofaer
286f1b876d Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions. 2011-05-20 15:14:23 -07:00
Raphael Sofaer
93be5497a7 Small controller for generating an auth token, if you are an authable user 2011-05-19 18:29:53 -07:00
Maxwell Salzberg
3c4c62abd5 moved auth token to admins page, and added a link in the dropdown 2011-05-19 14:23:04 -07:00
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -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
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1 Don't use rails case_sensitive false, it is very slow. 2011-05-13 16:32:07 -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
Raphael Sofaer
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -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
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
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
MrZYX
8639dc3a77 fixed #993 2011-04-03 18:36:34 +02:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
MrZYX
5c4979ccf0 use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why 2011-03-28 00:09:07 +02:00
Raphael Sofaer
fef226156c Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable? 2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628 Relayable retractions pretty much done 2011-03-25 16:09:37 -07:00
Raphael Sofaer
31f43696cb Initial work on retracting comments 2011-03-25 16:09:37 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names. 
Moved some logic from view into user model.
 2011-03-22 13:16:58 -07:00
Raphael Sofaer
fdd158d86a Make urls not change on processing 2011-03-21 18:42:36 -07:00
Raphael Sofaer
2b997e70c2 Refactor image processing to use 2 uploaders. Federation and s3 need testing 2011-03-21 16:40:53 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -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
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
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
maxwell
28fc093a01 fix bug in user edit mailer view 2011-03-14 11:32:59 -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
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -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
80a3a3446a pulling in 2011-03-06 21:37:27 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -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
f4e6d0d82b broke out some comment logic to a replayable module 2011-03-01 12:28:33 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -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
zhitomirskiyi
61dd5a835a default scope on contact 2011-02-18 17:38:02 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 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
2304827569 Only save the connected person if it has changed 2011-02-17 20:30:38 -05:00
Raphael Sofaer
f1fe913527 Change up logging a little bit 2011-02-10 11:52:00 -08:00
Raphael Sofaer
f8cec95d7a no authentication, n-query in stream 2011-02-09 16:07:24 -08:00
zhitomirskiyi
e3170504b8 using blank instead of checking for nil, since mongo import make these bank 2011-02-05 16:53:14 -08:00
Raphael
cfd6639f4d Revert "Merge branch 'open-aspects'" 
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
 2011-02-01 13:15:20 -08:00
zhitomirskiyi
789ff679a9 persists open aspects across logins also fixed the status message controller spec broken in master 2011-01-31 18:31:41 -08:00
zhitomirskiyi
9d091bbf6a facebook invitations actually work 2011-01-28 17:22:18 -08:00
zhitomirskiyi
d595a64169 new interface to send invitation WIP 2011-01-26 12:16:47 -08:00
maxwell
4bff854a04 pass params to super 2011-01-21 11:11:00 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
1661158f95 IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com 2011-01-12 10:47:39 -08:00
maxwell
25f388d903 MS DG made receive encapsulated in an object 2011-01-11 14:23:19 -08:00
maxwell
a82e59077b pass opts to the postman when creating a post 2011-01-06 17:49:24 -08:00
maxwell
beaeac2d42 comment out debug 2011-01-05 17:52:21 -08:00
maxwell
a7d651236f make the postman work across everything. remove lots of now useless methods 2011-01-05 17:44:08 -08:00
maxwell
8819d288c4 i am greeen 2011-01-05 17:43:25 -08:00
zhitomirskiyi
11153cf2ca a couple more passing specs 2010-12-27 22:23:41 -08:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831 Fix a couple more specs in mysql 2010-12-26 20:52:15 -08:00
Raphael
3e7e99831a 14 failures after updating mysql branch to master 2010-12-26 17:25:07 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Michael Sofaer and Raphael Sofaer
82b226712f Posting spec green 2010-12-24 09:58:11 -08:00
Michael Sofaer and Raphael Sofaer
426651d827 Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see 2010-12-24 00:23:37 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Sarah Mei
c1bfbd358e Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know. 2010-12-20 02:50:38 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Raphael
51083e9659 Another 50 passes in mysql 2010-12-19 13:57:46 -08:00
Raphael
0c67e271df Services are in mysql, contact_for and add_contact_to_aspect work again 2010-12-19 13:11:41 -08:00
Raphael
232de40457 Only service hasn't been migrated, there are a good 100 passing examples in mysql 2010-12-19 12:27:32 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
danielvincent
b4b6189321 time out a user session via devise after 10 minutes of inactivity 2010-12-16 15:50:00 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
danielvincent
dea8d248e2 user only pushes to non-pending contacts 2010-12-14 19:11:35 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
danielvincent
d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" 
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
 2010-12-13 17:16:56 -08:00
mblog
d0355fdd43 Feature #348: Change Email 2010-12-13 22:14:52 +01:00
Raphael
f861955d80 profile.image_url is set to :thumb_large in update_profile 2010-12-13 12:11:54 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
maxwell
bf56364019 tests for post to services resque job 2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1 added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run 2010-12-09 19:29:25 -08:00
maxwell
9d37b2a749 small bugfixes for services refactor 2010-12-09 19:29:25 -08:00
maxwell
8fe2eb3180 starting migrations 2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72 moar tests for services 2010-12-09 19:29:25 -08:00
maxwell
041e747db6 MSSM services are now broken out into seperate classes, and we cleaned up posting to them 2010-12-09 19:29:25 -08:00
zhitomirskiyi
10141742e5 Doing the query in mongo 2010-12-09 15:53:37 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
zhitomirskiyi
23d2a92bf1 pushing the profile to to all the contacts 2010-12-09 11:51:35 -08:00
Hexagon
80c5c5c9f5 Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
Raphael
5a5bd13ceb Take out extra person.save 2010-12-05 12:46:05 -08:00
Raphael
61e40debb5 Fix in find_for_authentication 2010-12-04 22:25:28 -08:00
Michael Sofaer
9e575ea765 MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues 2010-12-04 19:36:22 -08:00
danielvincent
4c4f5c6aa4 dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND. 2010-12-04 19:36:22 -08:00
maxwell
b3ca504c40 no periods in username 2010-12-04 19:28:08 -08:00
maxwell
8fb97072df Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict 2010-12-04 18:40:17 -08:00
maxwell
55c0bd684b remove some puts 2010-12-04 17:43:15 -08:00
maxwell
b9ab799569 ironing out invites 2010-12-04 16:49:45 -08:00
maxwell
544ab993ac only show the url when the post has photos 2010-12-04 11:58:34 -08:00
maxwell
7dce94814c fixing the invite user job 2010-12-03 22:41:16 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
danielvincent
a7823485c7 made http calls synchronous. messagehandler enqueues POSTs into resque. 2010-12-03 15:26:52 -08:00
maxwell
f4fa3191bc just call Jobs::Receive directly for now 2010-12-03 15:03:32 -08:00
Philip Champon
2633dbc268 Issue 658: user object creation comes before person object creation, 
preventing spurrious handle creation errors, if user creation
      fails
 2010-12-03 14:59:35 -05:00
maxwell
c43077d318 fixed twitter, added logging for constants, added job for local recieve 2010-12-03 11:34:42 -08:00