Valery Sizov e769822595 Merge branch '7-4-stable' into to_ee_stable_from_ce_stable ...

Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb

2014-10-20 19:59:36 +03:00

..

active_tab.feature

Upcase missing feature names

2014-10-07 23:28:38 +02:00

appearance.feature

Add ability to remove the branded page logo.

2014-09-26 14:52:11 +02:00

broadcast_messages.feature

Splitted the Spinach tests to prevent time-outs

2014-06-04 22:55:27 +02:00

emails.feature

Add the feature test

2014-08-26 17:16:12 +02:00

groups.feature

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

2014-10-20 19:59:36 +03:00

logs.feature

Splitted the Spinach tests to prevent time-outs

2014-06-04 22:55:27 +02:00

projects.feature

Fix project trasnfer for admin area

2014-06-19 13:20:42 +03:00

users.feature

Add test for broken admin user page

2014-10-02 17:14:42 +03:00