Commit graph

  • 0f697f3dbe Update awesome_nested_set James Mason 2014-06-17 10:35:16 -07:00
  • 20f31621ee Merge pull request #242 from differentreality/refactor_events_states Artem Chernikov 2014-06-19 16:25:34 +02:00
  • 0c698bac10 Merge pull request #253 from differentreality/final_openid Stella Rouzi 2014-06-19 15:53:56 +03:00
  • 8803384d2f Merge pull request #229 from differentreality/create_conf_indicator Artem Chernikov 2014-06-19 14:04:04 +02:00
  • 883d94889e styling fixes Stella Rouzi 2014-06-19 14:03:49 +03:00
  • 29953a71eb Make links partial haml not erb Stella Rouzi 2014-06-19 13:42:39 +03:00
  • 44a95d9ced houndci fixes Stella Rouzi 2014-06-18 18:59:01 +03:00
  • 0beed70d7f some houndci fixes Stella Rouzi 2014-06-18 18:05:28 +03:00
  • de58ddde50 openid fixes Stella Rouzi 2014-06-18 17:09:14 +03:00
  • 600adde6ba implement openID authentication Stella Rouzi 2014-06-18 16:58:30 +03:00
  • 37e026a9fb Merge pull request #254 from differentreality/final_schedule_routing Artem Chernikov 2014-06-19 12:50:58 +02:00
  • a1aba60966 Adds checks to splash view Gopesh Tulsyan 2014-06-18 22:25:42 +05:30
  • 43c11133e4 houndci fixes Stella Rouzi 2014-06-18 19:14:55 +03:00
  • 12e6ee380c Merge fe70bbaa5d into 39f527627b Stella Rouzi 2014-06-18 15:53:39 +00:00
  • cda2a0a1ae fix trailing space, add missing end Stella Rouzi 2014-06-17 13:34:38 +03:00
  • 9fba9eedc7 hound fixes Stella Rouzi 2014-06-13 15:38:07 +03:00
  • 37ec4ce746 fix admin schedule routing Stella Rouzi 2014-06-12 19:49:54 +03:00
  • 39f527627b Merge pull request #252 from differentreality/rubocop Artem Chernikov 2014-06-18 13:22:10 +02:00
  • d3751be558 Add rubocop to Gemfile Stella Rouzi 2014-06-17 22:50:00 +03:00
  • 16a88bd158 Merge fbe97485e9 into a2a9e739f9 James Mason 2014-06-17 17:59:59 +00:00
  • fbe97485e9 Allow Rails to serve static assets by default, in production mode... James Mason 2014-06-17 10:57:16 -07:00
  • a2a9e739f9 Merge pull request #250 from gopesht/adds_checkboxes_for_splash_components Gopesh Tulsyan 2014-06-17 23:20:14 +05:30
  • a96c9fddaa Update awesome_nested_set James Mason 2014-06-17 10:35:16 -07:00
  • ad9c0d1012 Adds splash component checkboxes to admin dashboard Gopesh Tulsyan 2014-06-17 21:20:31 +05:30
  • af7be2b295 Merge pull request #249 from gopesht/fix_tracks_alignment James Mason 2014-06-17 08:52:53 -07:00
  • 6c5e04f513 Adds migrations for checkboxes of splash components Gopesh Tulsyan 2014-06-17 20:25:35 +05:30
  • 41920d9a3a Fix program rendering partial Gopesh Tulsyan 2014-06-17 19:28:09 +05:30
  • 75333d7c60 Tracks aligned based on count Gopesh Tulsyan 2014-06-17 17:28:48 +05:30
  • 3cf41b51c2 Merge pull request #248 from openSUSE/review_140617_add_rubocop_config_to_ignore Artem Chernikov 2014-06-17 12:09:20 +02:00
  • 2dade4727c Do not add rubocop config Artem Chernikov 2014-06-17 10:50:46 +02:00
  • 47fa0952e2 States dropdown in different file Stella Rouzi 2014-06-17 10:40:57 +03:00
  • f3a4200c14 Merge pull request #245 from gopesht/add_styling_to_splash James Mason 2014-06-16 11:59:41 -07:00
  • 628f9438d9 changed if to unless in rendering css conditionally Gopesh Tulsyan 2014-06-17 00:15:39 +05:30
  • bebcc5042a Dropped Js function for styling Gopesh Tulsyan 2014-06-16 23:55:11 +05:30
  • 8aab1d3655 Added basic styling for each component Gopesh Tulsyan 2014-06-14 23:37:12 +05:30
  • ccf2d2361b Merge pull request #241 from gopesht/adds_lodgings_splash_view Gopesh Tulsyan 2014-06-16 23:23:12 +05:30
  • f9c4ff1d08 Changed description in lodgings controller and conference#edit Gopesh Tulsyan 2014-06-16 22:59:21 +05:30
  • 0b6b046016 Adds lodging splash view Gopesh Tulsyan 2014-06-14 23:37:12 +05:30
  • 01bd45a045 Adds website link to lodging Gopesh Tulsyan 2014-06-14 23:32:52 +05:30
  • feabc3b954 Adds lodging description to conference Gopesh Tulsyan 2014-06-14 22:53:20 +05:30
  • 2a742e6d0a Merge pull request #194 from gopesht/add_lodging Gopesh Tulsyan 2014-06-16 22:51:00 +05:30
  • 6e08d637be Merge pull request #186 from gopesht/location_component Gopesh Tulsyan 2014-06-16 22:11:14 +05:30
  • fb7a4031c5 Merge c75423e7ee into 7c35e39531 Gopesh Tulsyan 2014-06-16 12:32:04 +00:00
  • e494192ad2 Adds lodgings controller and view Gopesh Tulsyan 2014-06-14 21:48:43 +05:30
  • 029281a9ae Adds lodging model Gopesh Tulsyan 2014-06-14 20:41:26 +05:30
  • f0b6c32a54 Location component splash view Gopesh Tulsyan 2014-06-14 18:49:10 +05:30
  • f5c5e6a44b Adds photo to venue Gopesh Tulsyan 2014-06-14 18:33:39 +05:30
  • b94ee7e758 cleaned venue controller update method Gopesh Tulsyan 2014-06-13 22:50:46 +05:30
  • 647ab518e0 Adds missing glyphicon and chevron to admin menu Chrisbr 2014-06-16 14:11:58 +02:00
  • 7c35e39531 Merge pull request #238 from ChrisBr/instance_dashboard Christian Bruckmayer 2014-06-16 14:03:14 +02:00
  • 4abd5d2185 Implements instance dashboard Chrisbr 2014-06-16 13:51:43 +02:00
  • 61c066df87 Merge pull request #244 from ChrisBr/refactor_todo Christian Bruckmayer 2014-06-16 13:06:19 +02:00
  • 8f4b1a921f Refactoring conference step by step list Chrisbr 2014-06-16 12:05:53 +02:00
  • 7a00219346 change paths after refactoring of event states Stella Rouzi 2014-06-15 12:12:46 +03:00
  • c75423e7ee cleaned venue controller update method Gopesh Tulsyan 2014-06-13 22:50:46 +05:30
  • 24ac1778a5 Merge pull request #235 from differentreality/conference_show Stella Rouzi 2014-06-13 16:57:38 +03:00
  • e86b71f1d5 change test for render instead of redirect Stella Rouzi 2014-06-13 16:27:51 +03:00
  • 16abe63418 Merge pull request #237 from differentreality/registrations_exports Stella Rouzi 2014-06-13 15:09:55 +03:00
  • 9e250cba75 Merge pull request #224 from ChrisBr/add_color_to_event_type Christian Bruckmayer 2014-06-13 12:50:01 +02:00
  • bf4758a54a Adds color to event types Chrisbr 2014-06-12 16:24:24 +02:00
  • e34a972b74 Merge pull request #236 from gopesht/fix_conference_show_spec Henne Vogelsang 2014-06-13 11:58:27 +02:00
  • 6763f57a68 Merge pull request #230 from differentreality/cfp_weeks Stella Rouzi 2014-06-13 12:40:18 +03:00
  • dba8c9f569 fix filenames for export to pdf/xls Stella Rouzi 2014-06-13 12:12:17 +03:00
  • 668fe5f196 Add message when schedule is not ready Stella Rouzi 2014-06-12 22:14:49 +03:00
  • 9c0af1faf0 Move conference description in conference show, instead of program partial. Stella Rouzi 2014-06-12 22:13:12 +03:00
  • dab9e1da51 show cfp partial only if @conference.call_for_papers is not nil Stella Rouzi 2014-06-12 22:07:30 +03:00
  • 93d7cdf840 Change wording and use unless instead of if Stella Rouzi 2014-06-12 22:05:47 +03:00
  • b4db97cbb7 event[0].subtitle.blank? instead of .empty? because .blank? for nil is true but .empty? for nil is undefined method Stella Rouzi 2014-06-12 22:04:41 +03:00
  • d1d4ed4b75 Fixed conference view spec, mismatched end Gopesh Tulsyan 2014-06-13 02:43:58 +05:30
  • 9b7925de6b Merge pull request #233 from gopesht/add_social_to_splash James Mason 2014-06-12 14:00:49 -07:00
  • 94b0dae1cc Adds social media to splash Gopesh Tulsyan 2014-06-13 02:02:27 +05:30
  • 3b6fec9cfb Merge pull request #226 from gopesht/fix_social_media James Mason 2014-06-12 13:41:00 -07:00
  • 8c285cc3fc Merge pull request #214 from gopesht/adds_sponsors_to_splash James Mason 2014-06-12 13:38:20 -07:00
  • b67b21f023 Adds sponsors to splash Gopesh Tulsyan 2014-06-13 00:49:48 +05:30
  • 2c27119e8e Added sponsor description and email to conference Gopesh Tulsyan 2014-06-13 00:44:21 +05:30
  • f8ba5db48e Merge pull request #227 from gopesht/social_segment James Mason 2014-06-12 12:29:33 -07:00
  • 6d2576421b Add social url to conference Gopesh Tulsyan 2014-06-13 00:20:18 +05:30
  • 4e7dd5a8a7 Merge pull request #204 from gopesht/adds_sponsors James Mason 2014-06-12 11:46:37 -07:00
  • 72a077e260 remove readonly option for start_date and end_date of conference so that the on-screen indication of missing fields will work Stella Rouzi 2014-06-12 21:16:08 +03:00
  • 960f271379 change start_week.year to start_date.year Stella Rouzi 2014-06-12 21:07:07 +03:00
  • 67dab025a9 Sponsors dashboard Gopesh Tulsyan 2014-06-05 20:05:20 +05:30
  • e38a654af1 Adds sponsor model Gopesh Tulsyan 2014-06-05 17:51:22 +05:30
  • 411deb4c65 Merge pull request #200 from gopesht/add_sponsorship_levels James Mason 2014-06-12 11:02:35 -07:00
  • 6193b623e6 Fixed description for social media Gopesh Tulsyan 2014-06-12 23:29:34 +05:30
  • ee655e09e8 Merge pull request #202 from gopesht/check_cfp James Mason 2014-06-12 10:14:06 -07:00
  • 005bead45f Check for cfp object before rendering partial Gopesh Tulsyan 2014-06-05 13:50:05 +05:30
  • 3a69fd3117 Merge 59d1e2c723 into 17427c88fe Gopesh Tulsyan 2014-06-12 05:57:29 +00:00
  • 78d5bd670d Merge c1063645da into 17427c88fe Gopesh Tulsyan 2014-06-11 10:34:56 +00:00
  • 6903a0b7c1 Merge 760dd06d31 into 17427c88fe Gopesh Tulsyan 2014-06-11 10:18:52 +00:00
  • 17427c88fe Merge pull request #221 from ChrisBr/bugfix_event Christian Bruckmayer 2014-06-11 11:54:58 +02:00
  • 0b9b11cd44 Merge pull request #223 from ChrisBr/distribution_dashboard Christian Bruckmayer 2014-06-11 11:53:38 +02:00
  • b25ae50908 Implements user and event state distribution Chrisbr 2014-06-11 09:31:13 +02:00
  • 760dd06d31 Adds carousel to splash view Gopesh Tulsyan 2014-06-11 00:03:48 +05:30
  • 611c8b6e49 Bugfix events controller Chrisbr 2014-06-10 14:39:49 +02:00
  • b10b43ac7a Added carousel component to take photos in Conference#edit Gopesh Tulsyan 2014-06-10 17:47:46 +05:30
  • d9818f2749 Added carousel model Gopesh Tulsyan 2014-06-10 12:43:15 +05:30
  • 89f76fd6b5 Merge 3dfa5069f9 into 069cc0eb4c Gopesh Tulsyan 2014-06-09 16:08:31 +00:00
  • 3dfa5069f9 Remove parent container class from splash content vis js Gopesh Tulsyan 2014-06-09 21:37:09 +05:30
  • fe70bbaa5d schedule route Stella Rouzi 2014-06-08 11:49:17 +03:00
  • c1063645da Added lodging to splash view Gopesh Tulsyan 2014-06-07 00:30:19 +05:30