Commit graph

719 commits

Author SHA1 Message Date
Stella Rouzi
2e7169ede7 Make second user admin 2014-11-12 16:21:33 +02:00
Stella Rouzi
acbc67173b change to authenticate_user 2014-11-12 14:13:24 +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 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
7b8ce46ef1 Merge pull request #526 from differentreality/users_link
Show Users link in drop down menu
2014-11-12 13:43:13 +02:00
Stella Rouzi
dfc7fccc07 Merge pull request #531 from differentreality/questions_fixed_answers_for_yes_no
Do not require answers if it is a yes or no question.
2014-11-12 13:43:02 +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
Stella
ce7829e9c1 Profile 2014-11-12 13:20:51 +02:00
Stella
2b749fb1c5 Add clarification when updating user's email 2014-11-12 13:20:51 +02:00
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +01:00
Henne Vogelsang
5b78666eb8 Merge pull request #538 from hennevogel/master
Implements piwik tracking
2014-11-12 12:04:36 +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
Henne Vogelsang
796d063eda Implements piwik tracking 2014-11-12 10:45:44 +01:00
Henne Vogelsang
a9581445f3 Provide a helper to point to sign up/in for different configs 2014-11-12 10:20:53 +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
Stella
bcde6b300c Do not require answers if it is a yes or no question. 2014-11-09 14:20:36 +02:00
Henne Vogelsang
2c98ba9711 Also destroy the ichain session for deisabled users 2014-11-06 17:29:46 +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
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
Stella
4973effe23 Add Users link in drop down menu 2014-10-31 23:00:42 +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
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
Chrisbr
be68877f1a Implements new admin menu structure #304
close #305
2014-09-30 12:57:56 +02: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