diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-11-14 14:26:20 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-11-14 14:53:08 -0400 |
commit | d58148031bae065729b1d470ca1f67bfb368b364 (patch) | |
tree | 0c5959323d003c2ad4cc9be509e7cd87fce14183 /templates | |
parent | a7fd200440549148a9da3666511d2352df79a8de (diff) |
remove xmpp support
I've long considered the XMPP support in git-annex a wart.
It's nice to remove it.
(This also removes the NetMessager, which was only used for XMPP, and the
daemonstatus's desynced list (likewise).)
Existing XMPP remotes should be ignored by git-annex.
This commit was sponsored by Brock Spratlen on Patreon.
Diffstat (limited to 'templates')
-rw-r--r-- | templates/configurators/addrepository/connection.hamlet | 2 | ||||
-rw-r--r-- | templates/configurators/addrepository/misc.hamlet | 2 | ||||
-rw-r--r-- | templates/configurators/addrepository/xmppconnection.hamlet | 13 | ||||
-rw-r--r-- | templates/configurators/delete/xmpp.hamlet | 12 | ||||
-rw-r--r-- | templates/configurators/main.hamlet | 13 | ||||
-rw-r--r-- | templates/configurators/pairing/xmpp/end.hamlet | 33 | ||||
-rw-r--r-- | templates/configurators/pairing/xmpp/friend/confirm.hamlet | 12 | ||||
-rw-r--r-- | templates/configurators/pairing/xmpp/friend/prompt.hamlet | 13 | ||||
-rw-r--r-- | templates/configurators/pairing/xmpp/self/prompt.hamlet | 21 | ||||
-rw-r--r-- | templates/configurators/pairing/xmpp/self/retry.hamlet | 12 | ||||
-rw-r--r-- | templates/configurators/xmpp.hamlet | 43 | ||||
-rw-r--r-- | templates/configurators/xmpp/buddylist.hamlet | 40 | ||||
-rw-r--r-- | templates/configurators/xmpp/disabled.hamlet | 6 | ||||
-rw-r--r-- | templates/configurators/xmpp/needcloudrepo.hamlet | 18 |
14 files changed, 0 insertions, 240 deletions
diff --git a/templates/configurators/addrepository/connection.hamlet b/templates/configurators/addrepository/connection.hamlet index fc111b0653..43444abf62 100644 --- a/templates/configurators/addrepository/connection.hamlet +++ b/templates/configurators/addrepository/connection.hamlet @@ -1,3 +1 @@ -^{makeXMPPConnection} - ^{makeSshRepository} diff --git a/templates/configurators/addrepository/misc.hamlet b/templates/configurators/addrepository/misc.hamlet index f9e89360ad..96d1c58bf2 100644 --- a/templates/configurators/addrepository/misc.hamlet +++ b/templates/configurators/addrepository/misc.hamlet @@ -8,8 +8,6 @@ <a href="http://en.wikipedia.org/wiki/Sneakernet">SneakerNet</a> # between computers. -^{makeXMPPConnection} - <h3> <a href="@{StartLocalPairR}"> <span .glyphicon .glyphicon-plus-sign> diff --git a/templates/configurators/addrepository/xmppconnection.hamlet b/templates/configurators/addrepository/xmppconnection.hamlet deleted file mode 100644 index 34e87ed83d..0000000000 --- a/templates/configurators/addrepository/xmppconnection.hamlet +++ /dev/null @@ -1,13 +0,0 @@ -<h3> - <a href="@{StartXMPPPairSelfR}"> - <span .glyphicon .glyphicon-plus-sign> - \ Share with your other devices -<p> - Keep files in sync between your devices running git-annex. - -<h3> - <a href="@{StartXMPPPairFriendR}"> - <span .glyphicon .glyphicon-plus-sign> - \ Share with a friend -<p> - Combine your repository with a friend's repository, and share your files. diff --git a/templates/configurators/delete/xmpp.hamlet b/templates/configurators/delete/xmpp.hamlet deleted file mode 100644 index 92e3e6eb9b..0000000000 --- a/templates/configurators/delete/xmpp.hamlet +++ /dev/null @@ -1,12 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Disconnecting from Jabber - <p> - This won't delete the repository or repositories at the other end - of the Jabber connection, but it will disconnect from them, and stop - using Jabber. - <p> - <a .btn .btn-primary href="@{DisconnectXMPPR}"> - <span .glyphicon .glyphicon-minus> - \ Disconnect diff --git a/templates/configurators/main.hamlet b/templates/configurators/main.hamlet index dec5ad8048..339b92713b 100644 --- a/templates/configurators/main.hamlet +++ b/templates/configurators/main.hamlet @@ -27,16 +27,3 @@ Unused files <p> Configure what to do with old and deleted files. - <div .row> - <div .col-sm-4> - <h3> - <a href="@{XMPPConfigR}"> - Jabber account - $if xmppconfigured - <p> - Your jabber account is set up, and will be used to keep # - in touch with remote devices, and with your friends. - $else - <p> - Keep in touch with remote devices, and with your friends, # - by configuring a jabber account. diff --git a/templates/configurators/pairing/xmpp/end.hamlet b/templates/configurators/pairing/xmpp/end.hamlet deleted file mode 100644 index 68bf948160..0000000000 --- a/templates/configurators/pairing/xmpp/end.hamlet +++ /dev/null @@ -1,33 +0,0 @@ -<div .col-sm-9> - <div .content-box> - $if inprogress - <h2> - Pair request sent ... - <p> - $maybe name <- friend - A pair request has been sent to #{name}. Now it's up to them # - to accept it and finish pairing. - $nothing - A pair request has been sent to all other devices that # - have been configured to use your jabber account. # - It will be answered automatically by any devices that see it. - $else - Pair request accepted. - <h2> - Configure a shared cloud repository - $maybe name <- friend - <p> - ☂ To share files with #{name}, you'll need a repository in # - the cloud, that you both can access. - $nothing - <p> - ☂ To share files with your other devices, when they're not # - nearby, you'll need a repository in the cloud. - <p> - Make sure that your other devices are configured to access a # - cloud repository, and that the same repository is enabled here # - too. - ^{cloudRepoList} - <h2> - Add a cloud repository - ^{makeCloudRepositories} diff --git a/templates/configurators/pairing/xmpp/friend/confirm.hamlet b/templates/configurators/pairing/xmpp/friend/confirm.hamlet deleted file mode 100644 index 68ed9f6c2f..0000000000 --- a/templates/configurators/pairing/xmpp/friend/confirm.hamlet +++ /dev/null @@ -1,12 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Pair request received from #{name} - <p> - Pairing with #{name} will combine your two git annex # - repositories into one, allowing you to share files. - <p> - <a .btn .btn-primary .btn-lg href="@{FinishXMPPPairFriendR pairkey}"> - Accept pair request - <a .btn .btn-default .btn-lg href="@{DashboardR}"> - No thanks diff --git a/templates/configurators/pairing/xmpp/friend/prompt.hamlet b/templates/configurators/pairing/xmpp/friend/prompt.hamlet deleted file mode 100644 index 3410cb1285..0000000000 --- a/templates/configurators/pairing/xmpp/friend/prompt.hamlet +++ /dev/null @@ -1,13 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Share with a friend - <p> - You can combine your repository with a friend's repository # - to share your files. Your repositories will automatically be kept in # - sync. Only do this if you want your friend to see all the files # - in this repository! - <p> - Here are the friends currently available via your Jabber account. - <p> - ^{buddyListDisplay} diff --git a/templates/configurators/pairing/xmpp/self/prompt.hamlet b/templates/configurators/pairing/xmpp/self/prompt.hamlet deleted file mode 100644 index ec14e3596f..0000000000 --- a/templates/configurators/pairing/xmpp/self/prompt.hamlet +++ /dev/null @@ -1,21 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Sharing with your other devices - <p> - If you have multiple devices, all running git-annex, and using # - your Jabber account #{account}, you can configure them to share # - your files between themselves. - <p> - For example, you can have a computer at home, one at work, and a # - laptop, and their repositories will automatically be kept in sync. - <p> - Make sure your other devices are online and configured to use # - your Jabber account before continuing. Note that <b>all</b> # - repositories configured to use the same Jabber account will be # - combined together when you do this. - <p> - <a .btn .btn-primary .btn-lg href="@{RunningXMPPPairSelfR}"> - Start sharing with my other devices # - <a .btn .btn-default .btn-lg href="@{DashboardR}"> - Cancel diff --git a/templates/configurators/pairing/xmpp/self/retry.hamlet b/templates/configurators/pairing/xmpp/self/retry.hamlet deleted file mode 100644 index 8e6cacf7de..0000000000 --- a/templates/configurators/pairing/xmpp/self/retry.hamlet +++ /dev/null @@ -1,12 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Unable to get in touch with any other devices. - <p> - Make sure your other devices are online and configured to use # - your Jabber account before continuing. - <p> - <a .btn .btn-primary .btn-lg href="@{RunningXMPPPairSelfR}"> - Start sharing with my other devices # - <a .btn .btn-default .btn-lg href="@{DashboardR}"> - Cancel diff --git a/templates/configurators/xmpp.hamlet b/templates/configurators/xmpp.hamlet deleted file mode 100644 index 86269603a6..0000000000 --- a/templates/configurators/xmpp.hamlet +++ /dev/null @@ -1,43 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Configuring jabber account - <p> - A jabber account is used to communicate between # - devices that are not in direct contact. # - It can also be used to pair up with a friend's repository, if desired. - <p> - It's fine to reuse an existing jabber account; git-annex won't # - post any messages to it. - <p> - $maybe msg <- problem - <span .glyphicon .glyphicon-warning-sign> - \ Unable to connect to the Jabber server. # - Maybe you entered the wrong password? (Error message: #{msg}) - $nothing - <span .glyphicon .glyphicon-user> - \ If you have a Gmail account, you can use # - Google Talk. Just enter your full Gmail address # - <small>(<tt>you@gmail.com</tt>)</small> # - and password below. - <p> - <form method="post" .form-horizontal enctype=#{enctype}> - <fieldset> - ^{form} - ^{webAppFormAuthToken} - <div .form-group> - <div .col-sm-10 .col-sm-offset-2> - <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');"> - Use this account - \ - <a .btn .btn-default href="@{DisconnectXMPPR}"> - Stop using this account -<div .modal .fade #workingmodal> - <div .modal-dialog> - <div .modal-content> - <div .modal-header> - <h3> - Testing account ... - <div .modal-body> - <p> - Testing jabber account. This could take a minute. diff --git a/templates/configurators/xmpp/buddylist.hamlet b/templates/configurators/xmpp/buddylist.hamlet deleted file mode 100644 index 069f78ff4d..0000000000 --- a/templates/configurators/xmpp/buddylist.hamlet +++ /dev/null @@ -1,40 +0,0 @@ -<div ##{ident}> - <table .table> - <tbody> - $if null buddies - <tr> - <td> - $if isNothing myjid - Not connected to the jabber server. Check your network connection ... - $else - Searching... - $else - $forall (name, away, canpair, paired, buddyid) <- buddies - <tr> - <td> - $if isself buddyid - <span .glyphicon .glyphicon-star> # - <span :away:.text-muted> - your other devices - $else - <span .glyphicon .glyphicon-user> # - <span :away:.text-muted> - #{name} - <td> - $if away - <span .text-muted> - away - $else - $if paired - <span .label .label-success> - paired - $else - $if canpair - $if isself buddyid - <a .btn .btn-primary .btn-sm href="@{RunningXMPPPairSelfR}"> - Start pairing - $else - <a .btn .btn-primary .btn-sm href="@{RunningXMPPPairFriendR buddyid}"> - Start pairing - $else - not using git-annex diff --git a/templates/configurators/xmpp/disabled.hamlet b/templates/configurators/xmpp/disabled.hamlet deleted file mode 100644 index 75c46dee1c..0000000000 --- a/templates/configurators/xmpp/disabled.hamlet +++ /dev/null @@ -1,6 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - Jabber not supported - <p> - This build of git-annex does not support Jabber. Sorry! diff --git a/templates/configurators/xmpp/needcloudrepo.hamlet b/templates/configurators/xmpp/needcloudrepo.hamlet deleted file mode 100644 index ff4d4367e9..0000000000 --- a/templates/configurators/xmpp/needcloudrepo.hamlet +++ /dev/null @@ -1,18 +0,0 @@ -<div .col-sm-9> - <div .content-box> - <h2> - ☂ Configure a shared cloud repository - $maybe name <- buddyname - <p> - You and #{name} have combined your repositores. But you can't open # - each other's files yet. To start sharing files with #{name}, # - you need a repository in the cloud, that you both can access. - $nothing - <p> - You've combined the repositories on two or more of your devices. # - But files are not flowing yet. To start sharing files # - between your devices, you should set up a repository in the cloud. - ^{cloudRepoList} - <h2> - Add a cloud repository - ^{makeCloudRepositories} |