Skip to content

Commit 53ef057

Browse files
author
epriestley
committed
Merge branch 'master' into redesign-2015
2 parents b3523ad + f87ffc4 commit 53ef057

File tree

353 files changed

+3297
-863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+3297
-863
lines changed

‎resources/celerity/map.php

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
'rsrc/css/diviner/diviner-shared.css' => '38813222',
115115
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
116116
'rsrc/css/font/font-lato.css' => '5f05d817',
117-
'rsrc/css/font/font-slabo.css' => '7a85ea13',
117+
'rsrc/css/font/font-slabo.css' => '1f520937',
118118
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
119119
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
120120
'rsrc/css/layout/phabricator-hovercard-view.css' => '0d665853',
@@ -370,10 +370,10 @@
370370
'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => 'e5822781',
371371
'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
372372
'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
373-
'rsrc/js/application/herald/HeraldRuleEditor.js' => '271ffdd7',
373+
'rsrc/js/application/herald/HeraldRuleEditor.js' => 'b2cae298',
374374
'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
375375
'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
376-
'rsrc/js/application/maniphest/behavior-batch-editor.js' => 'f5d1233b',
376+
'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
377377
'rsrc/js/application/maniphest/behavior-batch-selector.js' => '7b98d7c5',
378378
'rsrc/js/application/maniphest/behavior-line-chart.js' => '88f0c5b3',
379379
'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
@@ -390,7 +390,7 @@
390390
'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '3f5d6dbf',
391391
'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'fc91ab6c',
392392
'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
393-
'rsrc/js/application/policy/behavior-policy-control.js' => '9a340b3d',
393+
'rsrc/js/application/policy/behavior-policy-control.js' => '7d470398',
394394
'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
395395
'rsrc/js/application/ponder/behavior-votebox.js' => '4e9b766b',
396396
'rsrc/js/application/projects/behavior-project-boards.js' => 'ba4fa35c',
@@ -522,11 +522,11 @@
522522
'diviner-shared-css' => '38813222',
523523
'font-fontawesome' => 'e2e712fe',
524524
'font-lato' => '5f05d817',
525-
'font-slabo' => '7a85ea13',
525+
'font-slabo' => '1f520937',
526526
'global-drag-and-drop-css' => '697324ad',
527527
'harbormaster-css' => '49d64eb4',
528528
'herald-css' => '826075fa',
529-
'herald-rule-editor' => '271ffdd7',
529+
'herald-rule-editor' => 'b2cae298',
530530
'herald-test-css' => '778b008e',
531531
'inline-comment-summary-css' => '51efda3a',
532532
'javelin-aphlict' => '5359e785',
@@ -585,7 +585,7 @@
585585
'javelin-behavior-lightbox-attachments' => 'f8ba29d7',
586586
'javelin-behavior-line-chart' => '88f0c5b3',
587587
'javelin-behavior-load-blame' => '42126667',
588-
'javelin-behavior-maniphest-batch-editor' => 'f5d1233b',
588+
'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
589589
'javelin-behavior-maniphest-batch-selector' => '7b98d7c5',
590590
'javelin-behavior-maniphest-list-editor' => 'a9f88de2',
591591
'javelin-behavior-maniphest-subpriority-editor' => '84845b5b',
@@ -622,7 +622,7 @@
622622
'javelin-behavior-pholio-mock-view' => 'fbe497e7',
623623
'javelin-behavior-phui-dropdown-menu' => '54733475',
624624
'javelin-behavior-phui-object-box-tabs' => '2bfa2836',
625-
'javelin-behavior-policy-control' => '9a340b3d',
625+
'javelin-behavior-policy-control' => '7d470398',
626626
'javelin-behavior-policy-rule-editor' => '5e9f347c',
627627
'javelin-behavior-ponder-votebox' => '4e9b766b',
628628
'javelin-behavior-project-boards' => 'ba4fa35c',
@@ -973,6 +973,9 @@
973973
'javelin-dom',
974974
'javelin-reactor-dom',
975975
),
976+
'1f520937' => array(
977+
'phui-fontkit-css',
978+
),
976979
'2035b9cb' => array(
977980
'javelin-behavior',
978981
'javelin-dom',
@@ -1010,15 +1013,6 @@
10101013
'phabricator-drag-and-drop-file-upload',
10111014
'phabricator-draggable-list',
10121015
),
1013-
'271ffdd7' => array(
1014-
'multirow-row-manager',
1015-
'javelin-install',
1016-
'javelin-util',
1017-
'javelin-dom',
1018-
'javelin-stratcom',
1019-
'javelin-json',
1020-
'phabricator-prefab',
1021-
),
10221016
'2818f5ce' => array(
10231017
'javelin-install',
10241018
'javelin-util',
@@ -1414,6 +1408,14 @@
14141408
'javelin-util',
14151409
'phabricator-busy',
14161410
),
1411+
'782ab6e7' => array(
1412+
'javelin-behavior',
1413+
'javelin-dom',
1414+
'javelin-util',
1415+
'phabricator-prefab',
1416+
'multirow-row-manager',
1417+
'javelin-json',
1418+
),
14171419
'7927a7d3' => array(
14181420
'javelin-behavior',
14191421
'javelin-quicksand',
@@ -1422,9 +1424,6 @@
14221424
'owners-path-editor',
14231425
'javelin-behavior',
14241426
),
1425-
'7a85ea13' => array(
1426-
'phui-fontkit-css',
1427-
),
14281427
'7b98d7c5' => array(
14291428
'javelin-behavior',
14301429
'javelin-dom',
@@ -1437,6 +1436,15 @@
14371436
'javelin-request',
14381437
'javelin-router',
14391438
),
1439+
'7d470398' => array(
1440+
'javelin-behavior',
1441+
'javelin-dom',
1442+
'javelin-util',
1443+
'phuix-dropdown-menu',
1444+
'phuix-action-list-view',
1445+
'phuix-action-view',
1446+
'javelin-workflow',
1447+
),
14401448
'7e41274a' => array(
14411449
'javelin-install',
14421450
),
@@ -1582,15 +1590,6 @@
15821590
'javelin-dom',
15831591
'javelin-reactor-dom',
15841592
),
1585-
'9a340b3d' => array(
1586-
'javelin-behavior',
1587-
'javelin-dom',
1588-
'javelin-util',
1589-
'phuix-dropdown-menu',
1590-
'phuix-action-list-view',
1591-
'phuix-action-view',
1592-
'javelin-workflow',
1593-
),
15941593
'9f36c42d' => array(
15951594
'javelin-behavior',
15961595
'javelin-stratcom',
@@ -1707,6 +1706,15 @@
17071706
'javelin-uri',
17081707
'javelin-request',
17091708
),
1709+
'b2cae298' => array(
1710+
'multirow-row-manager',
1711+
'javelin-install',
1712+
'javelin-util',
1713+
'javelin-dom',
1714+
'javelin-stratcom',
1715+
'javelin-json',
1716+
'phabricator-prefab',
1717+
),
17101718
'b3a4b884' => array(
17111719
'javelin-behavior',
17121720
'phabricator-prefab',
@@ -1970,14 +1978,6 @@
19701978
'javelin-request',
19711979
'phabricator-keyboard-shortcut',
19721980
),
1973-
'f5d1233b' => array(
1974-
'javelin-behavior',
1975-
'javelin-dom',
1976-
'javelin-util',
1977-
'phabricator-prefab',
1978-
'multirow-row-manager',
1979-
'javelin-json',
1980-
),
19811981
'f6555212' => array(
19821982
'javelin-install',
19831983
'javelin-reactornode',

‎resources/sql/autopatches/20150609.spaces.1.pholio.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE {$NAMESPACE}_pholio.pholio_mock
2+
ADD spacePHID VARBINARY(64);

‎resources/sql/autopatches/20150609.spaces.2.maniphest.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE {$NAMESPACE}_maniphest.maniphest_task
2+
ADD spacePHID VARBINARY(64);

‎resources/sql/autopatches/20150610.spaces.1.desc.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE {$NAMESPACE}_spaces.spaces_namespace
2+
ADD description LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL;

‎resources/sql/autopatches/20150610.spaces.2.edge.sql

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
CREATE TABLE {$NAMESPACE}_spaces.edge (
2+
src VARBINARY(64) NOT NULL,
3+
type INT UNSIGNED NOT NULL,
4+
dst VARBINARY(64) NOT NULL,
5+
dateCreated INT UNSIGNED NOT NULL,
6+
seq INT UNSIGNED NOT NULL,
7+
dataID INT UNSIGNED,
8+
PRIMARY KEY (src, type, dst),
9+
KEY `src` (src, type, dateCreated, seq),
10+
UNIQUE KEY `key_dst` (dst, type, src)
11+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
12+
13+
CREATE TABLE {$NAMESPACE}_spaces.edgedata (
14+
id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
15+
data LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT}
16+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

‎resources/sql/autopatches/20150610.spaces.3.archive.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE {$NAMESPACE}_spaces.spaces_namespace
2+
ADD isArchived BOOL NOT NULL;

‎resources/sql/autopatches/20150611.spaces.1.mailxaction.sql

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
CREATE TABLE {$NAMESPACE}_metamta.metamta_applicationemailtransaction (
2+
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
3+
phid VARBINARY(64) NOT NULL,
4+
authorPHID VARBINARY(64) NOT NULL,
5+
objectPHID VARBINARY(64) NOT NULL,
6+
viewPolicy VARBINARY(64) NOT NULL,
7+
editPolicy VARBINARY(64) NOT NULL,
8+
commentPHID VARBINARY(64) DEFAULT NULL,
9+
commentVersion INT UNSIGNED NOT NULL,
10+
transactionType VARCHAR(32) COLLATE {$COLLATE_TEXT} NOT NULL,
11+
oldValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
12+
newValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
13+
contentSource LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
14+
metadata LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
15+
dateCreated INT UNSIGNED NOT NULL,
16+
dateModified INT UNSIGNED NOT NULL,
17+
UNIQUE KEY `key_phid` (`phid`),
18+
KEY `key_object` (`objectPHID`)
19+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};

‎resources/sql/autopatches/20150611.spaces.2.appmail.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE {$NAMESPACE}_metamta.metamta_applicationemail
2+
ADD spacePHID VARBINARY(64);

‎resources/sql/patches/20131121.repocredentials.2.mig.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
if ($proto == 'http' || $proto == 'https' || $proto == 'svn') {
2727
$username = $repository->getDetail('http-login');
2828
$secret = $repository->getDetail('http-pass');
29-
$type = PassphraseCredentialTypePassword::CREDENTIAL_TYPE;
29+
$type = PassphrasePasswordCredentialType::CREDENTIAL_TYPE;
3030
} else {
3131
$username = $repository->getDetail('ssh-login');
3232
if (!$username) {
@@ -42,10 +42,10 @@
4242
$file = $repository->getDetail('ssh-keyfile');
4343
if ($file) {
4444
$secret = $file;
45-
$type = PassphraseCredentialTypeSSHPrivateKeyFile::CREDENTIAL_TYPE;
45+
$type = PassphraseSSHPrivateKeyFileCredentialType::CREDENTIAL_TYPE;
4646
} else {
4747
$secret = $repository->getDetail('ssh-key');
48-
$type = PassphraseCredentialTypeSSHPrivateKeyText::CREDENTIAL_TYPE;
48+
$type = PassphraseSSHPrivateKeyTextCredentialType::CREDENTIAL_TYPE;
4949
}
5050
}
5151

0 commit comments

Comments
 (0)