Commit graph

15 commits

Author SHA1 Message Date
Ntavranis Serafeim
671e8476ba Update factory_girl to factory_bot 2021-04-11 01:51:38 +02:00
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration.
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
2019-10-18 23:14:14 +02:00
kas70
40fc175d6e
only include mutual sharing contacts in conversations form on contacts page
fixes #7377
2018-03-22 23:15:24 +01:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
Benjamin Neff
2a6515fab9
Add params keyword to controller specs 2017-08-12 15:39:23 +02:00
Justin Ramos
fa71af71c1 require spec_helper in .rspec
closes #7223
2016-11-27 21:27:12 +01:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination 2016-08-18 01:54:43 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Steffen van Bergerem
04191996a5 Add updates for 'only sharing' and 'all contacts' 2015-07-24 14:18:43 +02:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Jonne Haß
ccd7c670b3 Merge pull request #5170 from khall/issue_5149a
Issue 5149a

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
2014-08-27 18:20:56 +02:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
danielgrippi
21eba82e76 moved all jasmine fixture building into spec/controllers/jasmine_fixtures/ 2012-01-07 14:23:25 -08:00