Commit graph

  • 535da1769d Merge pull request #55 from ChrisBr/fix_validation_for_deprecated_events Henne Vogelsang 2014-03-31 11:26:53 +02:00
  • dd93d0ad48 fix unless statement Stella 2014-03-30 13:28:42 +03:00
  • cd4107bf0d Adds allow_nil for media_type validation for backward compatibility Christian Bruckmayer 2014-03-30 11:17:00 +02:00
  • 55cc1ec090 migrations to integrate answers from attributes into questions Stella 2014-03-08 18:37:41 +02:00
  • f84f5e1c45 Merge 596797d7eb into 628211f0fc Stella Rouzi 2014-03-29 07:35:00 +00:00
  • 596797d7eb media_type not nil Stella 2014-03-29 09:27:59 +02:00
  • f4b6ff56c6 fixed supporter page redirect after creation Gopesh Tulsyan 2014-03-28 00:11:08 +05:30
  • d38a1334ad Haml syntax modified Gopesh Tulsyan 2014-03-28 00:00:21 +05:30
  • 481fcc9f60 Admin able to delete users except admins Gopesh Tulsyan 2014-03-27 20:14:52 +05:30
  • 628211f0fc Merge pull request #50 from differentreality/logo_missing Henne Vogelsang 2014-03-27 14:21:02 +01:00
  • 997df20ed0 Check for existence of the CFP before showing ratings Henne Vogelsang 2014-03-27 14:16:51 +01:00
  • 26a54a0f79 Remove this migration, additional_speakers neaver existed Henne Vogelsang 2014-03-27 14:13:22 +01:00
  • d85106f1e3 Merge pull request #49 from ChrisBr/fix_mixed_content_issue Henne Vogelsang 2014-03-27 14:19:11 +01:00
  • 109312fc51 Merged master from upstream, local changes Gopesh Tulsyan 2014-03-26 22:15:48 +05:30
  • a0afd0f6a3 Merge branch 'fix_supporter_page_issues' Gopesh Tulsyan 2014-03-26 19:18:12 +05:30
  • 1c8961fa75 Fix mixed content issue Christian Bruckmayer 2014-03-25 23:09:40 +01:00
  • ecc516b802 avoid missing image icon Stella 2014-03-25 11:30:17 +02:00
  • 9d72775c29 Use user_registration_path instead of hardcoded /accounts for deployments into sub-directories... Henne Vogelsang 2014-03-24 13:22:41 +01:00
  • 18968a05b1 * Update devise to latest version * use letter_opener for mails in development * bring back the flash * fix redirect loop for logging in * move all mailer/devise settings to config/config.yml Henne Vogelsang 2014-03-24 12:45:04 +01:00
  • 7920c3df65 Merge pull request #46 from ChrisBr/implement_more_embed_code Henne Vogelsang 2014-03-24 12:30:26 +01:00
  • cbb4b40bc0 Implement more embed code Supported Media Files: - Youtube - Vimeo - Instagram - Flickr - Slidershare - Speakerdeck Christian Bruckmayer 2014-03-19 17:22:48 +01:00
  • d414cfab98 Fixed incorrect variable in the supporter table and removed remote true Gopesh Tulsyan 2014-03-20 10:06:09 +05:30
  • 3af9bad30e Merge Christian Bruckmayer 2014-03-18 21:30:12 +01:00
  • 912478fde9 Removed comments from routes Gopesh Tulsyan 2014-03-17 21:13:03 +05:30
  • 587126218d Update gems, use d3 gem, initial bootstrap v3 port Henne Vogelsang 2014-03-17 16:36:32 +01:00
  • 24e40a5c90 Merge pull request #41 from differentreality/stats_update Henne Vogelsang 2014-03-17 16:36:03 +01:00
  • 1421241df5 Merge 521d2dc72f into b64cc9f7e4 Gopesh Tulsyan 2014-03-17 15:35:34 +00:00
  • b64cc9f7e4 Merge pull request #38 from differentreality/supporters_title_error Henne Vogelsang 2014-03-17 16:35:29 +01:00
  • 0f8cdf2b23 Merge pull request #37 from differentreality/questions_scrolling Henne Vogelsang 2014-03-17 16:35:15 +01:00
  • 89cf40c2e2 Merge pull request #36 from differentreality/fix_rating_text Henne Vogelsang 2014-03-17 16:34:47 +01:00
  • 120b812a53 Merge pull request #35 from differentreality/fix_conference_registration_after_questions Henne Vogelsang 2014-03-17 16:34:30 +01:00
  • 521d2dc72f Unnecessary migration and invalid syntax in migraton Gopesh Tulsyan 2014-03-17 17:41:31 +05:30
  • cbf27c6711 Merge c5ba8598f5 into 257226273b Christian Bruckmayer 2014-03-16 14:03:34 +00:00
  • c5ba8598f5 Add Instagram support for events #26 Christian Bruckmayer 2014-03-16 15:03:28 +01:00
  • 8421884c06 Add Speakerdeck video support for events #26 Christian Bruckmayer 2014-03-16 13:02:30 +01:00
  • c0af0a2897 Add vimeo video support for events #26 Christian Bruckmayer 2014-03-16 12:05:44 +01:00
  • 0bbace4667 Add else statement in show view to enable backward compatibility #26 Christian Bruckmayer 2014-03-16 11:45:53 +01:00
  • 3f863011cc Implements flickr embedded for events #26 Christian Bruckmayer 2014-03-15 22:14:50 +01:00
  • 03ba8d50f4 Implements more embed codes for events - refactor video_type collection to event model enumeration #26 Christian Bruckmayer 2014-03-15 21:48:47 +01:00
  • 2421eaf4ea Implements more embed codes for events - add slideshare embed code Christian Bruckmayer 2014-03-15 20:21:01 +01:00
  • 91dc475eb2 Merge 697fc08e18 into 257226273b gopesht 2014-03-13 21:12:13 +00:00
  • 697fc08e18 Fixed forgot password, no redirect loop know while resetting forgotten password Gopesh Tulsyan 2014-03-14 01:55:47 +05:30
  • 2ccd37a7af Add request.ssl check in proposal view to fix mixed content issue for embedded youtube video close #1 Christian Bruckmayer 2014-03-10 18:40:32 +01:00
  • 2e1dcd33fe Move events stats in Statistics, add ticket distribution Stella 2014-03-09 16:16:22 +02:00
  • ad544a117f Admin able to delete every other user except admins(feature) Gopesh Tulsyan 2014-03-09 11:58:57 +05:30
  • e51cf148d2 Check for call_for_papers object. gopesht 2014-03-09 02:33:49 +05:30
  • 157b94c94e show title of supporter level only if level exists Stella 2014-03-06 18:08:00 +02:00
  • 299a882277 Fix view of questions in Registrations Stella 2014-03-06 17:31:58 +02:00
  • 257226273b Add default to :conferences use_vpositions/use_vdays Henne Vogelsang 2014-03-05 11:37:58 +01:00
  • be970ba6c0 Get rid of the languages before_save function. It's too shaky Henne Vogelsang 2014-03-05 11:09:40 +01:00
  • 1b9479cb32 Ran migrations Henne Vogelsang 2014-03-05 11:05:40 +01:00
  • fdd0195232 erase word rating, no bold Stella 2014-03-04 23:35:34 +02:00
  • 8f8824ecd6 fix registration page, only show volunteering tab if option is enabled for the conference Stella 2014-03-04 22:22:52 +02:00
  • 04e06ac251 Remove question fields from speaker statistics Henne Vogelsang 2014-03-04 10:41:38 +01:00
  • 5b05ffbd56 Rename the volunteers to match the other config routes Henne Vogelsang 2014-03-04 10:30:23 +01:00
  • 97eae285c5 Get rid of the error page after sign up Henne Vogelsang 2014-03-04 10:18:07 +01:00
  • 3d9bef366c Only upcase languages if they exist... Henne Vogelsang 2014-03-04 10:15:40 +01:00
  • 0982be8579 Simplify sidebar and navigation Check existence of supporter levels Henne Vogelsang 2014-03-04 10:10:07 +01:00
  • 59933115fc Fix merge leftovers Henne Vogelsang 2014-03-03 11:04:47 +01:00
  • 14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers Henne Vogelsang 2014-03-03 10:52:24 +01:00
  • 243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions Henne Vogelsang 2014-03-03 10:43:38 +01:00
  • 4ed72d4967 Merge pull request #33 from differentreality/final_difficulty_levels Henne Vogelsang 2014-03-03 10:40:21 +01:00
  • 4092c68ea4 Merge pull request #34 from differentreality/final_voting_visual Henne Vogelsang 2014-03-03 10:40:03 +01:00
  • 68c119b443 fixed table width, no td in index if no voting options Stella 2014-03-02 10:36:22 +02:00
  • 5b35e25ecd Add difficulty levels Stella 2014-02-23 16:09:09 +02:00
  • 0dbd513c8a Add no of voters in events index Stella 2014-02-23 15:03:21 +02:00
  • 52543589e4 voting visual changes Stella 2014-02-23 14:56:09 +02:00
  • 01dc5a2757 Merge f36eeb6469 into 4356616566 Stella Rouzi 2014-02-13 15:32:33 +02:00
  • f36eeb6469 fix removal of answers Stella Rouzi (differentreality) 2014-02-13 15:29:52 +02:00
  • 3105c8da5d question builder Stella 2014-02-09 18:05:57 +02:00
  • 114ef8755c Merge 64b2b8b3f8 into 4356616566 Stella Rouzi 2014-02-04 17:40:09 -08:00
  • 4356616566 Merge pull request #29 from differentreality/voting_fixes Henne Vogelsang 2014-01-23 03:25:28 -08:00
  • 9d09d6d038 Merge pull request #28 from differentreality/event_registration Henne Vogelsang 2014-01-23 03:25:04 -08:00
  • 64b2b8b3f8 Volunteers, positions and days and volunteers list for admin, volunteering option for attendees Stella 2014-01-01 11:39:59 +02:00
  • 8ca2e53430 show voting options only if rating is enabled (>0) Stella 2013-12-28 16:20:00 +02:00
  • 28b8b58030 migration, add down func Stella 2013-12-28 15:51:37 +02:00
  • de1ed9be2b Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems. Stella 2013-12-28 15:29:50 +02:00
  • 125d5fe3ff Update README.md Henne Vogelsang 2013-10-30 17:55:29 +01:00
  • 0e1a6b9771 Show the supporter_level title, not the class Henne Vogelsang 2013-10-22 15:56:44 +02:00
  • 8aeeabebab Updated the gems, add missing migration for the stats controller, fix most obvious issues with stats Henne Vogelsang 2013-10-22 15:52:29 +02:00
  • 52d1785a7c Fix managing user roles Henne Vogelsang 2013-10-22 14:16:20 +02:00
  • b4a3baea1c Release osem under MIT. Fixes #57 Henne Vogelsang 2013-10-18 15:33:59 +02:00
  • 5c719afbdf Merge pull request #55 from differentreality/stats_charts Henne Vogelsang 2013-09-26 08:38:44 -07:00
  • 13782d8f25 add d3 lib differentreality 2013-09-18 12:22:17 +03:00
  • 87551e88f8 Create charts for registrations differentreality 2013-09-17 15:21:45 +03:00
  • 9cf5c59f28 final registrations stats differentreality 2013-09-09 20:05:51 +03:00
  • c26a0a0bc9 Merge pull request #39 from differentreality/events_stats Henne Vogelsang 2013-09-04 04:00:29 -07:00
  • 29d048ee7d Add length along with type title to differentiate between types with same name and different length differentreality 2013-09-01 21:05:40 +03:00
  • d603d0830f fix events stats table differentreality 2013-08-27 12:38:57 +03:00
  • 406b7dcd2d Merge pull request #42 from differentreality/proposal_event_types Henne Vogelsang 2013-09-04 02:19:18 -07:00
  • 0d6d5d6a31 Merge pull request #38 from differentreality/redirection Henne Vogelsang 2013-09-03 02:46:41 -07:00
  • 6c050ccbc2 Merge pull request #41 from differentreality/stats_fix Henne Vogelsang 2013-09-03 02:42:05 -07:00
  • 0c2fa49b65 Merge pull request #37 from differentreality/events_voting Henne Vogelsang 2013-09-03 02:40:05 -07:00
  • e6b7fbceb5 fix differentreality 2013-09-02 16:38:43 +03:00
  • a0dc62b125 Changes based on comments differentreality 2013-09-02 16:15:02 +03:00
  • aaa77bb893 allow stars from 1 to 10, 1 star being the default differentreality 2013-09-02 15:58:09 +03:00
  • 9125bafe4a Show length of event types in new proposal drop down differentreality 2013-09-01 18:19:25 +03:00
  • 9c35395350 redirect to requested page after login differentreality 2013-08-25 13:40:44 +03:00
  • e3828c0a74 wording differentreality 2013-08-16 15:39:00 +03:00
  • 1d59c05591 fix rebase conflict differentreality 2013-08-16 16:11:21 +03:00