mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

implement pair request broadcasts

Browse source 
Pair requests are sent on all network interfaces, and contain the best
available hostname to use to contact the host on that interface.

Added a pairing in progress page.

Revert "reduce some boilerplate using ghc extensions", because it caused
overlapping instances for Text.
This commit is contained in:
Joey Hess 2012-09-08 13:04:19 -04:00
parent 0c01348b65
commit 3dd4b4058f
7 changed files with 174 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
templates/configurators/inprogresspairing.hamlet Normal file
View file

@ -0,0 +1,10 @@
<div .span9 .hero-unit>
<h2>
Pairing in progress ..
<p>
Now you should either go tell the owner of the computer you want to pair #
with the secret phrase you selected ("#{secret}"), or go enter it into #
the computer you want to pair with.
<p>
You do not need to leave this page open; pairing will finish automatically #
as soon as the secret phrase is entered into the other computer.

4
templates/configurators/pairing.hamlet
View file

@ -5,7 +5,7 @@
$if start
Pair with a computer on your local network (or VPN), and the #
two git annex repositories will be combined into one, with changes #
kept in sync between all paired devices.
kept in sync between them.
$else
Pairing with #{username}@#{hostname} will combine the two git annex #
repositories into one, with changes kept in sync between them.
@ -46,5 +46,5 @@
A quotation is one good choice, something like: #
"#{sampleQuote}"
$else
Only letters and numbers matter; punctuation and white space is #
Only letters and numbers matter; punctuation and spaces are #
ignored.