Commit graph

6 commits

Author SHA1 Message Date
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