No OneTemporary
Actions

Size

7 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index 171beb5130..217a87d9ac 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,32 +1,36 @@
	This is not a complete list of changes, just of API or workflow changes that may
	break existing installs. Newer changes are listed at the top. If you pull new
	changes and things stop working, check here first!

	+July 18 2011 - Phriction Link Syntax Change
	+ Phriction link sytnax now requires [[double brackets]], not single
	+ brackets.
	+
	June 29 2011 - Maniphest project indexes
	Old Maniphest tasks will not appear in project filter views until you run
	"scripts/search/reindex_maniphest.php" to build indexes. New tasks will have
	their indexes built automatically.

	May 31 2011 - Javelin submodule moved
	The externals/javelin submodule location has moved. If you have an older
	checkout of Phabricator, you may need to edit .git/config to point at
	facebook/javelin.git instead of epriestley/javelin.git, then remove the
	externals/javelin directory, and then run "git submodule update --init".

	May 11 2011 - New session code
	There's some new code which allows you to establish multiple web sessions.
	When you update to it, all users will be logged out. This is expected, just
	log in again and everything should work properly.

	May 10 2011 - PhabricatorMailImplementationAdapter
	The signatures of setFrom() and addReplyTo() have changed, and they now
	accept a second "$name = ''" parameter. This represents a human-readable
	name component of the address.

	May 9 2011 - git submodule
	As of commit 2a39fd0, you must run "git submodule update --init" in your
	clone. This was added to the install documentation in commit 09b498c, see that
	commit for details.

	May 9 2011 - Changelog
	Created CHANGELOG
	diff --git a/src/docs/userguide/remarkup.diviner b/src/docs/userguide/remarkup.diviner
	index 034b965eb5..4bb3ab6b79 100644
	--- a/src/docs/userguide/remarkup.diviner
	+++ b/src/docs/userguide/remarkup.diviner
	@@ -1,155 +1,155 @@
	@title Remarkup Reference
	@group userguide

	Explains how to make bold text; this makes your words louder so you can win
	arguments.

	= Overview =

	Phabricator uses a lightweight markup language called "Remarkup", similar to
	other lightweight markup langauges like Markdown and Wiki markup.

	This document describes how to format text using Remarkup.

	= Basic Styling =

	Format basic text styles like this:

	bold text
	//italic text//
	##monospaced text##

	Those produce bold text, //italic text// and ##monospaced text##,
	respectively.

	= Layout =

	Make headers like this:

	= Large Header =
	== Smaller Header ==
	===== Very Small Header =====

	This produces headers like the ones in this document.

	Make lists by indenting two spaces and beginning each item with a "-":

	lang=demo
	- milk
	- eggs
	- bread

	This produces a list like this:

	- milk
	- eggs
	- bread

	Make code blocks by indenting two spaces:

	f(x, y);

	You can specify a language for syntax highlighting with "lang=xxx":

	lang=demo
	lang=html
	<a href="#">...</a>

	This will highlight the block using a highlighter for that language, if one is
	available (in most cases, this means you need to configure Pygments):

	lang=html
	<a href="#">...</a>

	You can also use a "COUNTEREXAMPLE" header to show that a block of code is
	bad and shouldn't be copied:

	lang=demo
	COUNTEREXAMPLE
	function f() {
	global $$variable_variable;
	}

	This produces a block like this:

	COUNTEREXAMPLE
	function f() {
	global $$variable_variable;
	}

	= Linking URIs =

	URIs are automatically linked: http://phabricator.org/

	If you have a URI with problematic characters in it, like
	"##http://comma.org/,##", you can surround it with angle brackets:

	<http://comma.org/,>

	This will force the parser to consume the whole URI: <http://comma.org/,>

	= Linking to Objects =

	You can link to Differential revisions, Diffusion commits and Maniphest tasks
	by mentioning the name of an object:

	D123 # Link to Differential revision D123
	rX123 # Link to SVN commit 123 from the "X" repository
	rXaf3192cd5 # Link to Git commit "af3192cd5..." from the "X" repository.
	# You must specify at least 7 characters of the hash.
	T123 # Link to Maniphest task T123

	You can also link directly to a comment in Maniphest and Differential:

	T123#4 # Link to comment #4 of T123

	= Quoting Text =

	To quote text, preface it with an ">":

	> This is quoted text.

	This appears like this:

	> This is quoted text.

	= Embedding Media =

	If you set configuration flags, you can embed media directly in text:

	- files.enable-proxy: allows you to paste in image URLs and have them
	render inline.
	- remarkup.enable-embedded-youtube: allows you to paste in YouTube videos
	and have them render inline.

	These options are disabled by default because they have security and/or
	silliness implications, read their descriptions in ##default.conf.php## before
	enabling them.

	= Image Macros =

	You can upload image macros (Files -> Image Macros) which will replace text
	strings with the image you specify. For instance, you could upload an image of a
	dancing banana to create a macro named "peanutbutterjellytime", and then any
	time you type that string it will be replaced with the image of a dancing
	banana.

	= Mentioning Users =

	In Differential and Maniphest, you can mention another user by writing:

	@username

	When you submit your comment, this will add them as a CC on the revision or task
	if they aren't already CC'd.

	= Phriction Documents =

	You can link to Phriction documents with a name or path:

	- Make sure you sign and date your [legal/Letter of Marque and Reprisal]!
	+ Make sure you sign and date your [[legal/Letter of Marque and Reprisal]]!

	With a pipe (##\|##), you can retitle the link. Use this to mislead your
	opponents:

	- Check out these [legal/boring_documents/ \| exciting legal documents]!
	+ Check out these [[legal/boring_documents/ \| exciting legal documents]]!
	diff --git a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php b/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
	index b33bc3c941..66259dbafa 100644
	--- a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
	+++ b/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
	@@ -1,52 +1,52 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group markup
	*/
	class PhabricatorRemarkupRulePhriction
	extends PhutilRemarkupRule {

	public function apply($text) {
	return preg_replace_callback(
	- '@\B\\[([^\|\\]]+)(?:\\\|([^\\]]+))?\\]\B@U',
	+ '@\B\\[\\[([^\|\\]]+)(?:\\\|([^\\]]+))?\\]\\]\B@U',
	array($this, 'markupDocumentLink'),
	$text);
	}

	public function markupDocumentLink($matches) {

	$slug = trim($matches[1]);
	$name = trim(idx($matches, 2, $slug));
	$name = explode('/', $name);
	$name = end($name);

	$slug = PhrictionDocument::normalizeSlug($slug);
	$uri = PhrictionDocument::getSlugURI($slug);

	return $this->getEngine()->storeText(
	phutil_render_tag(
	'a',
	array(
	'href' => $uri,
	'class' => 'phriction-link',
	),
	phutil_escape_html($name)));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Dec 2, 7:19 AM (13 h, 1 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 431709
Default Alt Text: (7 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions