Commit graph

  • c552d08b8e Merge pull request #1233 from Ana06/error_schedule Christian Bruckmayer 2016-12-21 17:34:22 +01:00
  • cc4930c120 Avoid a Javascript error when @tag is null Ana María Martínez Gómez 2016-12-21 10:55:56 +01:00
  • f8f109598c Update 500 error page with custom information Matthew 2016-12-20 16:05:55 -06:00
  • 950e4edec1 Add 403 error page Matthew 2016-12-20 15:58:39 -06:00
  • 83c3c72e80 Correct indentation inconsistency in 404.html Matthew 2016-12-20 15:52:41 -06:00
  • 1ebab6f415 Update 404 page for user friendliness Matthew 2016-12-20 15:33:33 -06:00
  • 95ab2ec3d4 Add osem-logo.png to /public/img directory Matthew 2016-12-20 14:52:54 -06:00
  • 22a3f614a3 Merge pull request #1231 from ChrisBr/open-graph Christian Bruckmayer 2016-12-20 16:05:11 +01:00
  • e0d5b461b3
    rubocop: annotate exceptions Rishabh Saxena 2016-11-20 14:21:01 +05:30
  • b1826a1abc
    rubocop: ignore conference class length warning Rishabh Saxena 2016-09-04 10:23:25 +05:30
  • b9b7a4d97d
    remove tickets testing ambiguity Rishabh Saxena 2016-09-03 17:26:42 +05:30
  • fe828d24db
    conference: refactor code and tests Rishabh Saxena 2016-08-29 19:49:25 +05:30
  • 53291e25b5
    automatically create free ticket with new conf Rishabh Saxena 2016-08-27 20:38:31 +05:30
  • a6f7516eae
    controller/ticket_purchase: rubocop fix Rishabh Saxena 2016-08-22 13:09:02 +05:30
  • b36d4e98e2
    ticket_purchase_controller: free ticket routing Rishabh Saxena 2016-08-19 00:51:49 +05:30
  • b28be23284
    spec/ticket: add tests for purchasing free tickets Rishabh Saxena 2016-08-18 23:23:38 +05:30
  • b2f75dd907
    spec/tickets: add tests for free ticket creation Rishabh Saxena 2016-08-18 23:22:46 +05:30
  • 4dcfc55418
    add ability to create and purchase free tickets Rishabh Saxena 2016-08-02 01:37:55 +05:30
  • 06ce06bfb3
    Add Open Graph metadata to conference#show Sherri Mitchell 2016-09-04 21:50:32 -04:00
  • ee91e72440
    Add Open Graph metadata to event#show Sherri Mitchell 2016-09-08 14:34:27 -04:00
  • c4938166f5 Merge pull request #1228 from Ana06/fix_multichoice Christian Bruckmayer 2016-12-19 17:40:38 +01:00
  • 201fac7088 Merge pull request #1186 from sherrimitchell/event-page-comments Christian Bruckmayer 2016-12-19 17:24:30 +01:00
  • bb0639df14 Merge pull request #1175 from shlok007/replace-quiet-assets Christian Bruckmayer 2016-12-19 17:14:04 +01:00
  • 9a151b60fc Merge pull request #1152 from ghost/master Christian Bruckmayer 2016-12-19 17:11:04 +01:00
  • 50410f6e4f Fix multiple choice questions Ana María Martínez Gómez 2016-12-15 11:50:23 +01:00
  • 9221f92b19 Use link_to_user instead of explicit link Nishanth Vijayan 2016-09-28 03:28:47 +05:30
  • ac420ab3a4 Handle versions where conference_id is not set Nishanth Vijayan 2016-08-16 15:15:01 +05:30
  • 3a3d01150a Allow other roles to view revision_history only with the versions they have access Nishanth Vijayan 2016-08-17 05:05:46 +05:30
  • 51d569794f Add conference specifc route to revision history page Nishanth Vijayan 2016-08-15 16:42:12 +05:30
  • 5965bcf193 Stop checking for non-existing conference_id in versions controller Nishanth Vijayan 2016-08-15 15:44:20 +05:30
  • 58a3913735 Use load_and_authorize_resource in versions controlller Nishanth Vijayan 2016-08-15 14:21:33 +05:30
  • 71c8dd4127 Add controller tests for admin::versions#index Nishanth Vijayan 2016-08-06 18:48:36 +05:30
  • 614da6003b Display error if non existant conference's versions are queried Nishanth Vijayan 2016-08-06 17:47:46 +05:30
  • 7cff5e0da6 Allow organizers to view changes in a per conference basis Nishanth Vijayan 2016-08-06 17:22:53 +05:30
  • ea868d4cc7 voting period is open when voting dates are not set differentreality 2016-08-17 15:55:10 +03:00
  • ec2ab2543d Merge f8f49ae16d into d07de3ca88 Sherri Mitchell 2016-11-24 17:08:48 +00:00
  • d07de3ca88 Merge pull request #1210 from jmks/proposals-event-type-description Stella Rouzi 2016-11-24 19:05:32 +02:00
  • f30dd52edc Merge pull request #1221 from nishanthvijayan/commercial-missing-version Stella Rouzi 2016-11-22 11:05:01 +02:00
  • 380389cb38 Merge pull request #1223 from rishabhs95/master Stella Rouzi 2016-11-22 11:02:50 +02:00
  • 8a0ce67daa Check if commercial has versions before displaying commercial creator Nishanth Vijayan 2016-11-16 12:55:00 +05:30
  • e07bdee7c1
    hakiri: fix security issue Rishabh Saxena 2016-11-20 14:33:00 +05:30
  • 6c39d34322 Merge pull request #1159 from nishanthvijayan/changelog-improvements Stella Rouzi 2016-11-21 19:21:02 +02:00
  • 710b4d26a4 Merge pull request #1174 from AnithaPal/export-events-and-comments Stella Rouzi 2016-11-16 01:44:05 +02:00
  • 5001e1c7d8 Merge pull request #1214 from AEtherC0r3/master Stella Rouzi 2016-10-23 15:08:46 +03:00
  • 68d447f023 added events, confirmed events and events with comments export features with xlsx, pdf and csv format AnithaPal 2016-09-06 09:23:43 -04:00
  • 3da3fcccbb exporting events to pdf, excel, and csv format AnithaPal 2016-08-11 16:21:30 -04:00
  • 70dd196e2f fixed #1096 adi 2016-10-18 18:48:59 +05:30
  • 31ce346d07 Merge 1bb80c8108 into 7cc2609662 desantonop 2016-10-17 22:32:58 +00:00
  • 7cc2609662 Merge pull request #1189 from kormoc/support_jsonp_in_api Stella Rouzi 2016-10-17 23:35:20 +03:00
  • 1ca6559400 Converts old ruby syntax to new in admin/emails#index AEtherC0r3 2016-10-14 20:08:58 +03:00
  • 1bb80c8108 Change variable names in admin/emails#index to more descriptive ones. Geia soy Stella :* desantonop 2016-10-10 18:54:06 +03:00
  • 0ab6a79713 Load template loads subject desantonop 2016-10-06 18:48:02 +03:00
  • 77cbbc1919 Fix event type description display on proposals#new and proposals#edit jmks 2016-10-05 12:49:59 -04:00
  • 274fd25e30 Merge pull request #1207 from richiethomas/pluralize Stella Rouzi 2016-10-03 23:28:05 +03:00
  • 910047dec3 Merge e3192a9547 into 0b6550d060 Nishanth Vijayan 2016-10-03 11:37:04 +00:00
  • daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' richiethomas 2016-09-14 22:42:04 -04:00
  • aa60b76d08 Merge b1f4d7c66e into 0b6550d060 Sherri Mitchell 2016-09-29 12:23:05 +00:00
  • 844a31e55c Merge 06d7a762b4 into 0b6550d060 Sherri Mitchell 2016-09-29 12:23:05 +00:00
  • 869f167a21 Merge 693798b3f4 into 0b6550d060 Anand Jose 2016-09-29 12:09:43 +00:00
  • 0b6550d060 Merge pull request #1203 from desantonop/datatable Stella Rouzi 2016-09-29 11:22:28 +03:00
  • cfdf4e331a Makes admin/tickets#index datatable desantonop 2016-09-21 21:55:55 +03:00
  • 5100bf4c13 Add comment about displaying associated model object name in _object_changes Nishanth Vijayan 2016-09-28 18:50:40 +05:30
  • 1c42bf92c0 Link commercialable only if it exists else just display title/name Nishanth Vijayan 2016-09-28 18:42:18 +05:30
  • d954059947 Show missing speakers in reports Nishanth Vijayan 2016-09-26 17:01:39 +05:30
  • 0b77fd4afe Merge pull request #1164 from rishabhs95/ticket-deletion Stella Rouzi 2016-09-28 00:13:47 +03:00
  • fabe29d2ed Add new page with organizer reports Nishanth Vijayan 2016-08-21 15:22:31 +05:30
  • d1c0c7d97a
    registration#delete: retain ticket purchases Rishabh Saxena 2016-09-26 20:57:11 +05:30
  • b02792464d Merge pull request #1187 from Ana06/conference Stella Rouzi 2016-09-26 17:38:09 +03:00
  • 5a5b686830 Display event,user title/name only if they exists or when they have versions Nishanth Vijayan 2016-08-22 01:10:37 +05:30
  • b30afccfba When displaying changes, use '-' if id of associated object is blank Nishanth Vijayan 2016-08-20 15:45:53 +05:30
  • 75ee1371de Cleanup obj_desc_and_link Nishanth Vijayan 2016-08-18 01:28:40 +05:30
  • 7d70f7685e Track Schedule and EventSchedule Nishanth Vijayan 2016-08-18 00:32:16 +05:30
  • b982d18bbb Use name/title instead of ID for associated object when showing changes Nishanth Vijayan 2016-08-17 02:45:10 +05:30
  • c7b8418f1a Fix linking problems for event and venue commercials Nishanth Vijayan 2016-08-17 18:34:42 +05:30
  • 7f843a3a13 Remove unnecessary code from conference_controller Ana 2016-09-08 23:19:56 +02:00
  • 66244a92fd Merge pull request #1200 from richiethomas/commercial Stella Rouzi 2016-09-26 12:20:06 +03:00
  • 3daf624d75 Fix admin conferences program events#show page, now only shows a red X when commercial is missing richiethomas 2016-09-19 12:51:27 -04:00
  • c4366b102a Add another place where rails is called without a full path to the binary Rob Smith 2016-09-17 19:34:25 -07:00
  • 6f260d14fa Fix shared directory mounting on provisioning Rob Smith 2016-09-17 19:26:34 -07:00
  • 0dba45909f Minor Contributing documentation updates. Rob Smith 2016-09-15 21:19:27 -07:00
  • de4563ddb1 Remote forgery protection for json requests to the api/v1 endpoints Rob Smith 2016-09-15 20:33:44 -07:00
  • 70e0f42bbb Support JSONP callbacks for the API/v1 endpoints Rob Smith 2016-09-11 22:27:30 -07:00
  • b1f4d7c66e Fixes an issue with canonical urls for sharing conference#show with Facebook and other social media sites Sherri Mitchell 2016-09-15 20:42:00 -04:00
  • 17aa374b99 font awesome gem updated, validation test added and user show page design updated AnithaPal 2016-09-15 13:30:58 -04:00
  • 06d7a762b4 Fixes an issue with canonical urls for sharing with Facebook and other social media sites Sherri Mitchell 2016-09-15 14:14:08 -04:00
  • 85fcd4e1b7 Merge pull request #1115 from rishabhs95/admin-tickets-quantity Stella Rouzi 2016-09-15 13:05:28 +03:00
  • 09ec8565d9 admin/tickets: add column for quantity Rishabh Saxena 2016-09-14 19:40:43 +05:30
  • a2dd90d355 added user edit, show view info and spec for user profile update AnithaPal 2016-08-30 13:19:29 -04:00
  • 5cdf397b2f Updated metatag code in conference#show. Sherri Mitchell 2016-09-09 09:32:07 -04:00
  • f8f49ae16d Adding comments to events#index Sherri Mitchell 2016-08-31 09:34:25 -04:00
  • 68594bd3cd Add open graph metadata to event#show Sherri Mitchell 2016-09-08 14:34:27 -04:00
  • a696d64458 added open graph meta data to conference#show Sherri Mitchell 2016-09-04 21:50:32 -04:00
  • c48c8afa51 Merge pull request #1161 from Ana06/room-event-schedule Stella Rouzi 2016-09-06 12:47:51 +03:00
  • 45e53a2ae9 rake task to destroy versions with event_attatchments Praveen Kumar 2016-08-16 18:38:36 +05:30
  • 9ace40d9fc using sprockets-rails instead of quiet-assets shlok007 2016-08-27 19:34:27 -04:00
  • 46774748ba Merge pull request #1114 from nishanthvijayan/event-missing-info Stella Rouzi 2016-08-26 18:42:59 +03:00
  • 3fdf183e96 Fixes event link in schedule all_events differentreality 2016-08-23 15:13:18 +03:00
  • 73bfc4b708 Merge pull request #1162 from lagartoflojo/mysql-tests Henne Vogelsang 2016-08-23 11:41:23 +02:00
  • 393458ca11 Merge pull request #1167 from Ana06/schedule-bug Christian Bruckmayer 2016-08-23 11:22:57 +02:00
  • 297a2e02a2 Fix bug in the schedule Ana 2016-08-22 21:52:42 +02:00