1078 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chrisbr	6a373b5f6c	Refactoring rooms	2014-11-12 11:37:28 +01:00
Henne Vogelsang	2c98ba9711	Also destroy the ichain session for deisabled users	2014-11-06 17:29:46 +01:00
Henne Vogelsang	19dc918bc4	Merge pull request #529 from ChrisBr/devise ... Adds disabled flag to user and checks it if iChain is enabled	2014-11-06 16:57:52 +01:00
chrisbr	de92298085	Implements placeholder for login forms	2014-11-06 16:17:30 +01: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	b95d35d5d9	It's always hard to remove another layer of indirection...	2014-11-06 14:58:51 +01:00
Henne Vogelsang	6ab1bddd82	Use the correct URL for the ichain login	2014-11-06 12:51:39 +01:00
Henne Vogelsang	164dd75712	Include disabled omniauth in ichain config for delayed jobs	2014-11-06 11:16:54 +01:00
Henne Vogelsang	7cf444f3bb	Update rails/sprockets to fix CVE-2014-7818/CVE-2014-7819	2014-11-06 10:59:24 +01:00
Henne Vogelsang	c3b0dcc9d7	Set the ichain base url	2014-11-06 10:28:19 +01:00
Christian Bruckmayer	79de791f22	Merge pull request #528 from ChrisBr/devise ... Implements iChain authentication	2014-11-06 09:48:52 +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
Henne Vogelsang	d12ff70d6f	Merge pull request #521 from mbarringer/master ... I can't take credit for OSEM :-)	2014-10-16 17:47:16 +02:00
Matt Barringer	6bf85d64d6	I can't take credit for all of this :-)	2014-10-15 18:28:58 +02:00
Christian Bruckmayer	aeb23ba914	Merge pull request #517 from openSUSE/lodging-section ... Describe the splash area as 'Lodging' instead of 'Lodgings'...	2014-10-07 09:52:22 +02:00
Christian Bruckmayer	3b63fb712f	Merge pull request #516 from openSUSE/spacing-fix ... Improve spacing around comma in conference list.	2014-10-07 09:51:58 +02:00
James Mason	1534a0ba45	Describe the splash area as 'Lodging' instead of 'Lodgings'... ... ... becauase it just sounds clunky.	2014-10-06 20:56:29 -07:00
James Mason	92db387822	Merge pull request #513 from ChrisBr/fix_proposal_js ... Fixes the proposal abstract word count javascript functions	2014-10-06 20:44:43 -07:00
James Mason	ce81ec306f	Improve spacing around comma in conference list.	2014-10-06 20:35:10 -07:00
James Mason	567ce6342d	Merge pull request #509 from ChrisBr/fix_to_do ... Fixes to do list link to registration period	2014-10-06 20:22:24 -07:00
James Mason	155924300a	Merge pull request #508 from ChrisBr/fix_dashboard ... Fixes the top bar icons of the instance dashboard	2014-10-06 20:08:05 -07:00
Chrisbr	c995f57877	Fixes the proposal abstract word count javascript functions ... fix #510	2014-10-05 18:58:47 +02:00
Chrisbr	d996d1bb0e	Fixes the top bar icons of the instance dashboard ... fix #507	2014-10-04 09:34:57 +02:00
Chrisbr	b6439a7ea0	Fixes to do list link to registration period ... fix #505	2014-10-04 09:30:56 +02:00
James Mason	9e499d2a5e	Merge pull request #502 from gopesht/keynote_speakers ... Keynote Speakers implemented	2014-09-24 12:55:07 -07:00
Gopesh Tulsyan	67ea900dc3	Keynote Speakers implemented	2014-09-15 19:02:02 +05:30
Stella Rouzi	1106f4e227	Merge pull request #500 from differentreality/typo_phrasing ... rephrase closed cfp in splashpage	2014-09-11 13:25:30 +03:00
James Mason	29ed4e4423	Merge pull request #499 from openSUSE/arrays_and_hashes_oh_my ... there's no such thing as Array#to_h	2014-09-10 12:17:33 -07:00
Stella Rouzi	ea0fcac402	rephrase closed cfp in splashpage	2014-09-10 10:30:56 +03:00
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
Artem Chernikov	c486027e6b	Merge pull request #493 from differentreality/typo ... Typos	2014-09-09 12:51:56 +02:00
Artem Chernikov	e230105f2e	Merge pull request #495 from differentreality/is_admin ... Task to create admins and fix in migration	2014-09-09 12:51:33 +02:00
Stella Rouzi	760bca6ff0	task to make a user an admin. Alter migration to make admins users with old role of Admin or Organizer	2014-09-04 15:53:47 +03: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	9ff8becaf6	Merge pull request #468 from differentreality/styling ... Styling	2014-09-02 23:03:53 +03:00
Stella Rouzi	2d2b605063	deletions	2014-09-02 22:23:49 +03:00
Stella Rouzi	0b04179be9	fix quotes on tickets	2014-09-02 22:17:54 +03:00
Stella Rouzi	1fbbbdae6e	deletions	2014-09-02 21:45:08 +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
Henne Vogelsang	a1ed852287	Merge pull request #492 from hennevogel/master ... Fix a double render while confirming proposals	2014-09-01 18:43:54 +02:00
Henne Vogelsang	42159617b4	Fix a double render while confirming proposals	2014-09-01 18:28:07 +02:00
Henne Vogelsang	33d5775d52	Merge pull request #491 from hennevogel/master ... More accept/reject/confirm fixes	2014-09-01 17:18:54 +02:00
Henne Vogelsang	89440b971d	More accept/reject/confirm fixes	2014-09-01 17:17:30 +02:00
Henne Vogelsang	28194d47ea	Merge pull request #490 from hennevogel/master ... Fix accept, reject and confirm mail templates	2014-09-01 16:54:47 +02:00
Christian Bruckmayer	d112a98e87	Merge pull request #485 from ChrisBr/fix_hakiri_issues ... Fix Hakiri issues	2014-09-01 16:52:12 +02:00
Henne Vogelsang	6147c5d185	Fix accept, reject and confirm mail templates	2014-09-01 16:31:56 +02:00