You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2018/06/07 20:14:19 UTC
[1/2] allura git commit: Improve wording in a few places
Repository: allura
Updated Branches:
refs/heads/master 634805fae -> 9215f5b6f
Improve wording in a few places
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d12ab545
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d12ab545
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d12ab545
Branch: refs/heads/master
Commit: d12ab545771f3f175f93c0d6a945bfb19cb3970c
Parents: 4bef92e
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Jun 6 10:33:45 2018 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Jun 6 10:33:45 2018 -0400
----------------------------------------------------------------------
Allura/allura/lib/widgets/user_profile.py | 2 +-
ForgeGit/forgegit/templates/git/index.html | 2 +-
ForgeSVN/forgesvn/templates/svn/index.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d12ab545/Allura/allura/lib/widgets/user_profile.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/user_profile.py b/Allura/allura/lib/widgets/user_profile.py
index c2e32e3..8746b0e 100644
--- a/Allura/allura/lib/widgets/user_profile.py
+++ b/Allura/allura/lib/widgets/user_profile.py
@@ -46,4 +46,4 @@ class SendMessageForm(ForgeForm):
style='width: 425px; height:200px'),
label='Message')
- cc = ew.Checkbox(label='CC Sender')
+ cc = ew.Checkbox(label='Send me a copy')
http://git-wip-us.apache.org/repos/asf/allura/blob/d12ab545/ForgeGit/forgegit/templates/git/index.html
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/templates/git/index.html b/ForgeGit/forgegit/templates/git/index.html
index e66c72b..e09175e 100644
--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -85,7 +85,7 @@ git push -u origin master</pre>
{% endif %}
{% elif c.app.repo.status == 'ready' %}
{% if h.has_access(c.app, 'write')() %}
- <p>The metadata for this repository is missing. To fix, please try a <a href="{{c.app.url}}refresh">Repository Refresh</a>.</p>
+ <p>Browsing this repo on the web is unavailable currently. To fix, please try a <a href="{{c.app.url}}refresh">Repository Refresh</a>. Committing and pulling code should still work.</p>
{% else %}
<p><b>No (more) commits</b></p>
{% endif %}
http://git-wip-us.apache.org/repos/asf/allura/blob/d12ab545/ForgeSVN/forgesvn/templates/svn/index.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/index.html b/ForgeSVN/forgesvn/templates/svn/index.html
index f9a2594..fb5d474 100644
--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -98,7 +98,7 @@ svn import {{c.app.repo.clone_url_first(anon=False, username=c.user.username)}}
{% endif %}
{% elif c.app.repo.status == 'ready' %}
{% if h.has_access(c.app, 'write')() %}
- <p>The metadata for this repository is missing. To fix, please try a <a href="{{c.app.url}}refresh">Repository Refresh</a>.</p>
+ <p>Browsing this repo on the web is unavailable currently. To fix, please try a <a href="{{c.app.url}}refresh">Repository Refresh</a>. Committing and pulling code should still work.</p>
{% else %}
<p><b>No (more) commits</b></p>
{% endif %}
[2/2] allura git commit: Merge commit
'd12ab545771f3f175f93c0d6a945bfb19cb3970c'
Posted by ke...@apache.org.
Merge commit 'd12ab545771f3f175f93c0d6a945bfb19cb3970c'
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9215f5b6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9215f5b6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9215f5b6
Branch: refs/heads/master
Commit: 9215f5b6f28a63edb86dbf323f71d704d1b87c94
Parents: 634805f d12ab54
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Thu Jun 7 20:13:36 2018 +0000
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Thu Jun 7 20:13:36 2018 +0000
----------------------------------------------------------------------
Allura/allura/lib/widgets/user_profile.py | 2 +-
ForgeGit/forgegit/templates/git/index.html | 2 +-
ForgeSVN/forgesvn/templates/svn/index.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------