You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/14 16:32:46 UTC
[1/5] git commit: Combines the various project info macros into a
single subsection.
Updated Branches:
refs/heads/master fdadc2283 -> 76763615d
Combines the various project info macros into a single subsection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/76763615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/76763615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/76763615
Branch: refs/heads/master
Commit: 76763615db3b42ed7b58fd736cef99ff6c8e93ea
Parents: 2c7aa41
Author: Rich Bowen <rb...@geek.net>
Authored: Fri Apr 26 14:30:04 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 14:32:32 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/76763615/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index c511352..3897e5f 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -152,9 +152,7 @@
<li><a href="#md_ex_code{{id}}">Code Highlighting</a></li>
<li><a href="#md_ex_includes{{id}}">Includes</a></li>
<li><a href="#md_ex_neighborhood_notes{{id}}">Neighborhood Notifications</a></li>
- <li><a href="#md_ex_download_button{{id}}">Download Button</a></li>
- <li><a href="#md_ex_members{{id}}">Project Member List</a></li>
- <li><a href="#md_ex_project_screenshots{{id}}">Project Screenshots</a></li>
+ <li><a href="#md_ex_project_macros{{id}}">Project Info Macros</a></li>
<li><a href="#md_ex_thanks{{id}}">Thanks</a></li>
</ul>
</div>
@@ -680,28 +678,26 @@ allowed, permitting basic styling and layout: <div markdown style="float:left
</pre></div>
</div>
-<div class="markdown_syntax_section hidden_in_modal md_ex_download_button{{id}}">
+<div class="markdown_syntax_section hidden_in_modal md_ex_project_macros{{id}}">
+
<h2 id="md_ex_download_button{{id}}">Download Button</h2>
<p>You can display a download button that links to the best download available for the active project. Please note that if you use this macro and there is no download associated with your project, the button will not appear.</p>
<div class="codehilite"><pre>
[[download_button]]
</pre></div>
-</div>
-<div class="markdown_syntax_section hidden_in_modal md_ex_member{{id}}">
<h2 id="md_ex_member{{id}}">Project Member List</h2>
<p>You can display a list of project members. By default the list is limited to 20 members, and a link is provided to a page with the full list.</p>
<div class="codehilite"><pre>
[[members]]
</pre></div>
-</div>
-<div class="markdown_syntax_section hidden_in_modal md_ex_project_screenshots{{id}}">
<h2 id="md_ex_project_screenshots{{id}}">Project Screenshots</h2>
<p>You can show all the screenshots for the current project as thumbnails that are linked to the full-size image.</p>
<div class="codehilite"><pre>
[[project_screenshots]]
</pre></div>
+
</div>
<div class="markdown_syntax_section hidden_in_modal md_ex_thanks{{id}}">
[4/5] git commit: Fixes #6166
Posted by br...@apache.org.
Fixes #6166
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2c7aa415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2c7aa415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2c7aa415
Branch: refs/heads/master
Commit: 2c7aa4157ea5d5f0a970c707c9d4fe70e18334d1
Parents: e4054d9
Author: Rich Bowen <rb...@geek.net>
Authored: Fri Apr 26 13:58:54 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 14:32:32 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2c7aa415/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index d34fe03..c511352 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -148,7 +148,7 @@
<li><a href="#md_ex_img{{id}}">Images</a></li>
<li><a href="#md_ex_escapes{{id}}">Escapes and HTML</a></li>
<li><a href="#md_ex_moreheaders{{id}}">More Headers</a></li>
- <li><a href="#md_ex_toc{{id}}">Table of Contents</a></li>
+ <li><a href="#md_ex_toc1{{id}}">Table of Contents</a></li>
<li><a href="#md_ex_code{{id}}">Code Highlighting</a></li>
<li><a href="#md_ex_includes{{id}}">Includes</a></li>
<li><a href="#md_ex_neighborhood_notes{{id}}">Neighborhood Notifications</a></li>
@@ -583,8 +583,8 @@ allowed, permitting basic styling and layout: <div markdown style="float:left
</div>
-<div class="markdown_syntax_section hidden_in_modal md_ex_toc{{id}}">
-<h2 id="md_ex_toc{{id}}">Table of Contents</h2>
+<div class="markdown_syntax_section hidden_in_modal md_ex_toc1{{id}}">
+<h2 id="md_ex_toc1{{id}}">Table of Contents</h2>
<p>You can display a list of links to jump to headers in a document. Sub-headers will be nested.</p>
<div class="codehilite"><pre>[TOC]
[5/5] git commit: Typo
Posted by br...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/909a2e56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/909a2e56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/909a2e56
Branch: refs/heads/master
Commit: 909a2e56cf20576aac7e065685aaa5d8d0bf5747
Parents: a6e48be
Author: Rich Bowen <rb...@rcbowen.com>
Authored: Wed Oct 12 10:01:07 2011 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 14:32:32 2013 +0000
----------------------------------------------------------------------
Allura/docs/platform_tour.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/909a2e56/Allura/docs/platform_tour.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/platform_tour.rst b/Allura/docs/platform_tour.rst
index 6360420..73a0a14 100644
--- a/Allura/docs/platform_tour.rst
+++ b/Allura/docs/platform_tour.rst
@@ -34,7 +34,7 @@ robust and open platform. Some of the services provided by the platform include
- Tool administration
Tools, on the other hand, provide the actual user interface and logic to
-manipulate forge artifacts. Some of the tools currently impemented include:
+manipulate forge artifacts. Some of the tools currently implemented include:
admin
This tool is installed in all projects, and allows the administration of the
[3/5] git commit: Typo (the the)
Posted by br...@apache.org.
Typo (the the)
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a6e48be4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a6e48be4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a6e48be4
Branch: refs/heads/master
Commit: a6e48be41217bb88c243fd7e6b206c5d2f7b2a04
Parents: fdadc22
Author: Rich Bowen <rb...@rcbowen.com>
Authored: Wed Oct 12 09:56:46 2011 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 14:32:32 2013 +0000
----------------------------------------------------------------------
Allura/docs/guides/email.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a6e48be4/Allura/docs/guides/email.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/guides/email.rst b/Allura/docs/guides/email.rst
index b26b7f2..d238321 100644
--- a/Allura/docs/guides/email.rst
+++ b/Allura/docs/guides/email.rst
@@ -60,7 +60,7 @@ Users are allowed to register that they want plain text only.
We will also include some text in the footer of the e-mail message with a
link to the message online. We can use this link to guess where in the
thread the message belongs in the case of a messed up e-mail client that
-does not set the the headers for the reply properly.
+does not set the headers for the reply properly.
The nice thing about this is that it's pretty much already implemented
for us via the meta tool.
[2/5] git commit: Adds documentation for the [[members]] macro.
Posted by br...@apache.org.
Adds documentation for the [[members]] macro.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e4054d94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e4054d94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e4054d94
Branch: refs/heads/master
Commit: e4054d94662f98dd7171e0d7843d790dd2ac0395
Parents: 909a2e5
Author: Rich Bowen <rb...@geek.net>
Authored: Fri Apr 26 12:12:36 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 14:32:32 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e4054d94/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 48934d3..d34fe03 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -153,6 +153,7 @@
<li><a href="#md_ex_includes{{id}}">Includes</a></li>
<li><a href="#md_ex_neighborhood_notes{{id}}">Neighborhood Notifications</a></li>
<li><a href="#md_ex_download_button{{id}}">Download Button</a></li>
+ <li><a href="#md_ex_members{{id}}">Project Member List</a></li>
<li><a href="#md_ex_project_screenshots{{id}}">Project Screenshots</a></li>
<li><a href="#md_ex_thanks{{id}}">Thanks</a></li>
</ul>
@@ -687,6 +688,14 @@ allowed, permitting basic styling and layout: <div markdown style="float:left
</pre></div>
</div>
+<div class="markdown_syntax_section hidden_in_modal md_ex_member{{id}}">
+<h2 id="md_ex_member{{id}}">Project Member List</h2>
+<p>You can display a list of project members. By default the list is limited to 20 members, and a link is provided to a page with the full list.</p>
+<div class="codehilite"><pre>
+[[members]]
+</pre></div>
+</div>
+
<div class="markdown_syntax_section hidden_in_modal md_ex_project_screenshots{{id}}">
<h2 id="md_ex_project_screenshots{{id}}">Project Screenshots</h2>
<p>You can show all the screenshots for the current project as thumbnails that are linked to the full-size image.</p>