Merge branch 'master' into redesign-2015
Auditedf1b7fd483e7e
Actions

Description

Merge branch 'master' into redesign-2015

Details

Group Auditors

Provenance

epriestley	Authored on
epriestley	Pushed on Jun 17 2015, 2:34 AM

Parents

rP6933ee5fb86d: Don't spend ridiculous amounts of time rebuilding orderable columns
rPd16de7a82c2d: [Redesign] Spaces header colors

Branches

Unknown

Tags

Unknown

Event Timeline

epriestley committed rPf1b7fd483e7e: Merge branch 'master' into redesign-2015 (authored by epriestley).Jun 17 2015, 2:34 AM

Herald added auditors: Fakhra.Aftab, Cowboy Commits. · View Herald TranscriptJun 17 2015, 2:34 AM

btrahan accepted this commit.Jun 17 2015, 5:24 PM

Merged Changes

6933ee5fb86d Don't spend ridiculous amounts of time rebuilding orderable columns
Author
epriestley
Revisions
D13322: Don't spend ridiculous amounts of time rebuilding orderable columns
Browse Repository
No Builds
No Audits
8484adcffdf6 Cache application visibility in the request cache
Author
epriestley
Revisions
D13321: Cache application visibility in the request cache
Browse Repository
No Builds
No Audits
30c4783c426f Dramatically limit the range of failures which can cause duplicate mail
Author
epriestley
Revisions
D13320: Dramatically limit the range of failures which can cause duplicate mail
Browse Repository
No Builds
No Audits
bb7f2ea9055c Fail gracefully on bad API call when building commit mail
Author
epriestley
Revisions
D13319: Fail gracefully on bad API call when building commit mail
Browse Repository
No Builds
No Audits
42170ab151a9 Change text ADD_CC and REMOVE_CC actions
Author
eadler
Revisions
D13317: Change text ADD_CC and REMOVE_CC actions
Browse Repository
No Builds
No Audits
db9fc369ca62 Phriction - improve workflow for when user entered slug needs to be normalized.
Author
btrahan
Revisions
D13316: Phriction - improve workflow for when user entered slug needs to be normalized.
Browse Repository
No Builds
No Audits
ca8adac1eb40 Config - make "No auth providers configured" check use proper hyperlinking…
Author
btrahan
Revisions
D13315: Config - make "No auth providers configured" check use proper hyperlinking technology
Browse Repository
No Builds
No Audits
281082f4d730 Conpherence - fix a bug where users have no events
Author
btrahan
Revisions
D13314: Conpherence - fix a bug where users have no events
Browse Repository
No Builds
No Audits
a3010148e24d Mark diviner atoms as closed in search index
Author
joshuaspence
Revisions
D13297: Mark diviner atoms as closed in search index
Browse Repository
No Builds
No Audits
751162d363e6 Set icons for Diviner PHID types
Author
joshuaspence
Revisions
D13304: Set icons for Diviner PHID types
Browse Repository
No Builds
No Audits
8965c7ec9b89 Email Preferences - round out options for Projects and Phriction
Author
btrahan
Revisions
D13313: Email Preferences - round out options for Projects and Phriction
Browse Repository
No Builds
No Audits
6b7d7401ca6d Modernize Diviner
Author
joshuaspence
Revisions
D13091: Modernize Diviner
Browse Repository
No Builds
No Audits
c5c5523c1ff8 Add missing $mailer property to PhabricatorMailImplementationPHPMailerAdapter
Author
epriestley
Browse Repository
No Builds
Audited
9537f983f6c0 Added a Note Credential Type for Passphrase
Author
SalmonKiller
Revisions
D13261: Added a Note Credential Type for Passphrase
Browse Repository
No Builds
No Audits
5240ae8bd1ca Added Instance Number to Ghost Events
Author
SalmonKiller
Revisions
D13307: Added Instance Number to Ghost Events
Browse Repository
No Builds
No Audits
667897639fe2 First pass at event modal create options.
Author
lpriestley
Revisions
D13309: First pass at event modal create options.
Browse Repository
No Builds
No Audits
05066f649b6d Convert "Created By" and "Invited" inputs in Calendar search to use…
Author
lpriestley
Revisions
D13311: Convert "Created By" and "Invited" inputs in Calendar search to use `PhabricatorPeopleUserFunctionDatasource`
Browse Repository
No Builds
No Audits

Changes (66)

Path

Size

resources/

sql/

autopatches/

	20150605.diviner.edges.sql
	20150610.spaces.2.edge.sql

20150605.diviner.editPolicy.sql

	20150605.diviner.xaction.sql
	20150515.phame.post.xaction.sql

src/

__phutil_library_map__.php

applications/

audit/

constants/

PhabricatorAuditActionConstants.php

base/

PhabricatorApplication.php

calendar/

controller/

PhabricatorCalendarController.php

PhabricatorCalendarEventViewController.php

query/

PhabricatorCalendarEventSearchEngine.php

storage/

PhabricatorCalendarEvent.php

config/

check/

PhabricatorAuthSetupCheck.php

conpherence/

query/

ConpherenceThreadQuery.php

diviner/

application/

PhabricatorDivinerApplication.php

atomizer/

DivinerArticleAtomizer.php

DivinerPHPAtomizer.php

cache/

DivinerAtomCache.php

DivinerDiskCache.php

DivinerPublishCache.php

capability

DivinerDefaultEditCapability.php

controller/

DivinerAtomController.php

DivinerAtomListController.php

DivinerBookController.php

DivinerBookEditController.php

DivinerController.php

DivinerFindController.php

DivinerMainController.php

editor

DivinerLiveBookEditor.php

phid/

DivinerAtomPHIDType.php

DivinerBookPHIDType.php

publisher/

DivinerLivePublisher.php

DivinerPublisher.php

query/

DivinerAtomQuery.php

DivinerBookQuery.php

renderer/

DivinerDefaultRenderer.php

search/

DivinerAtomSearchIndexer.php

DivinerBookSearchIndexer.php

storage/

DivinerLiveBook.php

DivinerLiveSymbol.php

DivinerSchemaSpec.php

view/

DivinerBookItemView.php

workflow/

DivinerAtomizeWorkflow.php

DivinerGenerateWorkflow.php

	diviner/	capability/
	fund/	capability/

	DivinerDefaultViewCapability.php
	FundDefaultViewCapability.php

	diviner/	query/
	almanac/	query/

	DivinerLiveBookTransactionQuery.php
	AlmanacNetworkTransactionQuery.php

	diviner/	storage/
	people/	storage/

	DivinerLiveBookTransaction.php
	PhabricatorUserTransaction.php

herald/

adapter/

HeraldAdapter.php

metamta/

adapter/

PhabricatorMailImplementationPHPMailerAdapter.php

replyhandler/

PhabricatorMailTarget.php

passphrase/

controller/

PassphraseCredentialEditController.php

PassphraseCredentialViewController.php

credentialtype/

PassphraseCredentialType.php

	PassphraseNoteCredentialType.php
	PassphrasePasswordCredentialType.php

editor/

PassphraseCredentialTransactionEditor.php

phriction/

controller/

PhrictionMoveController.php

editor/

PhrictionTransactionEditor.php

storage/

PhrictionTransaction.php

project/

editor/

PhabricatorProjectTransactionEditor.php

storage/

PhabricatorProjectTransaction.php

releeph/

editor/

ReleephRequestTransactionalEditor.php

repository/

customfield/

PhabricatorCommitBranchesField.php

transactions/

editor/

PhabricatorApplicationTransactionEditor.php

infrastructure/

internationalization/

translation/

PhabricatorUSEnglishTranslation.php

query/

policy/

PhabricatorCursorPagedPolicyAwareQuery.php

PhabricatorPolicyAwareQuery.php

rPf1b7fd483e7e

View Options

resources/sql/autopatches/20150605.diviner.edges.sql

View Options

resources/sql/autopatches/20150605.diviner.editPolicy.sql

View Options

resources/sql/autopatches/20150605.diviner.xaction.sql

View Options

src/__phutil_library_map__.php

View Options

src/applications/audit/constants/PhabricatorAuditActionConstants.php

View Options

src/applications/base/PhabricatorApplication.php

View Options

src/applications/calendar/controller/PhabricatorCalendarController.php

View Options

src/applications/calendar/controller/PhabricatorCalendarEventViewController.php

View Options

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

View Options

src/applications/calendar/storage/PhabricatorCalendarEvent.php

View Options

src/applications/config/check/PhabricatorAuthSetupCheck.php

View Options

src/applications/conpherence/query/ConpherenceThreadQuery.php

View Options

src/applications/diviner/application/PhabricatorDivinerApplication.php

View Options

src/applications/diviner/atomizer/DivinerArticleAtomizer.php

View Options

src/applications/diviner/atomizer/DivinerPHPAtomizer.php

View Options

src/applications/diviner/cache/DivinerAtomCache.php

View Options

src/applications/diviner/cache/DivinerDiskCache.php

View Options

src/applications/diviner/cache/DivinerPublishCache.php

View Options

src/applications/diviner/capability/DivinerDefaultEditCapability.php

View Options

src/applications/diviner/capability/DivinerDefaultViewCapability.php

View Options

src/applications/diviner/controller/DivinerAtomController.php

View Options

src/applications/diviner/controller/DivinerAtomListController.php

View Options

src/applications/diviner/controller/DivinerBookController.php

View Options

src/applications/diviner/controller/DivinerBookEditController.php

View Options

src/applications/diviner/controller/DivinerController.php

View Options

src/applications/diviner/controller/DivinerFindController.php

View Options

src/applications/diviner/controller/DivinerMainController.php

View Options

src/applications/diviner/editor/DivinerLiveBookEditor.php

View Options

src/applications/diviner/phid/DivinerAtomPHIDType.php

View Options

src/applications/diviner/phid/DivinerBookPHIDType.php

View Options

src/applications/diviner/publisher/DivinerLivePublisher.php

View Options

src/applications/diviner/publisher/DivinerPublisher.php

View Options

src/applications/diviner/query/DivinerAtomQuery.php

View Options

src/applications/diviner/query/DivinerBookQuery.php

View Options

src/applications/diviner/query/DivinerLiveBookTransactionQuery.php

View Options

src/applications/diviner/renderer/DivinerDefaultRenderer.php

View Options

src/applications/diviner/search/DivinerAtomSearchIndexer.php

View Options

src/applications/diviner/search/DivinerBookSearchIndexer.php

View Options

src/applications/diviner/storage/DivinerLiveBook.php

View Options

src/applications/diviner/storage/DivinerLiveBookTransaction.php

View Options

src/applications/diviner/storage/DivinerLiveSymbol.php

View Options

src/applications/diviner/storage/DivinerSchemaSpec.php

View Options

src/applications/diviner/view/DivinerBookItemView.php

View Options

src/applications/diviner/workflow/DivinerAtomizeWorkflow.php

View Options

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

View Options

src/applications/herald/adapter/HeraldAdapter.php

View Options

src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php

View Options

src/applications/metamta/replyhandler/PhabricatorMailTarget.php

View Options

src/applications/passphrase/controller/PassphraseCredentialEditController.php

View Options

src/applications/passphrase/controller/PassphraseCredentialViewController.php

View Options

src/applications/passphrase/credentialtype/PassphraseCredentialType.php

View Options

src/applications/passphrase/credentialtype/PassphraseNoteCredentialType.php

View Options

src/applications/passphrase/editor/PassphraseCredentialTransactionEditor.php

View Options

src/applications/phriction/controller/PhrictionMoveController.php

View Options

src/applications/phriction/editor/PhrictionTransactionEditor.php

View Options

src/applications/phriction/storage/PhrictionTransaction.php

View Options

src/applications/project/editor/PhabricatorProjectTransactionEditor.php

View Options

src/applications/project/storage/PhabricatorProjectTransaction.php

View Options

src/applications/releeph/editor/ReleephRequestTransactionalEditor.php

View Options

src/applications/repository/customfield/PhabricatorCommitBranchesField.php

View Options

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

View Options

src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php

View Options

src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php

View Options

src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php

Merge branch 'master' into redesign-2015Auditedf1b7fd483e7eActions

Description

Details

Event Timeline

Merged Changes

Changes (66)

rPf1b7fd483e7e

resources/sql/autopatches/20150605.diviner.edges.sql

resources/sql/autopatches/20150605.diviner.editPolicy.sql

resources/sql/autopatches/20150605.diviner.xaction.sql

src/__phutil_library_map__.php

src/applications/audit/constants/PhabricatorAuditActionConstants.php

src/applications/base/PhabricatorApplication.php

src/applications/calendar/controller/PhabricatorCalendarController.php

src/applications/calendar/controller/PhabricatorCalendarEventViewController.php

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

src/applications/calendar/storage/PhabricatorCalendarEvent.php

src/applications/config/check/PhabricatorAuthSetupCheck.php

src/applications/conpherence/query/ConpherenceThreadQuery.php

src/applications/diviner/application/PhabricatorDivinerApplication.php

src/applications/diviner/atomizer/DivinerArticleAtomizer.php

src/applications/diviner/atomizer/DivinerPHPAtomizer.php

src/applications/diviner/cache/DivinerAtomCache.php

src/applications/diviner/cache/DivinerDiskCache.php

src/applications/diviner/cache/DivinerPublishCache.php

src/applications/diviner/capability/DivinerDefaultEditCapability.php

src/applications/diviner/capability/DivinerDefaultViewCapability.php

src/applications/diviner/controller/DivinerAtomController.php

src/applications/diviner/controller/DivinerAtomListController.php

src/applications/diviner/controller/DivinerBookController.php

src/applications/diviner/controller/DivinerBookEditController.php

src/applications/diviner/controller/DivinerController.php

src/applications/diviner/controller/DivinerFindController.php

src/applications/diviner/controller/DivinerMainController.php

src/applications/diviner/editor/DivinerLiveBookEditor.php

src/applications/diviner/phid/DivinerAtomPHIDType.php

src/applications/diviner/phid/DivinerBookPHIDType.php

src/applications/diviner/publisher/DivinerLivePublisher.php

src/applications/diviner/publisher/DivinerPublisher.php

src/applications/diviner/query/DivinerAtomQuery.php

src/applications/diviner/query/DivinerBookQuery.php

src/applications/diviner/query/DivinerLiveBookTransactionQuery.php

src/applications/diviner/renderer/DivinerDefaultRenderer.php

src/applications/diviner/search/DivinerAtomSearchIndexer.php

src/applications/diviner/search/DivinerBookSearchIndexer.php

src/applications/diviner/storage/DivinerLiveBook.php

src/applications/diviner/storage/DivinerLiveBookTransaction.php

src/applications/diviner/storage/DivinerLiveSymbol.php

src/applications/diviner/storage/DivinerSchemaSpec.php

src/applications/diviner/view/DivinerBookItemView.php

src/applications/diviner/workflow/DivinerAtomizeWorkflow.php

src/applications/diviner/workflow/DivinerGenerateWorkflow.php

src/applications/herald/adapter/HeraldAdapter.php

src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php

src/applications/metamta/replyhandler/PhabricatorMailTarget.php

src/applications/passphrase/controller/PassphraseCredentialEditController.php

src/applications/passphrase/controller/PassphraseCredentialViewController.php

src/applications/passphrase/credentialtype/PassphraseCredentialType.php

src/applications/passphrase/credentialtype/PassphraseNoteCredentialType.php

src/applications/passphrase/editor/PassphraseCredentialTransactionEditor.php

src/applications/phriction/controller/PhrictionMoveController.php

src/applications/phriction/editor/PhrictionTransactionEditor.php

src/applications/phriction/storage/PhrictionTransaction.php

src/applications/project/editor/PhabricatorProjectTransactionEditor.php

src/applications/project/storage/PhabricatorProjectTransaction.php

src/applications/releeph/editor/ReleephRequestTransactionalEditor.php

src/applications/repository/customfield/PhabricatorCommitBranchesField.php

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php

src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php

src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php

Merge branch 'master' into redesign-2015
Auditedf1b7fd483e7e
Actions