Commit graph

  • 327db11a8a Changing id tags for nav form Gopesh Tulsyan 2015-01-15 11:12:57 +05:30
  • fc450b98ae Refactor Admin Email Settings Form Gopesh Tulsyan 2015-01-15 11:09:08 +05:30
  • 10001c5383 put translation javascript code in separate file Stella Rouzi 2014-12-26 12:19:56 +02:00
  • 03d42c2afc Fix tracking code and feature rows Henne Vogelsang 2014-12-19 14:20:22 +01:00
  • 414c98bd9d Merge 06bda7a7db into bca62e6204 Stella Rouzi 2014-12-19 11:19:12 +00:00
  • 06bda7a7db add style in osem.css Stella 2014-12-19 13:11:11 +02:00
  • 8d3c6568b5 fix users list actions Stella Rouzi 2014-12-13 21:59:19 +02:00
  • bca62e6204 Merge pull request #564 from differentreality/speakers Stella Rouzi 2014-12-19 10:49:48 +02:00
  • cc80fb10cb Merge pull request #567 from openSUSE/348 Christian Bruckmayer 2014-12-18 15:00:18 +01:00
  • 799fd0c3a4 Adds dependent restricted association to some models fix #348 chrisbr 2014-12-18 13:38:40 +01:00
  • 01c57d0b53 Merge pull request #570 from ChrisBr/email_variables Christian Bruckmayer 2014-12-18 12:53:44 +01:00
  • 5d2d728c9e Merge pull request #572 from ChrisBr/tickets Christian Bruckmayer 2014-12-18 12:53:37 +01:00
  • e1c3bce4a7 Allow signed in users to index tickets. Fixes #571 Henne Vogelsang 2014-12-18 11:42:42 +01:00
  • 75b5594302 Disable transifex for now. It's Issue #573 now Henne Vogelsang 2014-12-17 17:09:06 +01:00
  • 0ea8228aa2 Fix ticket total price on each row chrisbr 2014-12-17 16:56:31 +01:00
  • a629852f91 Fix email variables (close #569) chrisbr 2014-12-17 14:28:31 +01:00
  • f7e73d2c0d Add piwik tracking code Henne Vogelsang 2014-12-17 14:10:40 +01:00
  • 8877fd1259 Mobile layout fixes * load screenshots when the modal is openend, not before * Abbreviate some strings Henne Vogelsang 2014-12-17 14:05:35 +01:00
  • 087803ed20 Only show post excerpts in the feed Henne Vogelsang 2014-12-17 12:21:02 +01:00
  • 11dc3fd64a First blog post Henne Vogelsang 2014-12-17 00:10:18 +01:00
  • f9662407e3 Implements a blog Henne Vogelsang 2014-12-16 17:20:19 +01:00
  • 87b1aba1e9 Add conference description to the index view Henne Vogelsang 2014-12-16 15:07:57 +01:00
  • 97bbd6adb6 Fix email_settings cfp call Henne Vogelsang 2014-12-16 11:26:03 +01:00
  • 993bd5ad3c Don't use posts for the feature modals, we want to blog Henne Vogelsang 2014-12-15 14:46:48 +01:00
  • dab0d9db16 Merge pull request #556 from differentreality/abilities Stella Rouzi 2014-12-11 20:49:18 +02:00
  • 60956f6158 A couple of small design fixes Henne Vogelsang 2014-12-11 17:20:13 +01:00
  • d7873c9e6c do not index users unless organizer or admin Stella Rouzi 2014-12-11 13:15:37 +02:00
  • d41988c74f Fix authorization Stella 2014-11-30 14:47:46 +02:00
  • 33bbbc9566 Merge pull request #565 from differentreality/registration Stella Rouzi 2014-12-11 12:51:33 +02:00
  • ba5731cc18 typo in pluralization Stella Rouzi 2014-12-11 10:31:30 +02:00
  • 0033567a5c Remove link to change speaker. Stella Rouzi 2014-12-11 09:48:54 +02:00
  • eb817569a5 Only show confirmed speakers on registrations Henne Vogelsang 2014-12-10 15:31:21 +01:00
  • dd5c2fbe3e Only show confirmed speakers on registrations Henne Vogelsang 2014-12-10 15:31:21 +01:00
  • b65a33f047 Merge pull request #560 from hennevogel/feature-user-view Henne Vogelsang 2014-12-09 15:52:44 +01:00
  • c6bd65deaa Fix Stellas review gripes Henne Vogelsang 2014-12-09 15:19:01 +01:00
  • 9a6bfea500 Merge 8b45c2a281 into e9456be31a Stella Rouzi 2014-12-08 16:11:00 +00:00
  • 8b45c2a281 remove keynotes Stella Rouzi 2014-12-08 16:28:09 +02:00
  • c9615f1880 Revert "add is_keynote attribute to event_types" Stella Rouzi 2014-12-08 16:11:38 +02:00
  • c787190571 add is_keynote attribute to event_types Stella 2014-12-07 16:52:10 +02:00
  • a8b0c28cee do not allow creation of proposal with keynote type Stella 2014-11-30 12:47:22 +02:00
  • 0296f80076 add include_cfp to splashpage, remove old column, migrate data Stella Rouzi 2014-11-28 14:51:48 +02:00
  • 8ac11821fa keynote type available only to admins. Able to mark as highlight. Highlights and Keynotes scoped. Stella Rouzi 2014-11-28 14:47:39 +02:00
  • 6a62e9f8b9 add event_type keynote Stella Rouzi 2014-11-27 21:33:13 +02:00
  • 88f73bb6fc Splaspage: Add highlights. Fix cfp inclusion. Stella Rouzi 2014-11-27 20:40:26 +02:00
  • 0768514d89 Revert "do not allow creation of proposal with keynote type" Stella Rouzi 2014-12-05 09:13:06 +02:00
  • 2a45f49a05 show Keynote type in new proposal Stella Rouzi 2014-12-05 09:13:01 +02:00
  • b50badc9c7 wording Stella Rouzi 2014-12-04 14:27:17 +02:00
  • d44d5bd378 do not allow creation of proposal with keynote type Stella 2014-11-30 12:47:22 +02:00
  • bd570ecb3c add include_cfp to splashpage, remove old column, migrate data Stella Rouzi 2014-11-28 14:51:48 +02:00
  • 2f6fccb912 keynote type available only to admins. Able to mark as highlight. Highlights and Keynotes scoped. Stella Rouzi 2014-11-28 14:47:39 +02:00
  • 5d444143ea fix count in spec Stella Rouzi 2014-11-27 21:59:41 +02:00
  • 2511a7dd51 add event_type keynote Stella Rouzi 2014-11-27 21:33:13 +02:00
  • ed8a71e554 Splaspage: Add highlights. Fix cfp inclusion. Stella Rouzi 2014-11-27 20:40:26 +02:00
  • 9722dc1c92 Forgot James, shame on me :-( Henne Vogelsang 2014-12-08 12:00:48 +01:00
  • e2d454a317 Adapt site config Henne Vogelsang 2014-12-08 11:54:59 +01:00
  • 720e316057 Force a site build Henne Vogelsang 2014-12-08 11:51:48 +01:00
  • a67e150ffb Use a custom domain Henne Vogelsang 2014-12-08 11:13:34 +01:00
  • b676c627d5 And relative urls for the images in the css Henne Vogelsang 2014-12-05 17:13:15 +01:00
  • 903d31c7d5 Set the baseurl for now Henne Vogelsang 2014-12-05 17:11:23 +01:00
  • 838774e06d Initial page based on Agency by http://startbootstrap.com Henne Vogelsang 2014-12-05 17:08:43 +01:00
  • e9456be31a Merge pull request #554 from differentreality/cfp_dates Henne Vogelsang 2014-12-05 16:25:10 +01:00
  • f91de69ede Merge pull request #558 from differentreality/confirmations Henne Vogelsang 2014-12-05 16:24:19 +01:00
  • a52918c273 Merge pull request #555 from differentreality/mock_credentials Henne Vogelsang 2014-12-05 16:24:10 +01:00
  • d13efa5f52 Various small fixes for the participant UI Henne Vogelsang 2014-12-05 16:04:34 +01:00
  • 01f2fae396 Merge pull request #559 from differentreality/attachments Stella Rouzi 2014-12-04 14:05:31 +02:00
  • 6d0f3021ca rubocop styling Stella Rouzi 2014-12-01 14:40:26 +02:00
  • 31df114ce4 sign in user after confirmation Stella 2014-11-30 20:06:12 +02:00
  • 343bdec617 Merge pull request #557 from differentreality/wording_styling Stella Rouzi 2014-12-01 14:07:40 +02:00
  • a7be4bc88e remove event_attachments table Stella 2014-11-30 20:32:56 +02:00
  • 99d50ea91e campaign spec Stella 2014-11-30 18:34:39 +02:00
  • 2c768a358a validate track name, render instead of redirect for campaigns, fix view for new sponsor Stella 2014-11-30 17:50:23 +02:00
  • 5fb7e5cbef an error spec Stella 2014-11-30 17:11:55 +02:00
  • d44e1f7c24 flash alert to flash error Stella 2014-11-30 15:41:47 +02:00
  • 65c0cd7a73 an error Stella 2014-11-30 15:19:19 +02:00
  • 0a58301b66 add username for mock credentials of openid in development Stella 2014-11-30 00:08:56 +02:00
  • 6e026746a9 validate cfp start_date before end_date and end_date before conference.end_date Stella 2014-11-29 20:00:26 +02:00
  • b6abe96279 Various ability fixes and clarifications for guests/users Henne Vogelsang 2014-11-27 15:15:34 +01:00
  • 9c968ad3e2 Create some DifficultyLevels by default Henne Vogelsang 2014-11-27 15:05:44 +01:00
  • fe35f1d788 Help with date selection in the datepickers Henne Vogelsang 2014-11-27 15:04:39 +01:00
  • 60bb00b88e Fix glyphicons, suse-icon and remove unused fonts Henne Vogelsang 2014-11-27 14:47:00 +01:00
  • ce6ed0a8e9 Get rid of the schedule controller Henne Vogelsang 2014-11-27 14:31:44 +01:00
  • ebb7d8da2c We don't use the JqueryUI timepicker anymore Henne Vogelsang 2014-11-27 14:00:52 +01:00
  • c84ebf26e0 Better scroll handling for the venue map Henne Vogelsang 2014-11-27 14:00:03 +01:00
  • 1edb4bff9e Merge pull request #548 from hennevogel/feature-admin-view Henne Vogelsang 2014-11-26 14:56:32 +01:00
  • 28063129c7 Implement consistent admin interface * Consistent route/model/controller/view layout * Get rid of unused photos, speakers, dietchoices, social_events controllers * Drop unused :public from Rooms and :description from CallForPapers Henne Vogelsang 2014-11-25 10:47:18 +01:00
  • 0e7faf7df8 Merge pull request #547 from ChrisBr/fix_cve Christian Bruckmayer 2014-11-24 11:26:00 +01:00
  • d08d05416f Fixes CVE-2014-7819 chrisbr 2014-11-21 17:22:14 +01:00
  • acc28d22ae Fixes CVE-2014-7829 chrisbr 2014-11-21 17:10:37 +01:00
  • f6a87331be Merge pull request #546 from hennevogel/feature-conference-view Henne Vogelsang 2014-11-21 13:49:54 +01:00
  • 567d8689b8 Make sure an empty splash works Henne Vogelsang 2014-11-21 13:22:20 +01:00
  • b6b0c104fd Mobile fixes for the splash Henne Vogelsang 2014-11-20 16:52:55 +01:00
  • cb227a0afc Another round of splash design * Add map to splash * Reverse venue<->conference relation * Split venue address into fields * Don't go through venue for lodgings anymore Henne Vogelsang 2014-11-20 14:57:03 +01:00
  • 30e8ab856c Get rid of the splashpage banner photo and "descriptions" Henne Vogelsang 2014-11-18 00:58:43 +01:00
  • 60ba81ab46 Merge pull request #543 from hennevogel/feature-conference-view Henne Vogelsang 2014-11-17 14:20:44 +01:00
  • f2cdea4f1a 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
  • 7acd16f923 We need glyphicons for the bootstrap-markdown editor Henne Vogelsang 2014-11-12 14:14:32 +01:00
  • f21c85ad4b Merge pull request #542 from hennevogel/feature-splash Henne Vogelsang 2014-11-17 13:55:24 +01:00
  • a620132f7f Merge pull request #501 from differentreality/translation_live Stella Rouzi 2014-11-14 20:48:27 +02:00
  • e65ca7fb58 Get rid of the home controller Henne Vogelsang 2014-11-14 17:24:24 +01:00
  • 7b6029224b Merge f0b19eddb3 into a41f76cca1 Henne Vogelsang 2014-11-14 13:23:04 +00:00