Version 5.0.13

applications/calendar/data/emails.xml

@@ -56,6 +56,51 @@
 
 {$email->language->addToStack("go_to_this_x", FALSE, array( 'htmlsprintf' => array( mb_strtolower( $email->language->addToStack( $content::$title, FALSE ) ) ) ) )}: {$content->url()}
 
+-- {setting="board_name"}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>calendar</template_app><template_name>notification_event_rsvp</template_name><template_content_html><![CDATA[
+{$email->language->addToStack("email_event_rsvp", FALSE, array( 'sprintf' => array( $member->name, $content->url(), $content->mapped('title') ) ) )}
+
+<br />
+<br />
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%" bgcolor="#ffffff" class='responsive_table'>
+	<tr>
+		<td dir='{dir}' width="100%" class='responsive_fullwidth' bgcolor="#f9f9f9">
+			<table cellpadding="10" cellspacing="0" border="0" width="100%">
+				<tr>
+					<td dir='{dir}' colspan='2' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" bgcolor="#f0f0f0">
+						<strong>{$email->language->get("rsvp_attend_event")}</strong>
+					</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+					    {$email->language->addToStack( 'x_members', false, array( 'pluralize' => array( $content->attendeeCount( $content::RSVP_YES ) ) ) )}
+					</td>
+				</tr>
+				<tr>
+					<td dir='{dir}' colspan='2' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" bgcolor="#f0f0f0">
+						<strong>{$email->language->get("rsvp_maybe_event")}</strong>
+					</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+					    {$email->language->addToStack( 'x_members', false, array( 'pluralize' => array( $content->attendeeCount( $content::RSVP_MAYBE ) ) ) )}
+					</td>
+				</tr>
+				<tr>
+					<td dir='{dir}' colspan='2' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" bgcolor="#f0f0f0">
+						<strong>{$email->language->get("rsvp_notgoing_event")}</strong>
+					</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+					    {$email->language->addToStack( 'x_members', false, array( 'pluralize' => array( $content->attendeeCount( $content::RSVP_NO ) ) ) )}
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<br /><br />
+<em style='color: #8c8c8c'>&mdash; {setting="board_name"}</em>]]></template_content_html><template_data>$content, $member, $email</template_data><template_content_plaintext><![CDATA[{$email->language->addToStack("email_event_rsvp_plain", FALSE, array( 'htmlsprintf' => array( $member->name, $content->mapped('title') ) ) )}
+
+{$email->language->get("rsvp_attend_event")}: {$email->language->addToStack( 'x_members', false, array( 'pluralize' => array( $content->attendeeCount( $content::RSVP_YES ) ) ) )}
+{$email->language->get("rsvp_maybe_event")}: {$email->language->addToStack( 'x_members', false, array( 'pluralize' => array( $content->attendeeCount( $content::RSVP_MAYBE ) ) ) )}
+{$email->language->get("rsvp_notgoing_event")}: {$email->language->addToStack( 'x_members', false, array( 'pluralize' => array( $content->attendeeCount( $content::RSVP_NO ) ) ) )}
+
 -- {setting="board_name"}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>calendar</template_app><template_name>notification_new_content</template_name><template_content_html><![CDATA[
 {{if $content->author()->member_id}}
 	{$email->language->addToStack("email_new_calevent", FALSE, array( 'sprintf' => array( $content->author()->url(), $content->author()->name, $content->indefiniteArticle( $email->language ), $content->url(), $content->mapped('title'), $content->fixedDateTimeDescription( $email->language ) ) ) )}

applications/calendar/data/furl.json

@@ -1,11 +1,7 @@
 {
 	"topLevel": "events",
 	"pages": {
-		"featured": {
-			"friendly": "featured",
-			"real": "app=calendar&module=calendar&controller=view&view=overview&do=featured"
-		},
-	    "calendar_calweek": {
+		"calendar_calweek": {
 	        "friendly": "{#id}-{?}/week/{@w}",
 	        "real": "app=calendar&module=calendar&controller=view&view=week"
 	    },

applications/calendar/data/javascript.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="calendar">
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000250"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -110,7 +110,7 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000250"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -229,7 +229,7 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.eventList.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.eventList.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000300"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -347,7 +347,7 @@ var PER_PAGE = 16;
         }
     });
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.nearMe.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.nearMe.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000300"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -711,7 +711,7 @@ var PER_PAGE = 16;
         }
     });
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.search.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/overview" javascript_name="ips.overview.search.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000300"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -747,7 +747,7 @@ var PER_PAGE = 16;
             this._gotCoords = false;
             this._offset = 0;
             this._limit = 20;
-            this._currentSort = $('body').find('#elSortMenu_menu .ipsMenu_itemChecked').attr('data-ipsMenuValue');
+            this._currentSort = $('body').find('#elSortMenu_menu [aria-selected="true"]').attr('data-ipsMenuValue');
             this._baseURL = this.scope.attr('action');
             this._initialURL = window.location.href;
             this._cancelledLookup = false;
@@ -948,10 +948,10 @@ var PER_PAGE = 16;
          * @param 		{object} 	data 	Event data object
          * @returns 	{string}
          */
-        changeSort(e, data) {
+        changeSort(e, data = e.detail) {
             e.preventDefault();
             this._currentSort = data.selectedItemID;
-            const title = data.menuElem.find('[data-ipsMenuValue="' + this._currentSort + '"]').text();
+            const title = $(data.menuElem).find('[data-ipsMenuValue="' + this._currentSort + '"]').text();
             $('body').find('[data-role="searchOrder"]').text( title );
             this.doSearch();
         },
@@ -1265,7 +1265,7 @@ var PER_PAGE = 16;
     });
 }(jQuery, _));
 ]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000100"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000100"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -1486,7 +1486,6 @@ var PER_PAGE = 16;
 		 */
 		finishRepeat: function () {
 			this._updateSummary();
-			$('#elRecurEdit_menu').trigger('closeMenu');
 		},
 
 		/**
@@ -1586,12 +1585,8 @@ var PER_PAGE = 16;
 		 * @returns 	{void}
 		 */
 		updateTimezone: function (e) {
-			if( e ){
-				e.preventDefault();
-			}
-
 			// Update displayed timezone
-			this.scope.find('[data-role="timezone_display"]').text( $('#event_timezone option:selected').data('abbreviated') ).trigger('closeMenu');
+			this.scope.find('[data-role="timezone_display"]').text( $('#event_timezone option:selected').data('abbreviated') );
 		},
 
 		/**
@@ -1602,30 +1597,9 @@ var PER_PAGE = 16;
 		 * @returns 	{void}
 		 */
 		disableRecurring: function (e) {
-			if( e )
-			{
-				e.preventDefault();
-			}
-
-			this.scope.find('#elRepeatCb').prop( 'checked', false  );
 			this._updateSummary();
 		},
 
-		/**
-		 * Finalize our recurring options
-		 *
-		 * @param 		{event} 	e 		Event object
-		 * @param 		{object} 	data 	Event data object
-		 * @returns 	{void}
-		 */
-		finishRepeatConfiguration: function (e, data) {
-			e.preventDefault();
-
-			// Copy the summary from the menu to the main display and close the menu
-			this.scope.find('[data-role="recur_summary_final"]').text( this.scope.find('[data-role="recur_summary"]').text() );
-			this.scope.find('#elRecurEdit').trigger('closeMenu');
-		},
-
 		/**
 		 * Update the recurring string
 		 *
@@ -1813,7 +1787,7 @@ var PER_PAGE = 16;
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/venue" javascript_name="ips.venue.main.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000200"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/venue" javascript_name="ips.venue.main.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000200"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -1920,7 +1894,7 @@ var PER_PAGE = 16;
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderButton.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderButton.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000150"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -2003,7 +1977,7 @@ var PER_PAGE = 16;
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderForm.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000150">/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.reminderForm.js" javascript_type="controller" javascript_version="5001302" javascript_position="1000150">/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -2113,7 +2087,7 @@ var PER_PAGE = 16;
 	});
 }(jQuery, _));
 </file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.calendar.templates.js" javascript_type="framework" javascript_version="5000074" javascript_position="1000050"><![CDATA[/**
+ <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.calendar.templates.js" javascript_type="framework" javascript_version="5001302" javascript_position="1000050"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  */
@@ -2122,9 +2096,9 @@ var PER_PAGE = 16;
 ips.templates.set('calendar.reminder.loading', " \
 <div class='ipsLoading ipsLoading--tiny'></div>\
 ");]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.overview.js" javascript_type="template" javascript_version="5000074" javascript_position="1000050"><![CDATA[ips.templates.set("eventLoading", `
+ <file javascript_app="calendar" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.overview.js" javascript_type="template" javascript_version="5001302" javascript_position="1000050"><![CDATA[ips.templates.set("eventLoading", `
 	<li class='ipsData__item ipsData__item--loading'>
-		<div class="ipsData__image"></div>
+		<div class="ipsData__image" aria-hidden="true"></div>
 		<div class="ipsData__content">
 			<div class="ipsData__main">
 				<div class="ipsData__title"></div>

applications/calendar/data/lang.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="calendar" version="5000074">
+ <app key="calendar" version="5001302">
   <word key="__app_calendar" js="0">Events</word>
   <word key="frontnavigation_calendar" js="0">Events</word>
   <word key="__indefart_calendar_event_comment" js="0">a comment on an event</word>
@@ -245,8 +245,10 @@
   <word key="see_more_events_near_you" js="0">See more events by location</word>
   <word key="event_album" js="0">Album</word>
   <word key="event_album_desc" js="0">You can link an album from the Gallery to this event which will show the images on the event page and cause information about the event to be displayed on the album page.</word>
-  <word key="submit_event_start" js="0">Event Start</word>
-  <word key="submit_event_end" js="0">Event End</word>
+  <word key="submit_event_start_date" js="0">Start date</word>
+  <word key="submit_event_start_time" js="0">Start time</word>
+  <word key="submit_event_end_date" js="0">End date</word>
+  <word key="submit_event_end_time" js="0">End time</word>
   <word key="submit_event_summary" js="0">Summary</word>
   <word key="submit_event_repeats_check" js="0">This event repeats</word>
   <word key="submit_event_repeats" js="0">Repeats</word>
@@ -266,7 +268,6 @@
   <word key="you_werent_going" js="0">You didn't go</word>
   <word key="you_are_going_to_this" js="0">You are going to this event</word>
   <word key="you_are_not_going_to_this" js="0">You are not going to this event</word>
-  <word key="rsvp_change" js="0">Change RSVP</word>
   <word key="confirm_attendance" js="0">Confirm attendance</word>
   <word key="featured_events" js="0">Featured Events</word>
   <word key="end_date_before_start" js="0">The event must end after it starts</word>
@@ -296,7 +297,7 @@
   <word key="rsvp_leave_event" js="0">Leave event</word>
   <word key="rsvp_attend_event" js="0">Going</word>
   <word key="rsvp_maybe_event" js="0">Maybe</word>
-  <word key="rsvp_notgoing_event" js="0">Decline</word>
+  <word key="rsvp_notgoing_event" js="0">Not going</word>
   <word key="rsvp_attendees" js="0">Going</word>
   <word key="rsvp_attendees_past" js="0">Went</word>
   <word key="rsvp_attended_past_event" js="0">Went</word>
@@ -318,7 +319,8 @@
   <word key="rsvp_selection_yes" js="0">Your name has been added to the guest list</word>
   <word key="rsvp_selection_no" js="0">It's too bad you won't be able to make it to the event!</word>
   <word key="rsvp_selection_maybe" js="0">Your name has been added to the maybe list</word>
-  <word key="rsvp_download" js="0">Download guest list</word>
+  <word key="rsvp_selection_leave" js="0">Your name has been removed from the guest list for this event</word>
+  <word key="rsvp_download" js="0">Download list</word>
   <word key="event_rsvp_attendees_other" js="0">Other Responses</word>
   <word key="recur_human_yearly" js="0">This event {!#[1:began][2:begins]} %s and repeats every year %s</word>
   <word key="recur_human_yearly_multi" js="0">This event {!#[1:began][2:begins]} %s and repeats every %s %s</word>
@@ -447,8 +449,11 @@
   <word key="__api_calendar_venues" js="0">Venues</word>
   <word key="calendar_activity_stream_rsvp" js="0"><![CDATA[%s is attending <a href='%s'>%s</a>]]></word>
   <word key="all_activity_calendar_streamitems" js="0">When a member RSVPs to an event</word>
-  <word key="notifications__calendar_Events" js="0">Event Reminders</word>
-  <word key="notifications__calendar_Events_desc" js="0">These notifications are sent when an event you have asked to receive a reminder about is coming up.</word>
+  <word key="notifications__calendar_Events" js="0">Events</word>
+  <word key="notifications__calendar_Reminders" js="0">Event Reminders</word>
+  <word key="notifications__calendar_Reminders_desc" js="0">These notifications are sent when an event you have asked to receive a reminder about is coming up.</word>
+  <word key="notifications__calendar_Rsvp" js="0">Event RSVPs</word>
+  <word key="notifications__calendar_Rsvp_desc" js="0">These notifications are sent when a member RSVPs to your events.</word>
   <word key="mailsub__calendar_notification_event_reminder" js="0"><![CDATA[Event Reminder for {$content->mapped("title")|raw}]]></word>
   <word key="email_event_reminder" js="0"><![CDATA[There's now less than %s to go until <a href='%s'>%s</a>.]]></word>
   <word key="email_event_reminder_plain" js="0">There's now less than %s to go until %s</word>
@@ -457,6 +462,11 @@
   <word key="days_to_go" js="0">{# [1:day][?:days]}</word>
   <word key="notification__event_reminder" js="0">Less than %s to go until %s</word>
   <word key="notification__event_reminder_title" js="0">Upcoming {!#[1:event][?:events]}</word>
+  <word key="mailsub__calendar_notification_event_rsvp" js="0"><![CDATA[RSVP for {$content->mapped("title")|raw}]]></word>
+  <word key="email_event_rsvp" js="0"><![CDATA[%s is attending <a href='%s'>%s</a>.]]></word>
+  <word key="email_event_rsvp_plain" js="0">%s is attending %s</word>
+  <word key="notification__event_rsvp" js="0">%s is going to %s</word>
+  <word key="notification__event_rsvp_title" js="0">Event RSVP</word>
   <word key="menu__calendar_calendars_venues" js="0">Venues</word>
   <word key="venues" js="0">Venues</word>
   <word key="venue_title" js="0">Venue Name</word>

applications/calendar/data/versions.json

@@ -348,5 +348,54 @@
     "5000071": "5.0.6 Beta 2",
     "5000072": "5.0.6 Beta 3",
     "5000073": "5.0.6 Beta 4",
-    "5000074": "5.0.6"
+    "5000074": "5.0.6",
+    "5000075": "5.0.7 Beta 1",
+    "5000076": "5.0.7 Beta 2",
+    "5000077": "5.0.7 Beta 2",
+    "5000078": "5.0.7 Beta 3",
+    "5000079": "5.0.7 Beta 4",
+    "5000080": "5.0.7",
+    "5000081": "5.0.7",
+    "5000082": "5.0.7",
+    "5000800": "5.0.8 Alpha 1",
+    "5000801": "5.0.8 Alpha 2",
+    "5000802": "5.0.8 Beta 1",
+    "5000803": "5.0.8 Beta 2",
+    "5000804": "5.0.8 Beta 3",
+    "5000805": "5.0.8",
+    "5000900": "5.0.9 Beta 1",
+    "5000901": "5.0.9 Beta 1",
+    "5000902": "5.0.9 Beta 1",
+    "5000903": "5.0.9 Beta 2",
+    "5000904": "5.0.9",
+    "5000905": "5.0.9",
+    "5000906": "5.0.10 Beta 1",
+    "5000907": "5.0.10 Beta 1",
+    "5000908": "5.0.10 Beta 1",
+    "5000909": "5.0.10 Beta 1",
+    "5000910": "5.0.10 Beta 2",
+    "5000911": "5.0.10 Beta 3",
+    "5000912": "5.0.10 Beta 4",
+    "5000913": "5.0.10 Beta 4",
+    "5000914": "5.0.10",
+    "5000915": "5.0.10",
+    "5000916": "5.0.10",
+    "5000917": "5.0.10",
+    "5000918": "5.0.10",
+    "5000919": "5.0.10",
+    "5000920": "5.0.10",
+    "5001100": "5.0.11 Beta 1",
+    "5001101": "5.0.11 Beta 1",
+    "5001102": "5.0.11 Beta 2",
+    "5001103": "5.0.11",
+    "5001104": "5.0.11",
+    "5001105": "5.0.11",
+    "5001200": "5.0.12 Beta 1",
+    "5001201": "5.0.12 Beta 2",
+    "5001202": "5.0.12 Beta 3",
+    "5001203": "5.0.12",
+    "5001204": "5.0.12",
+    "5001300": "5.0.13 Beta 1",
+    "5001301": "5.0.13 Beta 2",
+    "5001302": "5.0.13"
 }

applications/calendar/extensions/core/AchievementAction/Rsvp.php

@@ -49,7 +49,7 @@ class Rsvp extends AchievementActionAbstract // NOTE: Other classes exist to pro
 	 */
 	public function filters( ?array $filters, Url $url ): array
 	{
-		$return	= array();
+		$return = parent::filters( $filters, $url );
 
 		$return['nodes'] = new Node( 'achievement_filter_Rsvp_nodes', ( $filters and isset( $filters['nodes'] ) and $filters['nodes'] ) ? $filters['nodes'] : 0, FALSE, [
 			'url'				=> $url,
@@ -76,7 +76,7 @@ class Rsvp extends AchievementActionAbstract // NOTE: Other classes exist to pro
 	 */
 	public function formatFilterValues( array $values ): array
 	{
-		$return = [];
+		$return = parent::formatFilterValues( $values );
 		if ( isset( $values['achievement_filter_Rsvp_nodes'] ) )
 		{			
 			$return['nodes'] = array_keys( $values['achievement_filter_Rsvp_nodes'] );
@@ -149,6 +149,37 @@ class Rsvp extends AchievementActionAbstract // NOTE: Other classes exist to pro
 	{
 		return [ $extra->author() ];
 	}
+
+	/**
+	 * Determines if the member has already completed this rule.
+	 * Used for retroactive rule completion.
+	 * So far, this is only used in Quests, but may be used elsewhere at a later point.
+	 *
+	 * @param Member $member
+	 * @param array $filters
+	 * @return bool
+	 */
+	public function isRuleCompleted( Member $member, array $filters ) : bool
+	{
+		$where = [
+			[ 'rsvp_member_id=?', $member->member_id ]
+		];
+
+		if( !empty( $filters['nodes'] ) )
+		{
+			$where[] = [ Db::i()->in( 'event_calendar_id', $filters['nodes'] ) ];
+		}
+
+		$total = Db::i()->select( 'count(*)', 'calendar_event_rsvp', $where )
+			->join( 'calendar_events', 'rsvp_event_id=event_id' )->first();
+
+		if( !empty( $filters['milestone'] ) )
+		{
+			return $total >= $filters['milestone'];
+		}
+
+		return $total > 0;
+	}
 	
 	/**
 	 * Get identifier to prevent the member being awarded points for the same action twice
@@ -202,7 +233,7 @@ class Rsvp extends AchievementActionAbstract // NOTE: Other classes exist to pro
 		{
 			$conditions[] = Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone', FALSE, [
 				'htmlsprintf' => [
-					Theme::i()->getTemplate( 'achievements' )->ruleDescriptionBadge( 'milestone', Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone_nth', FALSE, [ 'pluralize' => [ $rule->filters['milestone'] ] ] ) )
+					Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescriptionBadge( 'milestone', Member::loggedIn()->language()->addToStack( 'achievements_title_filter_milestone_nth', FALSE, [ 'pluralize' => [ $rule->filters['milestone'] ] ] ) )
 				],
 				'sprintf'		=> [ Member::loggedIn()->language()->addToStack('rsvp') ]
 			] );
@@ -211,8 +242,12 @@ class Rsvp extends AchievementActionAbstract // NOTE: Other classes exist to pro
 		{
 			$conditions[] = $nodeCondition;
 		}
+		if( $questCondition = $this->_questFilterDescription( $rule ) )
+		{
+			$conditions[] = $questCondition;
+		}
 
-		return Theme::i()->getTemplate( 'achievements' )->ruleDescription(
+		return Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescription(
 			Member::loggedIn()->language()->addToStack( 'AchievementAction__Rsvp_title' ),
 			$conditions
 		);
@@ -241,7 +276,7 @@ class Rsvp extends AchievementActionAbstract // NOTE: Other classes exist to pro
 			{
 				return Member::loggedIn()->language()->addToStack( 'achievements_title_filter_location', FALSE, [
 					'htmlsprintf' => [
-						Theme::i()->getTemplate( 'achievements' )->ruleDescriptionBadge( 'location',
+						Theme::i()->getTemplate( 'achievements', 'core' )->ruleDescriptionBadge( 'location',
 							count( $nodeNames ) === 1 ? $nodeNames[0] : Member::loggedIn()->language()->addToStack( 'achievements_title_filter_location_val', FALSE, [ 'sprintf' => [
 								count( $nodeNames ),
 								Member::loggedIn()->language()->addToStack( 'calendars', FALSE, [ 'strtolower' => TRUE ] )

applications/calendar/extensions/core/EditorLocations/Calendar.php

@@ -13,6 +13,7 @@ namespace IPS\calendar\extensions\core\EditorLocations;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
 
+use Exception;
 use IPS\calendar\Event;
 use IPS\calendar\Event\Comment;
 use IPS\calendar\Event\Review;
@@ -117,20 +118,25 @@ class Calendar extends EditorLocationsAbstract
 	 */
 	public function attachmentLookup( ?int $id1=null, ?int $id2=null, ?string $id3=null ): Model|Content|Url|Member|null
 	{
-		if ( $id2 )
+		try
 		{
-			if ( $id3 === 'review' )
+			if( $id2 )
 			{
-				return Review::load( $id2 );
-			}
-			else
+				if( $id3 === 'review' )
+				{
+					return Review::load( $id2 );
+				}else
+				{
+					return Comment::load( $id2 );
+				}
+			}else
 			{
-				return Comment::load( $id2 );
+				return Event::load( $id1 );
 			}
 		}
-		else
+		catch( Exception $e )
 		{
-			return Event::load( $id1 );
+			throw new LogicException;
 		}
 	}
 }

applications/calendar/extensions/core/Notifications/Events.php

@@ -39,17 +39,33 @@ class Events extends NotificationsAbstract
 	 */
 	public static function configurationOptions( Member $member = NULL ): array
 	{
-		return array(
+		$return = array(
 			'event_reminder'	=> array(
 				'type'				=> 'standard',
 				'notificationTypes'	=> array( 'event_reminder' ),
-				'title'				=> 'notifications__calendar_Events',
-				'showTitle'			=> FALSE,
-				'description'		=> 'notifications__calendar_Events_desc',
+				'title'				=> 'notifications__calendar_Reminders',
+				'showTitle'			=> true,
+				'description'		=> 'notifications__calendar_Reminders_desc',
 				'default'			=> array( 'inline', 'push', 'email' ),
 				'disabled'			=> array()
 			)
 		);
+
+        /* Can we create events? */
+        if( $member === null or Event::canCreate( $member ) )
+        {
+            $return['event_rsvp'] = array(
+                'type' => 'standard',
+                'notificationTypes' => array( 'event_rsvp' ),
+                'title' => 'notifications__calendar_Rsvp',
+                'showTitle' => true,
+                'description' => 'notifications__calendar_Rsvp_desc',
+                'default' => array( 'inline', 'push', 'email' ),
+                'disabled' => array()
+            );
+        }
+
+        return $return;
 	}
 	
 	/**
@@ -158,4 +174,59 @@ class Events extends NotificationsAbstract
 			'channelId'	=> 'events',
 		);
 	}
+
+    /**
+     * Parse notification: Event RSVPs
+     *
+     * @param Inline $notification	The notification
+     * @param bool $htmlEscape		TRUE to escape HTML in title
+     * @return	array
+     * @code
+     * return array(
+     * 'title'		=> "Mark has replied to A Topic",	// The notification title
+     * 'url'		=> new \IPS\Http\Url( ... ),		// The URL the notification should link to
+     * 'content'	=> "Lorem ipsum dolar sit",			// [Optional] Any appropriate content. Do not format this like an email where the text
+     * // explains what the notification is about - just include any appropriate content.
+     * // For example, if the notification is about a post, set this as the body of the post.
+     * 'author'	=>  \IPS\Member::load( 1 ),			// [Optional] The user whose photo should be displayed for this notification
+     * );
+     * @endcode
+     */
+    public function parse_event_rsvp( Inline $notification, bool $htmlEscape=TRUE ): array
+    {
+        $item = $notification->item;
+        if ( !$item )
+        {
+            throw new OutOfRangeException;
+        }
+
+        $member = Member::load( $notification->extra['member'] );
+
+        return array(
+            'title'		=> Member::loggedIn()->language()->addToStack( 'notification__event_rsvp', FALSE, array( 'sprintf' => array( $member->name, $item->mapped( 'title' ) ) ) ),
+            'url'		=> $notification->item->url(),
+            'author'	=> $member
+        );
+    }
+
+    /**
+     * Parse notification for mobile: event_reminder
+     *
+     * @param	Lang	$language	The language that the notification should be in
+     * @param	Event	$event		The event the notification refers to
+     * @param 	Member  $member		The member who RSVPd
+     * @return	array
+     */
+    public static function parse_mobile_event_rsvp( Lang $language, Event $event, Member $member ): array
+    {
+        return array(
+            'title'			=> $language->addToStack( 'notification__event_rsvp_title' ),
+            'body'		=> $language->addToStack( 'notification__event_rsvp', FALSE, array( 'sprintf' => array(  $member->name, $event->mapped('title') ) ) ),
+            'data'		=> array(
+                'url'		=> (string) $event->url(),
+                'author'	=> $member
+            ),
+            'channelId'	=> 'events',
+        );
+    }
 }

applications/calendar/modules/front/calendar/event.php

@@ -32,6 +32,7 @@ use IPS\Helpers\Form;
 use IPS\Helpers\Form\Number;
 use IPS\Http\Url;
 use IPS\Member;
+use IPS\Notification;
 use IPS\Output;
 use IPS\Request;
 use IPS\Session;
@@ -414,6 +415,14 @@ class event extends Controller
 			) );
 			
 			Member::loggedIn()->achievementAction( 'calendar', 'Rsvp', $this->event );
+
+            /* If we responded that we are going, send a notification to the event owner */
+            if( $_go == EventClass::RSVP_YES )
+            {
+                $notification = new Notification( Application::load( 'calendar' ), 'event_rsvp', $this->event, [ $this->event, Member::loggedIn() ], [ 'member' => Member::loggedIn()->member_id ] );
+                $notification->recipients->attach( $this->event->author() );
+                $notification->send();
+            }
 		}
 
 		$webhookData = [

applications/calendar/modules/front/calendar/venue.php

@@ -60,6 +60,8 @@ class venue extends Controller
 			Output::i()->error( 'node_error', '2L354/1', 404, '' );
 		}
 
+		Output::i()->bodyAttributes['contentClass'] = VenueClass::class;
+
 		parent::execute();
 	}
 

applications/calendar/modules/front/calendar/view.php

@@ -22,6 +22,7 @@ use InvalidArgumentException;
 use IPS\calendar\Calendar;
 use IPS\calendar\Date;
 use IPS\calendar\Event;
+use IPS\Db;
 use IPS\Dispatcher\Controller;
 use IPS\GeoLocation;
 use IPS\Helpers\Form;
@@ -176,6 +177,8 @@ class view extends Controller
 
 		$this->$method( $jump );
 
+		Output::i()->bodyAttributes['contentClass'] = Calendar::class;
+
 		/* Online User Location */
 		if ( $this->_calendar )
 		{
@@ -804,18 +807,9 @@ class view extends Controller
 					$locations = static::geocodeLocation( Request::i()->location, FALSE );
 					if( count( $locations ) )
 					{
-						if( $locations[0]['value'] )
-						{
-							$having[] = "( event_title LIKE CONCAT( '%', '" . $locations[0]['value'] . "', '%' ) OR name LIKE CONCAT( '%', '" . $locations[0]['value'] . "', '%' ) )";
-						}
-
 						$location = array( 'lat' => $locations[0]['lat'], 'lon' => $locations[0]['long'] );
 						$searchNearLocation = TRUE;
 					}
-					else
-					{
-						$having[] = "( event_title LIKE CONCAT( '%', '" . Request::i()->location . "', '%' ) OR name LIKE CONCAT( '%', '" . Request::i()->location . "', '%' ) )";
-					}
 				}
 				else if ( isset( Request::i()->lat ) and isset( Request::i()->lon ) and Request::i()->lat !== 0 and Request::i()->lon !== 0 )
 				{
@@ -840,11 +834,6 @@ class view extends Controller
 				{
 					$select = $select . ', ( 3959 * acos( cos( radians(' . $location['lat'] . ') ) * cos( radians( event_latitude ) ) * cos( radians( event_longitude ) - radians(' . $location['lon'] . ') ) + sin( radians(' . $location['lat'] . ') ) * sin(radians(event_latitude)) ) ) AS distance';
 
-					if( $searchNearLocation )
-					{
-						$having[] = 'distance < 500';
-					}
-
 					if( isset( Request::i()->sortBy ) && Request::i()->sortBy == 'nearest' )
 					{
 						$sort = 'distance asc';

applications/calendar/setup/upg_5000075/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000075,
+    "name": "5.0.7 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000075/theme.json

@@ -0,0 +1,33 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/browse\/calendarHeader",
+            "front\/browse\/calendarWrapper",
+            "front\/events\/featured",
+            "front\/events\/nearMe",
+            "front\/events\/online",
+            "front\/events\/searchResultsWrapper",
+            "front\/modcp\/approvalQueueItem",
+            "front\/overview\/byMonth",
+            "front\/overview\/wrapper",
+            "front\/submit\/datesForm",
+            "front\/submit\/submitForm",
+            "front\/view\/eventSidebar",
+            "front\/view\/view"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [
+            "front\/calendar.css"
+        ],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000076/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000076,
+    "name": "5.0.7 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000077/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000077,
+    "name": "5.0.7 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000078/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000078,
+    "name": "5.0.7 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": true,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000078/lang.json

@@ -0,0 +1,19 @@
+{
+    "normal": {
+        "added": [
+            "rsvp_selection_leave"
+        ],
+        "edited": [
+            "rsvp_notgoing_event",
+            "rsvp_download"
+        ],
+        "removed": [
+            "rsvp_change"
+        ]
+    },
+    "js": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000078/theme.json

@@ -0,0 +1,23 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/coverPhotoOverlay",
+            "front\/view\/eventSidebar",
+            "front\/view\/reminderButton",
+            "front\/view\/rsvpControls",
+            "front\/view\/view"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000079/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000079,
+    "name": "5.0.7 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000080/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000080,
+    "name": "5.0.7",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000081/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000081,
+    "name": "5.0.7",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000082/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000082,
+    "name": "5.0.7",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000800/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000800,
+    "name": "5.0.8 Alpha 1",
+    "steps": {
+        "queries": false,
+        "lang": true,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": true,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000800/javascript.json

@@ -0,0 +1,14 @@
+{
+    "files": {
+        "added": [],
+        "edited": [
+            "calendar\/front\/templates\/ips.templates.overview.js"
+        ],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000800/lang.json

@@ -0,0 +1,20 @@
+{
+    "normal": {
+        "added": [
+            "submit_event_start_date",
+            "submit_event_start_time",
+            "submit_event_end_date",
+            "submit_event_end_time"
+        ],
+        "edited": [],
+        "removed": [
+            "submit_event_start",
+            "submit_event_end"
+        ]
+    },
+    "js": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000800/theme.json

@@ -0,0 +1,32 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/browse\/calendarDay",
+            "front\/browse\/calendarMonth",
+            "front\/browse\/calendarWeek",
+            "front\/events\/event",
+            "front\/events\/featured",
+            "front\/events\/featuredEvent",
+            "front\/overview\/header",
+            "front\/submit\/datesForm",
+            "front\/venue\/upcomingStream",
+            "front\/view\/eventBlock",
+            "front\/widgets\/recentReviews",
+            "front\/widgets\/upcomingEvents"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [
+            "front\/calendar.css"
+        ],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000801/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000801,
+    "name": "5.0.8 Alpha 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000802/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000802,
+    "name": "5.0.8 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000803/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000803,
+    "name": "5.0.8 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000804/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000804,
+    "name": "5.0.8 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000805/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000805,
+    "name": "5.0.8",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000900/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000900,
+    "name": "5.0.9 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000901/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000901,
+    "name": "5.0.9 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000902/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000902,
+    "name": "5.0.9 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000903/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000903,
+    "name": "5.0.9 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000904/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000904,
+    "name": "5.0.9",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000905/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000905,
+    "name": "5.0.9",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000906/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000906,
+    "name": "5.0.10 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000906/theme.json

@@ -0,0 +1,22 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/events\/event",
+            "front\/events\/featuredEvent",
+            "front\/widgets\/recentReviews",
+            "front\/widgets\/upcomingEvents"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5000907/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000907,
+    "name": "5.0.10 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000908/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000908,
+    "name": "5.0.10 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000909/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000909,
+    "name": "5.0.10 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000910/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000910,
+    "name": "5.0.10 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000911/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000911,
+    "name": "5.0.10 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000912/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000912,
+    "name": "5.0.10 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000913/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000913,
+    "name": "5.0.10 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000914/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000914,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000915/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000915,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000916/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000916,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000917/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000917,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000918/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000918,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000919/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000919,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5000920/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000920,
+    "name": "5.0.10",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001100/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001100,
+    "name": "5.0.11 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001100/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/events\/online"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5001101/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001101,
+    "name": "5.0.11 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001101/theme.json

@@ -0,0 +1,28 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/browse\/calendarMonth",
+            "front\/browse\/calendarWeek",
+            "front\/events\/event",
+            "front\/events\/featuredEvent",
+            "front\/view\/coverPhotoOverlay",
+            "front\/view\/eventBlock",
+            "front\/view\/eventStreamBlock",
+            "front\/view\/view",
+            "front\/widgets\/recentReviews",
+            "front\/widgets\/upcomingEvents"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5001102/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001102,
+    "name": "5.0.11 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001103/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001103,
+    "name": "5.0.11",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001104/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001104,
+    "name": "5.0.11",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001105/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001105,
+    "name": "5.0.11",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001200/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001200,
+    "name": "5.0.12 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": true,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": true,
+        "emailTemplates": true,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001200/emailTemplates.json

@@ -0,0 +1,7 @@
+{
+    "added": [
+        "notification_event_rsvp"
+    ],
+    "edited": [],
+    "removed": []
+}

applications/calendar/setup/upg_5001200/javascript.json

@@ -0,0 +1,15 @@
+{
+    "files": {
+        "added": [],
+        "edited": [
+            "calendar\/front\/controllers\/overview\/ips.overview.search.js",
+            "calendar\/front\/controllers\/submit\/ips.submit.dates.js"
+        ],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5001200/lang.json

@@ -0,0 +1,26 @@
+{
+    "normal": {
+        "added": [
+            "notifications__calendar_Reminders",
+            "notifications__calendar_Reminders_desc",
+            "notifications__calendar_Rsvp",
+            "notifications__calendar_Rsvp_desc",
+            "mailsub__calendar_notification_event_rsvp",
+            "email_event_rsvp",
+            "email_event_rsvp_plain",
+            "notification__event_rsvp",
+            "notification__event_rsvp_title"
+        ],
+        "edited": [
+            "notifications__calendar_Events"
+        ],
+        "removed": [
+            "notifications__calendar_Events_desc"
+        ]
+    },
+    "js": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5001200/theme.json

@@ -0,0 +1,30 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/browse\/calendarHeader",
+            "front\/browse\/dateJump",
+            "front\/events\/event",
+            "front\/events\/featuredEvent",
+            "front\/events\/searchResultsWrapper",
+            "front\/global\/subscribeMenu",
+            "front\/modcp\/approvalQueueItem",
+            "front\/overview\/header",
+            "front\/submit\/datesForm",
+            "front\/view\/eventBlock",
+            "front\/view\/reviews",
+            "front\/view\/rsvpControls"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5001201/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001201,
+    "name": "5.0.12 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001202/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001202,
+    "name": "5.0.12 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001203/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001203,
+    "name": "5.0.12",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001204/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001204,
+    "name": "5.0.12",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001300/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001300,
+    "name": "5.0.13 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001300/theme.json

@@ -0,0 +1,26 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/browse\/calendarHeader",
+            "front\/browse\/dateJump",
+            "front\/events\/searchResultsWrapper",
+            "front\/global\/subscribeMenu",
+            "front\/modcp\/approvalQueueItem",
+            "front\/overview\/header",
+            "front\/submit\/datesForm",
+            "front\/view\/rsvpControls"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/calendar/setup/upg_5001301/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001301,
+    "name": "5.0.13 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/setup/upg_5001302/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5001302,
+    "name": "5.0.13",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/calendar/sources/Event/Event.php

@@ -55,6 +55,7 @@ use IPS\Helpers\Form\Upload;
 use IPS\Helpers\Form\YesNo;
 use IPS\Http\Url;
 use IPS\Http\Url\Friendly;
+use IPS\IPS;
 use IPS\Lang;
 use IPS\Member;
 use IPS\Node\Model;
@@ -1626,7 +1627,7 @@ class Event extends Item implements Embeddable,
 		$return = array_merge( $return, parent::formElements( $item, $container ) );
 		
 		/* If we're copying we need to re-add the auto_follow form element (if comments and reviews are disabled, then we'll just remove it again below) */
-		if ( $item !== NULL and in_array( 'IPS\Content\Followable', class_implements( get_called_class() ) ) and Member::loggedIn()->member_id AND $isCopy )
+		if ( $item !== NULL and IPS::classUsesTrait( get_called_class(), Followable::class ) and Member::loggedIn()->member_id AND $isCopy )
 		{
 			array_splice( $return, -1, 0, array( 'auto_follow' => new YesNo( static::$formLangPrefix . 'auto_follow', (bool) Member::loggedIn()->auto_follow['content'], FALSE, array( 'label' => Member::loggedIn()->language()->addToStack( static::$formLangPrefix . 'auto_follow_suffix' ) ), NULL, NULL, NULL, static::$formLangPrefix . 'auto_follow' ) ) );
 		}
@@ -2003,6 +2004,8 @@ class Event extends Item implements Embeddable,
 
 		/* And claim attachments */
 		File::claimAttachments( 'calendar-event', $this->id );
+		File::claimAttachments( 'calendar-new-venue', $this->id, translatable: true );
+		
 
 		/* And expire widget caches so an event for today will show in the upcoming events widget properly */
 		$this->expireWidgetCaches();
@@ -2562,7 +2565,11 @@ class Event extends Item implements Embeddable,
 		/* Check if past events can be edited */
 		if ( $action == 'edit' and $this->hasPassed() and Settings::i()->calendar_block_past_changes )
 		{
-			return FALSE;
+			if ( static::modPermission( 'edit', $member, $this->containerWrapper() ) )
+			{
+				return true;
+			}
+			return false;
 		}
 
 		return parent::actionEnabled( $action, $member );
@@ -2760,4 +2767,42 @@ class Event extends Item implements Embeddable,
 	}
 
 	public static string $itemMenuCss = '';
+
+    /**
+     * Allow for individual classes to override and
+     * specify a primary image. Used for grid views, etc.
+     *
+     * @return File|null
+     */
+    public function primaryImage() : ?File
+    {
+        /* Cover photo first */
+        if( $coverPhoto = parent::primaryImage() )
+        {
+            return $coverPhoto;
+        }
+
+        /* Any images in the description? */
+        if( $contentImage = $this->contentImages(1) )
+        {
+            $attachType = key( $contentImage[0] );
+            try
+            {
+                return File::get( $attachType, $contentImage[0][ $attachType ] );
+            }
+            catch( Exception ){}
+        }
+
+        /* Do we have a linked album? */
+        if( $this->album and Application::appIsEnabled( 'gallery' ) )
+        {
+            try
+            {
+                return Album::load( $this->album )->primaryImage();
+            }
+            catch( OutOfRangeException ){}
+        }
+
+        return null;
+    }
 }