Merge branch 'master' into phutil_tag

(Synchronizing.)

Author: epriestley

conf/default.conf.php

@@ -839,6 +839,9 @@
   // Should Phabricator show beta applications on the homepage
   'phabricator.show-beta-applications' => false,
 
+  // Contains a list of uninstalled applications
+   'phabricator.uninstalled-applications' => array(),
+
 // -- Files ----------------------------------------------------------------- //
 
   // Lists which uploaded file types may be viewed in the browser. If a file

resources/sprite/conpher_1x/calendar_off.png

@@ -0,0 +1,81 @@
+{
+  "version" : 1,
+  "sprites" : {
+    "conpher_calendar_off"     : {
+      "name" : "conpher_calendar_off",
+      "rule" : ".conpher_calendar_off",
+      "hash" : "a8228ab90fd90f4c2500d9285179bf26"
+    },
+    "conpher_calendar_on"      : {
+      "name" : "conpher_calendar_on",
+      "rule" : ".conpher_calendar_on, .device-desktop .conpher_calendar_off:hover ",
+      "hash" : "931243bc3c414782ddb2d1d9607908ba"
+    },
+    "conpher_conversation_off" : {
+      "name" : "conpher_conversation_off",
+      "rule" : ".conpher_conversation_off",
+      "hash" : "931abb0377898297a9a603a6d280b977"
+    },
+    "conpher_conversation_on"  : {
+      "name" : "conpher_conversation_on",
+      "rule" : ".conpher_conversation_on, .device-desktop .conpher_conversation_off:hover ",
+      "hash" : "0b8a39dc5019dac1975b7be2ca0ccbfa"
+    },
+    "conpher_files_off"        : {
+      "name" : "conpher_files_off",
+      "rule" : ".conpher_files_off",
+      "hash" : "de1aee01b9b47b354e6ac280ae68bae1"
+    },
+    "conpher_files_on"         : {
+      "name" : "conpher_files_on",
+      "rule" : ".conpher_files_on, .device-desktop .conpher_files_off:hover ",
+      "hash" : "9ccbbd5e86fd4ec87a11aee0c9ec8c60"
+    },
+    "conpher_list_off"         : {
+      "name" : "conpher_list_off",
+      "rule" : ".conpher_list_off",
+      "hash" : "2611311d0c2aec04416433be74d3a30e"
+    },
+    "conpher_list_on"          : {
+      "name" : "conpher_list_on",
+      "rule" : ".conpher_list_on, .device-desktop .conpher_list_off:hover ",
+      "hash" : "cee6de0301c84b0d195282642642afa0"
+    },
+    "conpher_more_off"         : {
+      "name" : "conpher_more_off",
+      "rule" : ".conpher_more_off",
+      "hash" : "3b7099bdde20a13864b48552b11e92c3"
+    },
+    "conpher_more_on"          : {
+      "name" : "conpher_more_on",
+      "rule" : ".conpher_more_on, .device-desktop .conpher_more_off:hover ",
+      "hash" : "b146f0cff9c2e5f0b57f7ebcfe0704d3"
+    },
+    "conpher_people_off"       : {
+      "name" : "conpher_people_off",
+      "rule" : ".conpher_people_off",
+      "hash" : "641a6a21aa32a12416e85caf8a22e340"
+    },
+    "conpher_people_on"        : {
+      "name" : "conpher_people_on",
+      "rule" : ".conpher_people_on, .device-desktop .conpher_people_off:hover ",
+      "hash" : "f13745fd7036564eefb1c0ebc3502a92"
+    },
+    "conpher_settings_off"     : {
+      "name" : "conpher_settings_off",
+      "rule" : ".conpher_settings_off",
+      "hash" : "aa9ab000d9e33e3c50c2fe70367f30b4"
+    },
+    "conpher_settings_on"      : {
+      "name" : "conpher_settings_on",
+      "rule" : ".conpher_settings_on, .device-desktop .conpher_settings_off:hover ",
+      "hash" : "a5fe22965997f9559800ca7db5ea32c8"
+    }
+  },
+  "scales"  : [
+    1,
+    2
+  ],
+  "header"  : "\/**\n * @provides sprite-conpher-css\n * @generated\n *\/\n\n.sprite-conpher {\n  background-image: url(\/rsrc\/image\/sprite-conpher.png);\n  background-repeat: no-repeat;\n}\n\n@media\nonly screen and (min-device-pixel-ratio: 1.5),\nonly screen and (-webkit-min-device-pixel-ratio: 1.5) {\n  .sprite-conpher {\n    background-image: url(\/rsrc\/image\/sprite-conpher-X2.png);\n    background-size: {X}px {Y}px;\n  }\n}\n",
+  "type"    : "standard"
+}

resources/sprite/conpher_1x/calendar_on.png

@@ -30,6 +30,7 @@
   'icon' => $generator->buildIconSheet(),
   'menu' => $generator->buildMenuSheet(),
   'apps' => $generator->buildAppsSheet(),
+  'conph' => $generator->buildConpherenceSheet(),
   'apps-large' => $generator->buildAppsLargeSheet(),
 // TODO: @chad: should we actually remove this?
 //  'apps-xlarge' => $generator->buildAppsXLargeSheet(),