@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
Git did not 3-way merge this quite correctly.
+38
-19
+38
-19
resources/celerity/map.php
+38
-19
resources/celerity/map.php
···
7
7
return array(
8
8
'names' =>
9
9
array(
10
-
'core.pkg.css' => '283dd8ce',
10
+
'core.pkg.css' => '7c4a7aa4',
11
11
'core.pkg.js' => 'b2ed04a2',
12
12
'darkconsole.pkg.js' => 'ca8671ce',
13
13
'differential.pkg.css' => '4b8686e3',
14
14
'differential.pkg.js' => '36bec171',
15
15
'diffusion.pkg.css' => '3783278d',
16
16
'diffusion.pkg.js' => '077e3ad0',
17
-
'javelin.pkg.js' => 'f5308946',
17
+
'javelin.pkg.js' => 'd4d2c5ae',
18
18
'maniphest.pkg.css' => 'f1887d71',
19
19
'maniphest.pkg.js' => '2fe8af22',
20
20
'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
···
30
30
'rsrc/css/aphront/panel-view.css' => '5846dfa2',
31
31
'rsrc/css/aphront/phabricator-nav-view.css' => '80e60fc1',
32
32
'rsrc/css/aphront/request-failure-view.css' => 'da14df31',
33
-
'rsrc/css/aphront/table-view.css' => '52becc92',
33
+
'rsrc/css/aphront/table-view.css' => '88e80148',
34
34
'rsrc/css/aphront/tokenizer.css' => '36903077',
35
35
'rsrc/css/aphront/tooltip.css' => '9c90229d',
36
36
'rsrc/css/aphront/transaction.css' => 'ce491938',
37
37
'rsrc/css/aphront/two-column.css' => '16ab3ad2',
38
-
'rsrc/css/aphront/typeahead.css' => '271456a1',
38
+
'rsrc/css/aphront/typeahead.css' => '466ac215',
39
39
'rsrc/css/application/auth/auth.css' => '1e655982',
40
40
'rsrc/css/application/base/main-menu-view.css' => '0207239c',
41
41
'rsrc/css/application/base/notification-menu.css' => '99ffef72',
···
221
221
'rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js' => '5f850b5c',
222
222
'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '84f34ab1',
223
223
'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => 'a79b75a4',
224
-
'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => 'f778a573',
224
+
'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '66815d9c',
225
225
'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => '62e18640',
226
226
'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js' => 'cdde23f1',
227
227
'rsrc/externals/raphael/g.raphael.js' => '40dde778',
···
372
372
'rsrc/js/application/differential/behavior-show-more.js' => 'dd7e8ef5',
373
373
'rsrc/js/application/differential/behavior-toggle-files.js' => 'ca3f91eb',
374
374
'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
375
+
'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => '5afdb2f8',
375
376
'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'be81801d',
376
377
'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
377
378
'rsrc/js/application/diffusion/behavior-commit-graph.js' => 'f7f1289f',
378
379
'rsrc/js/application/diffusion/behavior-jump-to.js' => '9db3d160',
379
380
'rsrc/js/application/diffusion/behavior-load-blame.js' => '42126667',
381
+
'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
380
382
'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => '2b228192',
381
383
'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => 'e5822781',
382
384
'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
···
498
500
'aphront-pager-view-css' => '2e3539af',
499
501
'aphront-panel-view-css' => '5846dfa2',
500
502
'aphront-request-failure-view-css' => 'da14df31',
501
-
'aphront-table-view-css' => '52becc92',
503
+
'aphront-table-view-css' => '88e80148',
502
504
'aphront-tokenizer-control-css' => '36903077',
503
505
'aphront-tooltip-css' => '9c90229d',
504
506
'aphront-two-column-view-css' => '16ab3ad2',
505
-
'aphront-typeahead-control-css' => '271456a1',
507
+
'aphront-typeahead-control-css' => '466ac215',
506
508
'auth-css' => '1e655982',
507
509
'config-options-css' => '7fedf08b',
508
510
'conpherence-menu-css' => '561348ac',
···
566
568
'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
567
569
'javelin-behavior-diffusion-commit-graph' => 'f7f1289f',
568
570
'javelin-behavior-diffusion-jump-to' => '9db3d160',
571
+
'javelin-behavior-diffusion-locate-file' => '6d3e1947',
569
572
'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
570
573
'javelin-behavior-doorkeeper-tag' => 'e5822781',
571
574
'javelin-behavior-error-log' => 'a5d7cf86',
···
639
642
'javelin-behavior-workflow' => '0a3f3021',
640
643
'javelin-color' => '7e41274a',
641
644
'javelin-cookie' => '6b3dcf44',
645
+
'javelin-diffusion-locate-file-source' => '5afdb2f8',
642
646
'javelin-dom' => '07d99a3d',
643
647
'javelin-dynval' => 'f6555212',
644
648
'javelin-event' => '49a59508',
···
662
666
'javelin-typeahead-composite-source' => '84f34ab1',
663
667
'javelin-typeahead-normalizer' => '5f850b5c',
664
668
'javelin-typeahead-ondemand-source' => 'a79b75a4',
665
-
'javelin-typeahead-preloaded-source' => 'f778a573',
669
+
'javelin-typeahead-preloaded-source' => '66815d9c',
666
670
'javelin-typeahead-source' => '62e18640',
667
671
'javelin-typeahead-static-source' => 'cdde23f1',
668
672
'javelin-uri' => 'd9a9b862',
···
1240
1244
2 => 'javelin-vector',
1241
1245
3 => 'javelin-dom',
1242
1246
),
1247
+
'5afdb2f8' =>
1248
+
array(
1249
+
0 => 'javelin-install',
1250
+
1 => 'javelin-dom',
1251
+
2 => 'javelin-typeahead-preloaded-source',
1252
+
3 => 'javelin-util',
1253
+
),
1243
1254
'5bc2cb21' =>
1244
1255
array(
1245
1256
0 => 'javelin-behavior',
···
1264
1275
2 => 'javelin-util',
1265
1276
3 => 'phabricator-shaped-request',
1266
1277
),
1278
+
'7319e029' =>
1279
+
array(
1280
+
0 => 'javelin-behavior',
1281
+
1 => 'javelin-dom',
1282
+
),
1267
1283
'62e18640' =>
1268
1284
array(
1269
1285
0 => 'javelin-install',
···
1283
1299
1 => 'javelin-dom',
1284
1300
2 => 'javelin-vector',
1285
1301
),
1302
+
'66815d9c' =>
1303
+
array(
1304
+
0 => 'javelin-install',
1305
+
1 => 'javelin-util',
1306
+
2 => 'javelin-request',
1307
+
3 => 'javelin-typeahead-source',
1308
+
),
1286
1309
'6b3dcf44' =>
1287
1310
array(
1288
1311
0 => 'javelin-install',
···
1293
1316
0 => 'javelin-install',
1294
1317
1 => 'javelin-util',
1295
1318
),
1296
-
'71755c79' =>
1319
+
'6d3e1947' =>
1297
1320
array(
1298
1321
0 => 'javelin-behavior',
1299
-
1 => 'javelin-stratcom',
1322
+
1 => 'javelin-diffusion-locate-file-source',
1300
1323
2 => 'javelin-dom',
1324
+
3 => 'javelin-typeahead',
1325
+
4 => 'javelin-uri',
1301
1326
),
1302
-
'7319e029' =>
1327
+
'71755c79' =>
1303
1328
array(
1304
1329
0 => 'javelin-behavior',
1305
-
1 => 'javelin-dom',
1330
+
1 => 'javelin-stratcom',
1331
+
2 => 'javelin-dom',
1306
1332
),
1307
1333
'76f4ebed' =>
1308
1334
array(
···
1970
1996
1 => 'javelin-dom',
1971
1997
2 => 'javelin-util',
1972
1998
3 => 'phabricator-shaped-request',
1973
-
),
1974
-
'f778a573' =>
1975
-
array(
1976
-
0 => 'javelin-install',
1977
-
1 => 'javelin-util',
1978
-
2 => 'javelin-request',
1979
-
3 => 'javelin-typeahead-source',
1980
1999
),
1981
2000
'f7f1289f' =>
1982
2001
array(