You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/10/16 19:18:58 UTC
[1/2] allura git commit: [#7919] improve the tool descriptions,
set missing ones
Repository: allura
Updated Branches:
refs/heads/hs/7919 2219f2d85 -> 096803b74
[#7919] improve the tool descriptions, set missing ones
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2e6d5100
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2e6d5100
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2e6d5100
Branch: refs/heads/hs/7919
Commit: 2e6d5100e63cef0996198c3203bb15b2d8e4aca7
Parents: 2219f2d
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Oct 16 13:03:20 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Oct 16 13:03:20 2015 -0400
----------------------------------------------------------------------
ForgeChat/forgechat/main.py | 1 +
ForgeDiscussion/forgediscussion/forum_main.py | 3 ++-
ForgeGit/forgegit/git_main.py | 5 ++---
ForgeLink/forgelink/link_main.py | 4 ++++
ForgeSVN/forgesvn/svn_main.py | 3 ++-
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
6 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2e6d5100/ForgeChat/forgechat/main.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/main.py b/ForgeChat/forgechat/main.py
index bdd373a..d8cd841 100644
--- a/ForgeChat/forgechat/main.py
+++ b/ForgeChat/forgechat/main.py
@@ -47,6 +47,7 @@ log = logging.getLogger(__name__)
class ForgeChatApp(Application):
__version__ = version.__version__
tool_label = 'Chat'
+ tool_description = 'IRC chat integration'
status = 'alpha'
default_mount_label = 'Chat'
default_mount_point = 'chat'
http://git-wip-us.apache.org/repos/asf/allura/blob/2e6d5100/ForgeDiscussion/forgediscussion/forum_main.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/forum_main.py b/ForgeDiscussion/forgediscussion/forum_main.py
index 542b3f0..44885c9 100644
--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -72,7 +72,8 @@ class ForgeDiscussionApp(Application):
exportable = True
tool_label = 'Discussion'
tool_description = """
- Collaborate with your community in your forum.
+ Discussion forums are a place to talk about any topics related to your project.
+ You may set up multiple forums within the Discussion tool.
"""
default_mount_label = 'Discussion'
default_mount_point = 'discussion'
http://git-wip-us.apache.org/repos/asf/allura/blob/2e6d5100/ForgeGit/forgegit/git_main.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/git_main.py b/ForgeGit/forgegit/git_main.py
index 62fc0f7..050addb 100644
--- a/ForgeGit/forgegit/git_main.py
+++ b/ForgeGit/forgegit/git_main.py
@@ -47,9 +47,8 @@ class ForgeGitApp(RepositoryApp):
__version__ = version.__version__
tool_label = 'Git'
tool_description = """
- Git is a distributed version control system designed to
- handle everything from small to very large projects with speed
- and efficiency.
+ Git is a popular distributed version control system with broad functionality.
+ It is known for its speed, flexibility, and data integrity.
"""
ordinal = 2
forkable = True
http://git-wip-us.apache.org/repos/asf/allura/blob/2e6d5100/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index dde7a02..8dc69a2 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -44,6 +44,10 @@ class ForgeLinkApp(Application):
'''This is the Link app for PyForge'''
__version__ = version.__version__
+ tool_description = """
+ A link to a URL of your choice, either on this site or somewhere else.
+ It will appear in your project menu alongside the other project tools.
+ """
permissions = ['configure', 'read']
permissions_desc = {
'read': 'View link.',
http://git-wip-us.apache.org/repos/asf/allura/blob/2e6d5100/ForgeSVN/forgesvn/svn_main.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index e87d106..771f930 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -61,7 +61,8 @@ class ForgeSVNApp(RepositoryApp):
})
tool_label = 'SVN'
tool_description = """
- Enterprise-class centralized version control for the masses.
+ Subversion ("svn") is a centralized version control system. In general, SVN is simpler to use
+ but not as powerful as distributed systems like Git and Mercurial.
"""
ordinal = 4
forkable = False
http://git-wip-us.apache.org/repos/asf/allura/blob/2e6d5100/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index ad63b74..75dbf13 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -253,8 +253,8 @@ class ForgeTrackerApp(Application):
searchable = True
tool_label = 'Tickets'
tool_description = """
- Bugs, enhancements, tasks, etc., will help you plan and
- manage your development.
+ Organize your project's bugs, enhancements, tasks, etc. with a ticket system.
+ You can track and search by status, assignee, milestone, labels, and custom fields.
"""
default_mount_label = 'Tickets'
default_mount_point = 'tickets'
[2/2] allura git commit: [#7919] use minified react in
non-development situations
Posted by he...@apache.org.
[#7919] use minified react in non-development situations
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/096803b7
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/096803b7
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/096803b7
Branch: refs/heads/hs/7919
Commit: 096803b74f9fcea602ca4dad5d680e4733c5dd35
Parents: 2e6d510
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Oct 16 13:06:45 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Oct 16 13:06:45 2015 -0400
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/master.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/096803b7/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 68a6741..9549b1f 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -27,7 +27,7 @@
{% do g.register_forge_js('js/jquery.notify.js') %}
{% do g.register_forge_js('js/browser-polyfill.js') %}
{% do g.register_forge_js('js/underscore-min.js') %}
-{% do g.register_forge_js('js/react-with-addons.js') %}
+{% do g.register_forge_js('js/react-with-addons' + ('' if h.asbool(config.get('debug')) else '.min') + '.js') %}
{% do g.register_forge_js("js/react-drag.js") %}
{% do g.register_forge_js('js/react-reorderable.js') %}
{% do g.register_forge_js('js/jquery.tooltipster.js') %}