@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Added Instance Number to Ghost Events

Summary: Closes T8460.

Test Plan: In the Calendar application, create a recursive event. After editing a recursion of the event, verify that the "Recurrence of Event" property is of the form "<event sequence number> of <parent event>".

Reviewers: lpriestley, epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Maniphest Tasks: T8460

Differential Revision: https://secure.phabricator.com/D13307

authored by

Paul Kassianik and committed by
epriestley
5240ae8b 66789763

+22 -20
+19 -19
resources/celerity/map.php
··· 444 444 'rsrc/js/core/behavior-device.js' => 'a205cf28', 445 445 'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '6d49590e', 446 446 'rsrc/js/core/behavior-error-log.js' => '6882e80a', 447 - 'rsrc/js/core/behavior-fancy-datepicker.js' => '510b5809', 447 + 'rsrc/js/core/behavior-fancy-datepicker.js' => 'ea5cec5d', 448 448 'rsrc/js/core/behavior-file-tree.js' => '88236f00', 449 449 'rsrc/js/core/behavior-form.js' => '5c54cbf3', 450 450 'rsrc/js/core/behavior-gesture.js' => '3ab51e2c', ··· 468 468 'rsrc/js/core/behavior-scrollbar.js' => '834a1173', 469 469 'rsrc/js/core/behavior-search-typeahead.js' => '048330fa', 470 470 'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6', 471 - 'rsrc/js/core/behavior-time-typeahead.js' => '8bfbb401', 471 + 'rsrc/js/core/behavior-time-typeahead.js' => 'f80d6bf0', 472 472 'rsrc/js/core/behavior-toggle-class.js' => '5d7c9f33', 473 473 'rsrc/js/core/behavior-tokenizer.js' => 'b3a4b884', 474 474 'rsrc/js/core/behavior-tooltip.js' => '3ee3408b', ··· 577 577 'javelin-behavior-durable-column' => 'c72aa091', 578 578 'javelin-behavior-error-log' => '6882e80a', 579 579 'javelin-behavior-event-all-day' => '38dcf3c8', 580 - 'javelin-behavior-fancy-datepicker' => '510b5809', 580 + 'javelin-behavior-fancy-datepicker' => 'ea5cec5d', 581 581 'javelin-behavior-global-drag-and-drop' => 'c8e57404', 582 582 'javelin-behavior-herald-rule-editor' => '7ebaeed3', 583 583 'javelin-behavior-high-security-warning' => 'a464fe03', ··· 645 645 'javelin-behavior-slowvote-embed' => '887ad43f', 646 646 'javelin-behavior-stripe-payment-form' => '3f5d6dbf', 647 647 'javelin-behavior-test-payment-form' => 'fc91ab6c', 648 - 'javelin-behavior-time-typeahead' => '8bfbb401', 648 + 'javelin-behavior-time-typeahead' => 'f80d6bf0', 649 649 'javelin-behavior-toggle-class' => '5d7c9f33', 650 650 'javelin-behavior-typeahead-browse' => '635de1ec', 651 651 'javelin-behavior-typeahead-search' => '93d0c9e3', ··· 1168 1168 'javelin-typeahead-source', 1169 1169 'javelin-util', 1170 1170 ), 1171 - '510b5809' => array( 1172 - 'javelin-behavior', 1173 - 'javelin-util', 1174 - 'javelin-dom', 1175 - 'javelin-stratcom', 1176 - 'javelin-vector', 1177 - ), 1178 1171 '519705ea' => array( 1179 1172 'javelin-install', 1180 1173 'javelin-dom', ··· 1502 1495 'javelin-request', 1503 1496 'javelin-typeahead-source', 1504 1497 ), 1505 - '8bfbb401' => array( 1506 - 'javelin-behavior', 1507 - 'javelin-util', 1508 - 'javelin-dom', 1509 - 'javelin-stratcom', 1510 - 'javelin-vector', 1511 - 'javelin-typeahead-static-source', 1512 - ), 1513 1498 '8ce821c5' => array( 1514 1499 'phabricator-notification', 1515 1500 'javelin-stratcom', ··· 1950 1935 'javelin-dom', 1951 1936 'phabricator-draggable-list', 1952 1937 ), 1938 + 'ea5cec5d' => array( 1939 + 'javelin-behavior', 1940 + 'javelin-util', 1941 + 'javelin-dom', 1942 + 'javelin-stratcom', 1943 + 'javelin-vector', 1944 + ), 1953 1945 'ea681761' => array( 1954 1946 'javelin-behavior', 1955 1947 'javelin-aphlict', ··· 1994 1986 'javelin-request', 1995 1987 'javelin-typeahead-ondemand-source', 1996 1988 'javelin-util', 1989 + ), 1990 + 'f80d6bf0' => array( 1991 + 'javelin-behavior', 1992 + 'javelin-util', 1993 + 'javelin-dom', 1994 + 'javelin-stratcom', 1995 + 'javelin-vector', 1996 + 'javelin-typeahead-static-source', 1997 1997 ), 1998 1998 'f829edb3' => array( 1999 1999 'javelin-view',
+3 -1
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
··· 291 291 if ($event->getInstanceOfEventPHID()) { 292 292 $properties->addProperty( 293 293 pht('Recurrence of Event'), 294 - $viewer->renderHandle($event->getInstanceOfEventPHID())); 294 + pht('%s of %s', 295 + $event->getSequenceIndex(), 296 + $viewer->renderHandle($event->getInstanceOfEventPHID())->render())); 295 297 } 296 298 } 297 299