Commit graph

  • a41f76cca1 Merge pull request #540 from differentreality/migrate_attributes_to_questions Stella Rouzi 2014-11-14 15:22:35 +02:00
  • 40fc1a32d4 put live js code into application layout Stella Rouzi 2014-11-14 15:20:56 +02:00
  • b43b68ac4f api key not visible Stella 2014-11-12 18:44:25 +02:00
  • fcfe1a4df1 add js code for live translation feature of transifex Stella Rouzi 2014-09-10 20:22:37 +03:00
  • f0b19eddb3 Integrate the splash page into the general layout * Cleanup the CSS * Fix more views then you have fingers and toes * Introduce position(weight) for sponsor levels * Fix bootstrap/datatable integration Henne Vogelsang 2014-11-14 11:58:36 +01:00
  • 348b67870f re-write error message for no answers Stella 2014-11-13 21:39:49 +02:00
  • 953a7b2384 fix relation for conferences-questions Stella 2014-11-12 21:10:45 +02:00
  • 163293d3f7 Rework seeds.rb Stella 2014-11-09 18:53:35 +02:00
  • 59f2b636c5 Migrate registration attributes to questions Stella 2014-11-09 18:25:36 +02:00
  • c1c8565169 We need glyphicons for the bootstrap-markdown editor Henne Vogelsang 2014-11-12 14:14:32 +01:00
  • 08a47339a4 Merge pull request #487 from differentreality/user_is_admin Stella Rouzi 2014-11-12 19:09:00 +02:00
  • 3adec92431 add user in tests, it is used for ichain testing Stella 2014-11-12 18:31:42 +02:00
  • 08c7e6a79a tests for admin attribute assignment only to 2nd user, if 1rst is the deleted user. Stella Rouzi 2014-10-07 11:20:23 +03:00
  • 57c73f9eae make user an admin only if user is the first one after the deleted user. Stella Rouzi 2014-09-12 08:47:50 +03:00
  • 0d51220a8c load seeds before tests Stella Rouzi 2014-08-30 23:16:38 +03:00
  • 2e7169ede7 Make second user admin Stella Rouzi 2014-08-30 12:12:27 +03:00
  • 4df9fa0fdb Merge pull request #525 from differentreality/subscribe Stella Rouzi 2014-11-12 16:17:09 +02:00
  • acbc67173b change to authenticate_user Stella Rouzi 2014-11-12 14:13:24 +02:00
  • 1c909e60f6 Make it possible to call :notify_errbit with mina manually Henne Vogelsang 2014-11-12 13:08:58 +01:00
  • 3be200abcc move subscribe to its own controller, add authorization, test subscribe/unsubscribe Stella 2014-10-31 22:45:15 +02:00
  • 97bf86454e Merge pull request #518 from ChrisBr/lodgings Christian Bruckmayer 2014-11-12 12:47:30 +01:00
  • 5a80adaee5 Merge pull request #539 from ChrisBr/venue Christian Bruckmayer 2014-11-12 12:47:14 +01:00
  • 343694d076 Merge pull request #524 from differentreality/remove_attachment Stella Rouzi 2014-11-12 13:45:51 +02:00
  • 7b8ce46ef1 Merge pull request #526 from differentreality/users_link Stella Rouzi 2014-11-12 13:43:13 +02:00
  • dfc7fccc07 Merge pull request #531 from differentreality/questions_fixed_answers_for_yes_no Stella Rouzi 2014-11-12 13:43:02 +02:00
  • aa37534ee1 Merge pull request #534 from differentreality/proposal_error_msg_name Stella Rouzi 2014-11-12 13:41:51 +02:00
  • 4f3684db76 Merge pull request #537 from differentreality/username_deleted_user_seeds Stella Rouzi 2014-11-12 13:41:16 +02:00
  • 12e04af21f Deploy piwik config Henne Vogelsang 2014-11-12 12:38:37 +01:00
  • cac0041819 Merge pull request #527 from differentreality/wording Stella Rouzi 2014-11-12 13:38:14 +02:00
  • ce7829e9c1 Profile Stella 2014-11-09 14:30:22 +02:00
  • aa0005ef6e not using real emails/domains in tests Stella 2014-11-01 00:22:13 +02:00
  • 2b749fb1c5 Add clarification when updating user's email Stella 2014-11-01 00:19:36 +02:00
  • 9d08f52636 Refactoring venue chrisbr 2014-11-12 12:12:57 +01:00
  • 5b78666eb8 Merge pull request #538 from hennevogel/master Henne Vogelsang 2014-11-12 12:04:36 +01:00
  • 67a672633e Merge pull request #530 from ChrisBr/devise Christian Bruckmayer 2014-11-12 12:01:25 +01:00
  • 56747fc118 Merge pull request #515 from ChrisBr/rooms Christian Bruckmayer 2014-11-12 12:01:10 +01:00
  • 580c6c6ed9 Refactoring lodgings chrisbr 2014-11-12 12:00:03 +01:00
  • 085629958e Test for ichain authentication chrisbr 2014-11-12 11:45:17 +01:00
  • 6a373b5f6c Refactoring rooms chrisbr 2014-11-12 11:37:28 +01:00
  • fbbe7d1fdd Merge pull request #503 from ChrisBr/move_sponsor_email Christian Bruckmayer 2014-11-12 11:34:36 +01:00
  • 4417536816 Merge 027fff4b57 into c0cdf3e6e5 Stella Rouzi 2014-11-12 10:27:22 +00:00
  • 9376fe57e3 Moves sponsor email attribute from conference to contact Chrisbr 2014-09-30 11:59:02 +02:00
  • c0cdf3e6e5 Merge pull request #504 from ChrisBr/menu Christian Bruckmayer 2014-11-12 11:13:16 +01:00
  • 7f1e1face5 Merge e0d39e60eb into a9581445f3 Christian Bruckmayer 2014-11-12 10:12:30 +00:00
  • ab5890b76d Merge 8fb852c1c4 into a9581445f3 Gopesh Tulsyan 2014-11-12 09:54:28 +00:00
  • 796d063eda Implements piwik tracking Henne Vogelsang 2014-11-12 10:45:44 +01:00
  • a9581445f3 Provide a helper to point to sign up/in for different configs Henne Vogelsang 2014-11-12 10:20:53 +01:00
  • 027fff4b57 add username to users created by admin Stella 2014-11-09 22:24:57 +02:00
  • 9f9193fe32 No link for user creation when ichain is enabled Stella 2014-11-09 21:00:58 +02:00
  • f08d07dc5d Style fix: single quote Stella Rouzi 2014-10-29 22:08:25 +02:00
  • 24712a0bd2 Add create method for users and corresponding controller tests. Stella Rouzi 2014-10-29 18:22:45 +02:00
  • a2c9e15236 remove leftovers from event attachment removal Stella 2014-10-31 18:33:38 +02:00
  • e3ad72268e add is_disabled attribute for deleted user Stella 2014-11-09 20:37:28 +02:00
  • e0d39e60eb Refactoring admin venue menu #304 chrisbr 2014-11-09 18:49:47 +01:00
  • 3208cc269a add username to deleted_user in seeds Stella 2014-11-09 18:01:57 +02:00
  • 2f080fb458 Fix proposal error message. Username -> name. Stella 2014-11-09 15:58:44 +02:00
  • bcde6b300c Do not require answers if it is a yes or no question. Stella 2014-11-09 14:20:36 +02:00
  • 2c98ba9711 Also destroy the ichain session for deisabled users Henne Vogelsang 2014-11-06 17:29:46 +01:00
  • 19dc918bc4 Merge pull request #529 from ChrisBr/devise Henne Vogelsang 2014-11-06 16:57:52 +01:00
  • de92298085 Implements placeholder for login forms chrisbr 2014-11-06 16:17:30 +01:00
  • 56cb805110 Adds disabled flag to user and checks it if iChain is enabled chrisbr 2014-11-06 16:17:11 +01:00
  • b95d35d5d9 It's always hard to remove another layer of indirection... Henne Vogelsang 2014-11-06 14:58:51 +01:00
  • 6ab1bddd82 Use the correct URL for the ichain login Henne Vogelsang 2014-11-06 12:51:39 +01:00
  • 164dd75712 Include disabled omniauth in ichain config for delayed jobs Henne Vogelsang 2014-11-06 11:16:54 +01:00
  • 7cf444f3bb Update rails/sprockets to fix CVE-2014-7818/CVE-2014-7819 Henne Vogelsang 2014-11-06 10:59:24 +01:00
  • c3b0dcc9d7 Set the ichain base url Henne Vogelsang 2014-11-06 10:28:19 +01:00
  • 79de791f22 Merge pull request #528 from ChrisBr/devise Christian Bruckmayer 2014-11-06 09:48:52 +01:00
  • 49d565def2 Implements iChain authentication chrisbr 2014-11-04 17:42:47 +01:00
  • 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 chrisbr 2014-11-03 15:25:33 +01:00
  • 4973effe23 Add Users link in drop down menu Stella 2014-10-31 23:00:42 +02:00
  • d12ff70d6f Merge pull request #521 from mbarringer/master Henne Vogelsang 2014-10-16 17:47:16 +02:00
  • 6bf85d64d6 I can't take credit for all of this :-) Matt Barringer 2014-10-15 18:28:58 +02:00
  • aeb23ba914 Merge pull request #517 from openSUSE/lodging-section Christian Bruckmayer 2014-10-07 09:52:22 +02:00
  • 3b63fb712f Merge pull request #516 from openSUSE/spacing-fix Christian Bruckmayer 2014-10-07 09:51:58 +02:00
  • 1534a0ba45 Describe the splash area as 'Lodging' instead of 'Lodgings'... James Mason 2014-10-06 20:55:09 -07:00
  • 92db387822 Merge pull request #513 from ChrisBr/fix_proposal_js James Mason 2014-10-06 20:44:43 -07:00
  • ce81ec306f Improve spacing around comma in conference list. James Mason 2014-10-06 20:35:10 -07:00
  • 567ce6342d Merge pull request #509 from ChrisBr/fix_to_do James Mason 2014-10-06 20:22:24 -07:00
  • 155924300a Merge pull request #508 from ChrisBr/fix_dashboard James Mason 2014-10-06 20:08:05 -07:00
  • c995f57877 Fixes the proposal abstract word count javascript functions fix #510 Chrisbr 2014-10-05 18:58:47 +02:00
  • d996d1bb0e Fixes the top bar icons of the instance dashboard fix #507 Chrisbr 2014-10-04 09:34:57 +02:00
  • b6439a7ea0 Fixes to do list link to registration period fix #505 Chrisbr 2014-10-04 09:30:56 +02:00
  • be68877f1a Implements new admin menu structure #304 Chrisbr 2014-09-30 12:57:56 +02:00
  • 9e499d2a5e Merge pull request #502 from gopesht/keynote_speakers James Mason 2014-09-24 12:55:07 -07:00
  • 67ea900dc3 Keynote Speakers implemented Gopesh Tulsyan 2014-09-15 19:02:02 +05:30
  • 5fc5aba344 Merge 8e8d049af0 into 1106f4e227 Gopesh Tulsyan 2014-09-11 13:32:03 +00:00
  • 8e8d049af0 User deletion fixes Gopesh Tulsyan 2014-09-11 19:01:48 +05:30
  • 1106f4e227 Merge pull request #500 from differentreality/typo_phrasing Stella Rouzi 2014-09-11 13:25:30 +03:00
  • 29ed4e4423 Merge pull request #499 from openSUSE/arrays_and_hashes_oh_my James Mason 2014-09-10 12:17:33 -07:00
  • ea0fcac402 rephrase closed cfp in splashpage Stella Rouzi 2014-09-10 10:30:56 +03:00
  • a3e4ab5ca0 there's no such thing as Array#to_h James Mason 2014-09-09 17:49:22 -07:00
  • c486027e6b Merge pull request #493 from differentreality/typo Artem Chernikov 2014-09-09 12:51:56 +02:00
  • e230105f2e Merge pull request #495 from differentreality/is_admin Artem Chernikov 2014-09-09 12:51:33 +02:00
  • 760bca6ff0 task to make a user an admin. Alter migration to make admins users with old role of Admin or Organizer Stella Rouzi 2014-09-04 15:53:47 +03:00
  • 46aed52c85 commercials Stella Rouzi 2014-09-03 00:18:45 +03:00
  • bb731aec00 tickets controller fix message Stella Rouzi 2014-09-02 23:28:23 +03:00
  • a5ef222378 Merge b668120883 into 9ff8becaf6 Stella Rouzi 2014-09-02 20:14:50 +00:00
  • 9ff8becaf6 Merge pull request #468 from differentreality/styling Stella Rouzi 2014-09-02 23:03:53 +03:00
  • 2d2b605063 deletions Stella Rouzi 2014-09-02 22:23:49 +03:00
  • 0b04179be9 fix quotes on tickets Stella Rouzi 2014-09-02 22:17:54 +03:00