Skip to content

Commit 2056945

Browse files
matiasperronematiasperrone
committed
fix: merge issues
1 parent 9b3d718 commit 2056945

1 file changed

Lines changed: 0 additions & 88 deletions

File tree

‎app/Swagger/Models/SummitSchema.php‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -13,93 +13,6 @@
1313
new OA\Property(property: 'created', type: 'integer', example: 1, format: 'ime_epoch'),
1414
new OA\Property(property: 'last_edited', type: 'integer', example: 1, format: 'ime_epoch'),
1515

16-
new OA\Property(property: 'name', type: 'string'),
17-
new OA\Property(property: 'start_date', type: 'integer', format: 'ime_epoch'),
18-
new OA\Property(property: 'end_date', type: 'integer', format: 'ime_epoch'),
19-
new OA\Property(property: 'registration_begin_date', type: 'integer', format: 'ime_epoch'),
20-
new OA\Property(property: 'registration_end_date', type: 'integer', format: 'ime_epoch'),
21-
new OA\Property(property: 'start_showing_venues_date', type: 'integer', format: 'ime_epoch'),
22-
new OA\Property(property: 'schedule_start_date', type: 'integer', format: 'ime_epoch'),
23-
new OA\Property(property: 'active', type: 'boolean'),
24-
new OA\Property(property: 'type_id', type: 'integer'),
25-
new OA\Property(property: 'dates_label', type: 'string'),
26-
new OA\Property(property: 'max_submission_allowed_per_user', type: 'integer'),
27-
new OA\Property(property: 'published_events_count', type: 'integer'),
28-
new OA\Property(property: 'time_zone_id', type: 'string'),
29-
new OA\Property(property: 'slug', type: 'string'),
30-
new OA\Property(property: 'invite_only_registration', type: 'boolean'),
31-
new OA\Property(property: 'meeting_room_booking_start_time', type: 'integer', format: 'ime_epoch'),
32-
new OA\Property(property: 'meeting_room_booking_end_time', type: 'integer', format: 'ime_epoch'),
33-
new OA\Property(property: 'meeting_room_booking_slot_length', type: 'integer'),
34-
new OA\Property(property: 'meeting_room_booking_max_allowed', type: 'integer'),
35-
new OA\Property(property: 'begin_allow_booking_date', type: 'integer', format: 'ime_epoch'),
36-
new OA\Property(property: 'end_allow_booking_date', type: 'integer', format: 'ime_epoch'),
37-
new OA\Property(property: 'logo', type: 'url'),
38-
new OA\Property(property: 'secondary_logo', type: 'url'),
39-
new OA\Property(property: 'reassign_ticket_till_date', type: 'integer', format: 'ime_epoch'),
40-
new OA\Property(property: 'registration_disclaimer_content', type: 'string'),
41-
new OA\Property(property: 'registration_disclaimer_mandatory', type: 'boolean'),
42-
new OA\Property(property: 'registration_reminder_email_days_interval', type: 'integer'),
43-
new OA\Property(property: 'registration_link', type: 'url'),
44-
new OA\Property(property: 'secondary_registration_link', type: 'url'),
45-
new OA\Property(property: 'secondary_registration_label', type: 'string'),
46-
new OA\Property(property: 'schedule_default_page_url', type: 'url'),
47-
new OA\Property(property: 'schedule_default_event_detail_url', type: 'url'),
48-
new OA\Property(property: 'schedule_og_site_name', type: 'string'),
49-
new OA\Property(property: 'schedule_og_image_url', type: 'string'),
50-
new OA\Property(property: 'schedule_og_image_secure_url', type: 'string'),
51-
new OA\Property(property: 'schedule_og_image_width', type: 'integer'),
52-
new OA\Property(property: 'schedule_og_image_height', type: 'integer'),
53-
new OA\Property(property: 'schedule_facebook_app_id', type: 'string'),
54-
new OA\Property(property: 'schedule_ios_app_name', type: 'string'),
55-
new OA\Property(property: 'schedule_ios_app_store_id', type: 'string'),
56-
new OA\Property(property: 'schedule_ios_app_custom_schema', type: 'string'),
57-
new OA\Property(property: 'schedule_android_app_name', type: 'string'),
58-
new OA\Property(property: 'schedule_android_app_package', type: 'string'),
59-
new OA\Property(property: 'schedule_android_custom_schema', type: 'string'),
60-
new OA\Property(property: 'schedule_twitter_app_name', type: 'string'),
61-
new OA\Property(property: 'schedule_twitter_text', type: 'string'),
62-
new OA\Property(property: 'default_page_url', type: 'string'),
63-
new OA\Property(property: 'speaker_confirmation_default_page_url', type: 'string'),
64-
new OA\Property(property: 'virtual_site_url', type: 'string'),
65-
new OA\Property(property: 'marketing_site_url', type: 'string'),
66-
new OA\Property(property: 'support_email', type: 'string'),
67-
new OA\Property(property: 'speakers_support_email', type: 'string'),
68-
new OA\Property(property: 'registration_send_qr_as_image_attachment_on_ticket_email', type: 'boolean'),
69-
new OA\Property(property: 'registration_send_ticket_as_pdf_attachment_on_ticket_email', type: 'boolean'),
70-
new OA\Property(property: 'registration_send_ticket_email_automatically', type: 'boolean'),
71-
new OA\Property(property: 'registration_send_order_email_automatically', type: 'boolean'),
72-
new OA\Property(property: 'registration_allow_automatic_reminder_emails', type: 'boolean'),
73-
new OA\Property(property: 'modality', type: 'string'),
74-
new OA\Property(property: 'allow_update_attendee_extra_questions', type: 'boolean'),
75-
new OA\Property(property: 'time_zone_label', type: 'string'),
76-
new OA\Property(property: 'registration_allowed_refund_request_till_date', type: 'integer', format: 'ime_epoch'),
77-
new OA\Property(property: 'registration_slug_prefix', type: 'string'),
78-
new OA\Property(property: 'marketing_site_oauth2_client_scopes', type: 'string'),
79-
new OA\Property(property: 'default_ticket_type_currency', type: 'string'),
80-
new OA\Property(property: 'default_ticket_type_currency_symbol', type: 'string'),
81-
new OA\Property(property: 'ticket_types', type: 'array', items: new OA\Items(type: "integer")),
82-
new OA\Property(property: 'locations', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=locations, full objects when included in expand.'),
83-
new OA\Property(property: 'wifi_connections', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=wifi_connections, full objects when included in expand.'),
84-
new OA\Property(property: 'selection_plans', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=selection_plans, full objects when included in expand.'),
85-
new OA\Property(property: 'meeting_booking_room_allowed_attributes', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=meeting_booking_room_allowed_attributes, full objects when included in expand.'),
86-
new OA\Property(property: 'summit_sponsors', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=summit_sponsors, full objects when included in expand.'),
87-
new OA\Property(property: 'order_extra_questions', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=order_extra_questions, full objects when included in expand.'),
88-
new OA\Property(property: 'tax_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=tax_types, full objects when included in expand.'),
89-
new OA\Property(property: 'payment_profiles', type: 'array', items: new OA\Items(type: "object"), description: 'Array of PaymentGatewayProfile, when included in ?relations=payment_profiles, full objects when included in expand.'),
90-
new OA\Property(property: 'email_flows_events', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=email_flows_events, full objects when included in expand.'),
91-
new OA\Property(property: 'summit_documents', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=summit_documents, full objects when included in expand.'),
92-
new OA\Property(property: 'featured_speakers', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=featured_speakers, full objects when included in expand.'),
93-
new OA\Property(property: 'dates_with_events', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=dates_with_events, full objects when included in expand.'),
94-
new OA\Property(property: 'presentation_action_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=presentation_action_types, full objects when included in expand.'),
95-
new OA\Property(property: 'schedule_settings', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=schedule_settings, full objects when included in expand.'),
96-
new OA\Property(property: 'badge_view_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_view_types, full objects when included in expand.'),
97-
new OA\Property(property: 'lead_report_settings', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=lead_report_settings, full objects when included in expand.'),
98-
new OA\Property(property: 'badge_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_types, full objects when included in expand.'),
99-
new OA\Property(property: 'badge_features_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_features_types, full objects when included in expand.'),
100-
new OA\Property(property: 'badge_access_level_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_access_level_types, full objects when included in expand.'),
101-
new OA\Property(property: 'dates_with_events', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=dates_with_events, full objects when included in expand.'),
102-
new OA\Property(property: 'supported_currencies', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=supported_currencies, full objects when included in expand.'),
10316
new OA\Property(property: 'name', type: 'string'),
10417
new OA\Property(property: 'start_date', type: 'integer', format: 'ime_epoch'),
10518
new OA\Property(property: 'end_date', type: 'integer', format: 'ime_epoch'),
@@ -184,7 +97,6 @@
18497
new OA\Property(property: 'badge_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_types.'),
18598
new OA\Property(property: 'badge_features_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_features_types.'),
18699
new OA\Property(property: 'badge_access_level_types', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=badge_access_level_types.'),
187-
new OA\Property(property: 'dates_with_events', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=dates_with_events.'),
188100
new OA\Property(property: 'supported_currencies', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=supported_currencies.'),
189101
// Expanded relations
190102
new OA\Property(property: 'featured_speakers', type: 'array', items: new OA\Items(type: "integer"), description: 'Array of Ids, when included in ?relations=featured_speakers, full objects when included in ?expand=featured_speakers.'),

0 commit comments

Comments
 (0)