222 commits

Author	SHA1	Message	Date
Henne Vogelsang	e65ca7fb58	Get rid of the home controller	2014-11-14 17:24:24 +01:00
Stella	3adec92431	add user in tests, it is used for ichain testing	2014-11-12 18:31:42 +02:00
Stella Rouzi	08c7e6a79a	tests for admin attribute assignment only to 2nd user, if 1rst is the deleted user.	2014-11-12 16:22:53 +02:00
Stella Rouzi	0d51220a8c	load seeds before tests	2014-11-12 16:22:53 +02:00
Stella	3be200abcc	move subscribe to its own controller, add authorization, test subscribe/unsubscribe	2014-11-12 14:00:17 +02:00
Christian Bruckmayer	97bf86454e	Merge pull request #518 from ChrisBr/lodgings ... Refactoring admin lodging menu	2014-11-12 12:47:30 +01:00
Christian Bruckmayer	5a80adaee5	Merge pull request #539 from ChrisBr/venue ... Refactoring venue	2014-11-12 12:47:14 +01:00
Stella	aa0005ef6e	not using real emails/domains in tests	2014-11-12 13:20:51 +02:00
chrisbr	9d08f52636	Refactoring venue	2014-11-12 12:12:57 +01:00
Christian Bruckmayer	67a672633e	Merge pull request #530 from ChrisBr/devise ... Implements test for ichain authentication	2014-11-12 12:01:25 +01:00
Christian Bruckmayer	56747fc118	Merge pull request #515 from ChrisBr/rooms ... Refactoring admin room menu	2014-11-12 12:01:10 +01:00
chrisbr	580c6c6ed9	Refactoring lodgings	2014-11-12 12:00:03 +01:00
chrisbr	085629958e	Test for ichain authentication	2014-11-12 11:45:17 +01:00
chrisbr	6a373b5f6c	Refactoring rooms	2014-11-12 11:37:28 +01:00
Chrisbr	9376fe57e3	Moves sponsor email attribute from conference to contact	2014-11-12 11:16:22 +01:00
Christian Bruckmayer	c0cdf3e6e5	Merge pull request #504 from ChrisBr/menu ... Implements new admin menu structure #304	2014-11-12 11:13:16 +01:00
chrisbr	49d565def2	Implements iChain authentication	2014-11-04 17:42:47 +01:00
Chrisbr	be68877f1a	Implements new admin menu structure #304 ... close #305	2014-09-30 12:57:56 +02:00
Stella Rouzi	46aed52c85	commercials	2014-09-03 00:18:45 +03:00
Stella Rouzi	bb731aec00	tickets controller fix message	2014-09-02 23:28:23 +03:00
Stella Rouzi	da061b3902	exclude config/ from rubocop styling, more style fixes	2014-09-02 21:45:07 +03:00
Stella Rouzi	b7c45718d8	apply StringLiterals cop (remove double quotes, unless there is string interpolation)	2014-09-02 21:45:07 +03:00
Stella Rouzi	f91467a00a	remove trailing spaces and blank lines	2014-09-02 21:41:25 +03:00
Chrisbr	fedb0753bf	Extracted Splashpage from Conference ... #418	2014-08-31 22:59:42 +02:00
Chrisbr	5f8a8ac6d9	Refactoring Tickets ... - Tickets now independent from registration - Implemented money gem #419	2014-08-28 15:21:05 +02:00
Chrisbr	d21e19b977	Big refactoring of registration ... - Added datatable gem - Addaed datatable to events, users (#422), registrations	2014-08-22 15:08:54 +02:00
James Mason	b5fe3bfdcd	Merge pull request #474 from bear454/minor_fixes ... Minor fixes	2014-08-19 14:24:21 -07:00
James Mason	2b0d7b880b	Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall phantomjs.	2014-08-19 10:32:37 -07:00
James Mason	89c77fa33b	trigger click instead of .click	2014-08-19 10:09:24 -07:00
James Mason	818fd96418	Adding a network delay on subsequent action in proposal spec. ... Without this, I get consistent failures, and others experience intermmitent failures, on this spec.	2014-08-19 08:49:51 -07:00
Chrisbr	ed55e2bf3a	Introduces new RegistrationPeriod Object for Conference ... #416	2014-08-18 14:33:02 +02:00
Stella Rouzi	7ebfbae7ab	fix test	2014-08-15 20:45:29 +03:00
Stella Rouzi	79af7266ec	Merge pull request #452 from differentreality/conference_view_test_edit ... fix view test to search for input field with correct value	2014-08-15 20:38:44 +03:00
Chrisbr	d0e9805456	Removes dulplicate conference update action and moves methods out of private area	2014-08-15 16:06:02 +02:00
Stella Rouzi	e9530dce9b	fix view test to search for input field with correct value	2014-08-15 13:32:25 +03:00
Stella Rouzi	09dea4b4c5	fix typo openSUSE	2014-08-15 13:10:35 +03:00
Stella Rouzi	88f613ef8c	Add controller tests for roles	2014-08-15 11:37:11 +03:00
Stella Rouzi	efc00787fc	style fix	2014-08-14 20:18:38 +03:00
Stella Rouzi	7d35fc2857	fix test and add test for roles view	2014-08-14 19:58:50 +03:00
Stella Rouzi	911143c006	fix in admin menu and rework menu tests	2014-08-14 16:46:34 +03:00
Stella Rouzi	ba6643a394	fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout	2014-08-14 11:37:30 +03:00
Stella Rouzi	beb88b848d	changes from comments, fix commercials failing test	2014-08-13 22:53:15 +03:00
Stella Rouzi	aeb28833f1	fixes	2014-08-13 22:53:14 +03:00
Stella Rouzi	f5081813d9	fix from rebase ... Conflicts: app/views/layouts/_admin_sidebar.html.haml	2014-08-13 22:53:14 +03:00
Stella Rouzi	f7ef401be7	style fixes	2014-08-13 22:53:14 +03:00
Stella Rouzi	71dfb3b7e4	fix conflicts	2014-08-13 22:53:13 +03:00
Stella Rouzi	e2fb434dc7	Implement role authorization	2014-08-13 22:53:13 +03:00
Gopesh Tulsyan	d4074b798e	Merge pull request #377 from gopesht/add_email_settings_to_user_accounts ... Add email settings to user accounts	2014-08-13 09:22:34 +05:30
Gopesh Tulsyan	a39f4cf0dd	Subscription on Registration, Independent Subscription without registration	2014-08-12 16:47:36 +05:30
Chrisbr	22cc5e4f14	Extracting Photos form Conference edit form ... close #384	2014-08-12 08:38:51 +02:00