Commit graph

  • f961822558 Remove to_s from conference.venue.name rahul 2017-09-12 17:52:01 +05:30
  • 81a4598c87 Fix error while generating pdf when venue is nil rahul 2017-09-11 23:01:28 +05:30
  • 2e92119ca7 Add missing : to booths and events_cfp rahul 2017-09-10 20:03:18 +05:30
  • 3332f5169e Add cfp type in admin/cfp#show rahul 2017-09-09 16:13:17 +05:30
  • cceb11c73a Add missing argument rahul 2017-09-12 19:35:53 +05:30
  • 00875b9949 Merge 929bfb4554 into cb20dca10a Antonios Eleftheriadis 2017-09-12 13:30:29 +00:00
  • cb20dca10a Merge pull request #1694 from Ana06/fix-sql2 Henne Vogelsang 2017-09-12 15:29:43 +02:00
  • 9f8836732d Update mariadb to 10.2 to solve Travis failures Ana María Martínez Gómez 2017-09-12 11:54:06 +02:00
  • b4d376e7be expected_string_default_error is fixed namangupta01 2017-09-05 17:40:46 +05:30
  • 929bfb4554 Fix travis dependencies AEtherC0r3 2017-09-12 08:45:02 +03:00
  • 135241a56c Merge pull request #1635 from siddhantbajaj/user-registration-ticket Ana María Martínez Gómez 2017-09-07 10:30:50 +02:00
  • 3d19073a46 production file is renamed and production.rb is added in gitignore Closes #1666 namangupta01 2017-09-06 10:59:25 +05:30
  • f618d96a03 expected_string_default_error is fixed namangupta01 2017-09-05 17:40:46 +05:30
  • 27bf79996d One user one registration ticket siddhantbajaj 2017-08-12 03:01:36 +05:30
  • 7317fc1f9f Changed views and routes used sigular resource for routes added destroy action in custom domains made instructions in 'edit/new' and 'show' visually similar added new action and view for custom domain shlok007 2017-09-03 15:56:06 +05:30
  • 30d3296a42 Merge pull request #1653 from rahul2240/tracks Ana María Martínez Gómez 2017-09-01 09:17:11 +02:00
  • 4810aa22f6 Add responsible and fix how hashes are stored nasia 2017-08-31 22:04:12 +03:00
  • e4e78e5d34 Merge 8a99a4723a into de1fa448a2 Naman Gupta 2017-08-31 17:04:31 +00:00
  • 8a99a4723a expected string default for --serializer got true error is fixed Closes #1664 namangupta01 2017-08-31 22:23:18 +05:30
  • abf2276fca Showing of tracks when there are no tracks in proposals is fixed Closes #1668 namangupta01 2017-08-31 13:43:08 +05:30
  • 88a6b2769b Remove nil hash objects nasia 2017-08-29 16:20:21 +03:00
  • fbd11a1402 Remove datatables if there is no data rahul 2017-08-28 21:55:31 +05:30
  • 7cd1635317 add to_contact and contacted tabs nasia 2017-08-29 12:04:31 +03:00
  • 9d2d1c0e5a Exclude haml-lint nasia 2017-08-28 22:10:08 +03:00
  • 819d55366c Change fields and views nasia 2017-08-28 15:24:51 +03:00
  • 30e70cc5d6 add courier info nasia 2017-08-27 23:40:32 +03:00
  • 792a7fed1c Add confirmed sponsors nasia 2017-08-27 15:42:52 +03:00
  • b770f9bd4d Add tabs to sponsor#index nasia 2017-08-27 00:25:29 +03:00
  • 4381f687b6 Swags stored correctly nasia 2017-08-26 20:41:36 +03:00
  • 2042d0eb7a Fix swag partial nasia 2017-08-25 23:42:14 +03:00
  • e55509183c move swag fields to partial nasia 2017-08-25 20:04:19 +03:00
  • 93f7e07ebe wip nasia 2017-08-25 00:43:28 +03:00
  • 4843021971 multiple swags [wip] nasia 2017-08-23 23:08:58 +03:00
  • a0e1760ef1 changes nasia 2017-08-23 12:26:46 +03:00
  • 336c1e86bd Add #show for sponsors nasia 2017-08-18 16:07:19 +03:00
  • de1fa448a2 Merge pull request #1663 from tobru/set_loglevel Ana María Martínez Gómez 2017-08-29 10:06:54 +02:00
  • 9baeaf4f73 Merge pull request #1661 from rahul2240/flash-message Ana María Martínez Gómez 2017-08-29 09:29:07 +02:00
  • f14d5926e1 explicitely set log_level for production Tobias Brunner 2017-08-29 09:06:51 +02:00
  • 5a2c87630c adapt dir permissions for openshift and add dumb-init Tobias Brunner 2017-08-28 20:02:55 +02:00
  • 89509519ef Replace flash with flash.now rahul 2017-08-28 22:31:24 +05:30
  • b7901e54d6 Fix layout for booths and tracks rahul 2017-08-28 21:44:39 +05:30
  • ac87656f46 Add hint to responsibles rahul 2017-08-26 00:12:18 +05:30
  • 6f80206f45 Add hint to responsibles rahul 2017-08-26 00:12:18 +05:30
  • 27fa79a826 Track related refactoring AEtherC0r3 2017-08-17 13:36:46 +03:00
  • 65552d0e79 Track related refactoring AEtherC0r3 2017-08-17 13:36:46 +03:00
  • 9c4892bfc8 Change room size to capacity rahul 2017-08-22 22:22:31 +05:30
  • dcaf074753 Merge branch 'master' into organization-links Shlok Srivastava 2017-08-26 09:53:25 +00:00
  • 61ddbcfe04 link to organization#new from user menu shlok007 2017-08-26 15:11:40 +05:30
  • 7eea930269 Implement track scheduling AEtherC0r3 2017-08-09 18:12:20 +03:00
  • af7efdb6fe Allow the track organizer to manage events AEtherC0r3 2017-08-09 14:53:27 +03:00
  • a87c6e55f7 Remove unnecessary ability from adminAbilities AEtherC0r3 2017-08-09 12:05:11 +03:00
  • c4eec6a3de Validate room and start_time for EventSchedule AEtherC0r3 2017-08-08 16:18:11 +03:00
  • 7067803cb9 Validate that tracks don't overlap AEtherC0r3 2017-08-08 14:18:42 +03:00
  • f371c27c3b Implement track scheduling AEtherC0r3 2017-08-09 18:12:20 +03:00
  • 590c3a91ea move revision history of users to be accessed only by site admins shlok007 2017-08-25 03:04:41 +05:30
  • 1d575087ea Change room size to capacity rahul 2017-08-22 22:22:31 +05:30
  • 3c5b579c24 Allow the track organizer to manage events AEtherC0r3 2017-08-09 14:53:27 +03:00
  • a8dde87c42 Remove unnecessary ability from adminAbilities AEtherC0r3 2017-08-09 12:05:11 +03:00
  • 4dc57d4022 Validate room and start_time for EventSchedule AEtherC0r3 2017-08-08 16:18:11 +03:00
  • 8cea6728a8 Validate that tracks don't overlap AEtherC0r3 2017-08-08 14:18:42 +03:00
  • 16f294f3e8 minor inprovements and included organizations in changelog shlok007 2017-08-23 19:53:35 +05:30
  • 68788ce9fc Show conference changelog Nishanth Vijayan 2016-08-06 17:22:53 +05:30
  • 6c0f9c7136 Merge branch 'master' into rebased_1530 Shlok Srivastava 2017-08-24 07:36:55 +00:00
  • 5985daf677 Merge pull request #1643 from rahul2240/fix-rspec Ana María Martínez Gómez 2017-08-24 08:57:40 +02:00
  • aebdd66034 Merge branch 'master' into rebased_1530 Shlok Srivastava 2017-08-23 18:58:02 +00:00
  • 2ff086ef0d minor inprovements and included organizations in changelog shlok007 2017-08-23 19:53:35 +05:30
  • 7af712f492 Made lodging cards of same height w.r.t. to its row. Fixes #1456. divyanshumehta 2017-05-10 16:24:20 +05:30
  • bc45531efd Add My Booth Requests to user menu nasia 2017-08-15 15:46:33 +03:00
  • 834e9d96e4 Add booths to admin sidebar nasia 2017-08-11 15:14:22 +03:00
  • 0494f022d2 add link to wiki section shlok007 2017-08-23 10:55:56 +05:30
  • 107c4fd407 added hint for autodetecting CNAME records shlok007 2017-08-23 03:57:12 +05:30
  • 835859e350 refactored DomainConstraint and conference_controller_spec use params id instead of OSEM_HOSTNAME to load conference shlok007 2017-08-02 20:16:50 +05:30
  • 66b48be968 controller tests for custom domain shlok007 2017-07-26 09:04:07 +05:30
  • f4775f8e6a fix access denied error for program in custom domains shlok007 2017-07-25 07:42:50 +05:30
  • 0ac5d18ef2 route to conference#show for custom domain shlok007 2017-07-22 12:34:48 +05:30
  • 3bd812728e Show conference changelog Nishanth Vijayan 2016-08-06 17:22:53 +05:30
  • e3d41bcf7d Merge branch 'master' into custom-domain Shlok Srivastava 2017-08-22 19:10:02 +00:00
  • 1a5aa14e2c Mention organization name while creating a conference shlok007 2017-08-13 02:31:46 +05:30
  • 549cc98117 Merge branch 'master' into booth_to_admin_slidebar nasia-sam 2017-08-22 19:46:41 +03:00
  • 48accd02ae Fix warning in rspec rahul 2017-08-22 21:41:13 +05:30
  • 7b923e4e01 Merge branch 'master' into org-name-in-conf Shlok Srivastava 2017-08-22 12:53:45 +00:00
  • c596a9fda7 add tests to assign and unassign organization admin role shlok007 2017-08-22 17:26:11 +05:30
  • a91c67be0a add views for organization admin role shlok007 2017-08-22 17:25:34 +05:30
  • db8fdb3d38 add permissions and actions to assign and unassign organization admin role shlok007 2017-08-22 17:24:50 +05:30
  • 67d1bfb14f Merge branch 'master' into org-name-in-conf Shlok Srivastava 2017-08-22 12:27:20 +00:00
  • 334efb3cba Merge branch 'master' into org-adimins-frontend Shlok Srivastava 2017-08-22 12:20:51 +00:00
  • 75293dcc06 Add My Booth Requests to user menu nasia 2017-08-15 15:46:33 +03:00
  • 5e3c445f5e Add booths to admin sidebar nasia 2017-08-11 15:14:22 +03:00
  • 4c1b56b54f Merge pull request #1634 from siddhantbajaj/admin-registration Ana María Martínez Gómez 2017-08-22 14:12:48 +02:00
  • 747a2e1288 Merge branch 'master' into org-name-in-conf Shlok Srivastava 2017-08-22 12:10:17 +00:00
  • 84522a999a Merge pull request #1606 from siddhantbajaj/ticket-purchase Ana María Martínez Gómez 2017-08-22 14:07:57 +02:00
  • b800878f90 add tests to assign and unassign organization admin role shlok007 2017-08-22 17:26:11 +05:30
  • 68e8cf48ae add views for organization admin role shlok007 2017-08-22 17:25:34 +05:30
  • 942a1d297a add permissions and actions to assign and unassign organization admin role shlok007 2017-08-22 17:24:50 +05:30
  • 157c270497 Registration tickets to be set for registration period siddhantbajaj 2017-08-12 01:27:16 +05:30
  • 22fc20468f Merge pull request #1638 from siddhantbajaj/add-qr Ana María Martínez Gómez 2017-08-22 10:44:45 +02:00
  • 686c0a41dc corrected tests for conference domains service shlok007 2017-08-22 12:49:37 +05:30
  • 4b735cff69 Added qr code siddhantbajaj 2017-07-27 17:25:17 +05:30
  • d0a9610992 Made Sidebar collapsible for small screens nikhilgupta1211 2017-08-20 16:27:35 +05:30
  • 6a946c469a Made Sidebar collapsible for small screens nikhilgupta1211 2017-08-20 16:27:35 +05:30