237 commits

Author	SHA1	Message	Date
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 Rouzi	343694d076	Merge pull request #524 from differentreality/remove_attachment ... remove leftovers from event attachment removal	2014-11-12 13:45:51 +02:00
Stella Rouzi	aa37534ee1	Merge pull request #534 from differentreality/proposal_error_msg_name ... Fix proposal error message. Username -> name.	2014-11-12 13:41:51 +02:00
Stella Rouzi	4f3684db76	Merge pull request #537 from differentreality/username_deleted_user_seeds ... add username to deleted_user in seeds	2014-11-12 13:41:16 +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
Stella	a2c9e15236	remove leftovers from event attachment removal	2014-11-09 20:47:34 +02:00
Stella	e3ad72268e	add is_disabled attribute for deleted user	2014-11-09 20:37:28 +02:00
Stella	2f080fb458	Fix proposal error message. Username -> name.	2014-11-09 15:58:44 +02:00
chrisbr	56cb805110	Adds disabled flag to user and checks it if iChain is enabled	2014-11-06 16:17:11 +01:00
Henne Vogelsang	164dd75712	Include disabled omniauth in ichain config for delayed jobs	2014-11-06 11:16:54 +01:00
chrisbr	49d565def2	Implements iChain authentication	2014-11-04 17:42:47 +01:00
chrisbr	15c6ed127f	Implements username authentication ... It's now possible to login with either username or email That's necessary to be backward compatible for iChain login	2014-11-03 15:25:33 +01:00
Gopesh Tulsyan	67ea900dc3	Keynote Speakers implemented	2014-09-15 19:02:02 +05:30
James Mason	a3e4ab5ca0	there's no such thing as Array#to_h ... (cherry picked from commit 780bd84bc17f55b0ece1d86a2b224f0340495c73)	2014-09-09 17:57:30 -07:00
Stella Rouzi	1fbbbdae6e	deletions	2014-09-02 21:45:08 +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
Henne Vogelsang	89440b971d	More accept/reject/confirm fixes	2014-09-01 17:17:30 +02: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
Stella Rouzi	30c2d66a15	remove attachments	2014-08-21 07:58:26 +03:00
Chrisbr	ed55e2bf3a	Introduces new RegistrationPeriod Object for Conference ... #416	2014-08-18 14:33:02 +02:00
Stella Rouzi	3bb42bdb10	move sample user creation in seeds	2014-08-15 20:45:29 +03:00
Stella Rouzi	b5b85ede71	delete events without submitter	2014-08-15 20:45:28 +03:00
Christian Bruckmayer	63366d43a4	Merge pull request #453 from ChrisBr/bugfix_conference_controller ... Removes dulplicate conference update action	2014-08-15 16:57:13 +02:00
Christian Bruckmayer	367c962c1b	Merge pull request #429 from ChrisBr/fix_campaigns ... Fix campaigns dashboard missing method bug	2014-08-15 16:14:31 +02:00
Chrisbr	d0e9805456	Removes dulplicate conference update action and moves methods out of private area	2014-08-15 16:06:02 +02:00
Christian Bruckmayer	1ab7fe3051	Merge pull request #449 from ChrisBr/introduce_speakers_relation ... Introduces speakers relation to conference #416	2014-08-15 13:00:59 +02:00
Christian Bruckmayer	70e3d0af35	Merge pull request #448 from ChrisBr/introduce_participants_relation ... Introduces participants relation to conference #416	2014-08-15 12:58:10 +02:00
Artem Chernikov	566382eca8	Merge pull request #441 from differentreality/cancancan ... Cancancan	2014-08-15 12:00:35 +02:00
Stella Rouzi	bf6b09d9f4	add github for openid login	2014-08-15 06:16:42 +03:00
Chrisbr	47f524259c	Introduces speakers relation to conference #416	2014-08-14 11:25:11 +02:00
Chrisbr	c7d47ce6df	Introduces participants relation to conference #416	2014-08-14 10:46:02 +02: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	d13c1a83e4	fix in questions	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	ebdf0df410	Moving notifications to models	2014-08-12 18:34:59 +05:30
Gopesh Tulsyan	a39f4cf0dd	Subscription on Registration, Independent Subscription without registration	2014-08-12 16:47:36 +05:30
Gopesh Tulsyan	41fc21f7f4	Added Subscription model to send emails	2014-08-12 16:47:35 +05:30