archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into redesign-2015

Browse Source
This commit is contained in:
epriestley
2015-06-16 19:34:36 -07:00
parent d16de7a82c 6933ee5fb8
commit f1b7fd483e
64 changed files with 813 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/applications/phriction/controller/PhrictionMoveController.php
View File

@@ -36,13 +36,14 @@ final class PhrictionMoveController extends PhrictionController {
// about it.
if (strlen($v_slug)) {
$normal_slug = PhabricatorSlug::normalize($v_slug);
if ($normal_slug !== $v_slug) {
$no_slash_slug = rtrim($normal_slug, '/');
if ($normal_slug !== $v_slug && $no_slash_slug !== $v_slug) {
return $this->newDialog()
->setTitle(pht('Adjust Path'))
->appendParagraph(
pht(
'The path you entered (%s) is not a valid wiki document '.
'path. Paths may not contain special characters.',
'path. Paths may not contain spaces or special characters.',
phutil_tag('strong', array(), $v_slug)))
->appendParagraph(
pht(

4
src/applications/phriction/editor/PhrictionTransactionEditor.php
View File

@@ -391,6 +391,10 @@ final class PhrictionTransactionEditor
pht("A document's content changes."),
PhrictionTransaction::MAILTAG_DELETE =>
pht('A document is deleted.'),
PhrictionTransaction::MAILTAG_SUBSCRIBERS =>
pht('A document\'s subscribers change.'),
PhrictionTransaction::MAILTAG_OTHER =>
pht('Other document activity not listed above occurs.'),
);
}

15
src/applications/phriction/storage/PhrictionTransaction.php
View File

@@ -9,9 +9,11 @@ final class PhrictionTransaction
const TYPE_MOVE_TO = 'move-to';
const TYPE_MOVE_AWAY = 'move-away';
const MAILTAG_TITLE = 'phriction-title';
const MAILTAG_CONTENT = 'phriction-content';
const MAILTAG_DELETE = 'phriction-delete';
const MAILTAG_TITLE = 'phriction-title';
const MAILTAG_CONTENT = 'phriction-content';
const MAILTAG_DELETE = 'phriction-delete';
const MAILTAG_SUBSCRIBERS = 'phriction-subscribers';
const MAILTAG_OTHER = 'phriction-other';
public function getApplicationName() {
return 'phriction';
@@ -280,7 +282,12 @@ final class PhrictionTransaction
case self::TYPE_DELETE:
$tags[] = self::MAILTAG_DELETE;
break;
case PhabricatorTransactions::TYPE_SUBSCRIBERS:
$tags[] = self::MAILTAG_SUBSCRIBERS;
break;
default:
$tags[] = self::MAILTAG_OTHER;
break;
}
return $tags;
}