@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
Revert "Fix editing Conpherence rooms on mobile"
Summary:
This reverts commit fd6118bfa601c1f48923cbe3f5d6bab61d5b36ab.
Closes T16040
Reopens T15513
Test Plan:
Write text in a Conpherence room and press Enter to send the text.
Test again, as non-participant, on a public chat. Still works.
Reviewers: O1 Blessed Committers, valerio.bozzolan
Reviewed By: O1 Blessed Committers, valerio.bozzolan
Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno
Maniphest Tasks: T16040, T15513
Differential Revision: https://we.phorge.it/D25969
+24
-24
+14
-14
resources/celerity/map.php
+14
-14
resources/celerity/map.php
···
10
10
'conpherence.pkg.css' => '3144a5e2',
11
11
'conpherence.pkg.js' => '020aebcf',
12
12
'core.pkg.css' => '10815c8e',
13
-
'core.pkg.js' => '813d8cbd',
13
+
'core.pkg.js' => '086da722',
14
14
'dark-console.pkg.js' => '187792c2',
15
15
'differential.pkg.css' => '91ac6214',
16
16
'differential.pkg.js' => '46fcb3af',
···
364
364
'rsrc/js/application/calendar/behavior-event-all-day.js' => '0b1bc990',
365
365
'rsrc/js/application/calendar/behavior-month-view.js' => '158c64e0',
366
366
'rsrc/js/application/config/behavior-reorder-fields.js' => '2539f834',
367
-
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'b314366e',
367
+
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'aec8e38c',
368
368
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '91befbcc',
369
369
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'fa6f30b2',
370
370
'rsrc/js/application/conpherence/behavior-menu.js' => '8c2ed2bf',
···
555
555
'conpherence-message-pane-css' => '25e1e98a',
556
556
'conpherence-notification-css' => '85c48def',
557
557
'conpherence-participant-pane-css' => '69e0058a',
558
-
'conpherence-thread-manager' => 'b314366e',
558
+
'conpherence-thread-manager' => 'aec8e38c',
559
559
'conpherence-transaction-css' => '3a3f5e7e',
560
560
'd3' => 'e97b4b78',
561
561
'diff-tree-view-css' => 'e2d3e222',
···
1885
1885
'javelin-typeahead-ondemand-source',
1886
1886
'javelin-util',
1887
1887
),
1888
-
'b105a3a6' => array(
1889
-
'javelin-behavior',
1890
-
'javelin-stratcom',
1891
-
'javelin-dom',
1892
-
),
1893
-
'b26a41e4' => array(
1894
-
'javelin-behavior',
1895
-
'javelin-stratcom',
1896
-
'javelin-dom',
1897
-
),
1898
-
'b314366e' => array(
1888
+
'aec8e38c' => array(
1899
1889
'javelin-dom',
1900
1890
'javelin-util',
1901
1891
'javelin-stratcom',
···
1905
1895
'javelin-router',
1906
1896
'javelin-behavior-device',
1907
1897
'javelin-vector',
1898
+
),
1899
+
'b105a3a6' => array(
1900
+
'javelin-behavior',
1901
+
'javelin-stratcom',
1902
+
'javelin-dom',
1903
+
),
1904
+
'b26a41e4' => array(
1905
+
'javelin-behavior',
1906
+
'javelin-stratcom',
1907
+
'javelin-dom',
1908
1908
),
1909
1909
'b347a301' => array(
1910
1910
'javelin-behavior',
+1
-1
src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+1
-1
src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+2
-2
src/applications/conpherence/controller/ConpherenceController.php
+2
-2
src/applications/conpherence/controller/ConpherenceController.php
···
29
29
->setName(pht('Edit Room'))
30
30
->setType(PHUIListItemView::TYPE_LINK)
31
31
->setHref(
32
-
$this->getApplicationURI('edit/'.$conpherence->getID()).'/')
32
+
$this->getApplicationURI('update/'.$conpherence->getID()).'/')
33
33
->setWorkflow(true));
34
34
35
35
$nav->addMenuItem(
···
135
135
136
136
if (!$participating) {
137
137
$action = ConpherenceUpdateActions::JOIN_ROOM;
138
-
$uri = $this->getApplicationURI("edit/{$id}/");
138
+
$uri = $this->getApplicationURI("update/{$id}/");
139
139
$button = phutil_tag(
140
140
'button',
141
141
array(
+1
-1
src/applications/conpherence/controller/ConpherenceParticipantController.php
+1
-1
src/applications/conpherence/controller/ConpherenceParticipantController.php
···
24
24
return new Aphront404Response();
25
25
}
26
26
27
-
$uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
27
+
$uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
28
28
$content = id(new ConpherenceParticipantView())
29
29
->setViewer($this->getViewer())
30
30
->setConpherence($conpherence)
+2
-2
src/applications/conpherence/controller/ConpherenceUpdateController.php
+2
-2
src/applications/conpherence/controller/ConpherenceUpdateController.php
···
204
204
$dialog
205
205
->setUser($user)
206
206
->setWidth(AphrontDialogView::WIDTH_FORM)
207
-
->setSubmitURI($this->getApplicationURI('edit/'.$conpherence_id.'/'))
207
+
->setSubmitURI($this->getApplicationURI('update/'.$conpherence_id.'/'))
208
208
->addSubmitButton()
209
209
->addCancelButton($this->getApplicationURI($conpherence->getID().'/'));
210
210
···
373
373
$rendered_transactions = idx($data, 'transactions');
374
374
$new_latest_transaction_id = idx($data, 'latest_transaction_id');
375
375
376
-
$update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
376
+
$update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
377
377
$nav_item = null;
378
378
$header = null;
379
379
$people_widget = null;
+1
-1
src/applications/conpherence/controller/ConpherenceViewController.php
+1
-1
src/applications/conpherence/controller/ConpherenceViewController.php
···
147
147
$draft = PhabricatorDraft::newFromUserAndKey(
148
148
$user,
149
149
$conpherence->getPHID());
150
-
$update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
150
+
$update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
151
151
152
152
if ($user->isLoggedIn()) {
153
153
$this->initBehavior('conpherence-pontificate');
+2
-2
src/applications/conpherence/view/ConpherenceDurableColumnView.php
+2
-2
src/applications/conpherence/view/ConpherenceDurableColumnView.php
···
356
356
$actions[] = array(
357
357
'name' => pht('Add Participants'),
358
358
'disabled' => !$can_edit,
359
-
'href' => '/conpherence/edit/'.$conpherence->getID().'/',
359
+
'href' => '/conpherence/update/'.$conpherence->getID().'/',
360
360
'icon' => 'fa-plus',
361
361
'key' => ConpherenceUpdateActions::ADD_PERSON,
362
362
);
···
457
457
$this->getUser(),
458
458
array(
459
459
'method' => 'POST',
460
-
'action' => '/conpherence/edit/'.$id.'/',
460
+
'action' => '/conpherence/update/'.$id.'/',
461
461
'sigil' => 'conpherence-message-form',
462
462
),
463
463
array(
+1
-1
webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
+1
-1
webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js