Merge branch 'master' of ssh://git-annex.branchable.com

Utility/Scheduled.hs

@@ -10,7 +10,11 @@ module Utility.Scheduled (
 	Recurrance(..),
 	ScheduledTime(..),
 	NextTime(..),
+	WeekDay,
+	MonthDay,
+	YearDay,
 	nextTime,
+	startTime,
 	fromSchedule,
 	fromScheduledTime,
 	toScheduledTime,
@@ -21,9 +25,13 @@ module Utility.Scheduled (
 	prop_schedule_roundtrips
 ) where
 
-import Common
+import Utility.Data
 import Utility.QuickCheck
+import Utility.PartialPrelude
+import Utility.Misc
 
+import Control.Applicative
+import Data.List
 import Data.Time.Clock
 import Data.Time.LocalTime
 import Data.Time.Calendar
@@ -41,9 +49,9 @@ data Recurrance
 	| Weekly (Maybe WeekDay)
 	| Monthly (Maybe MonthDay)
 	| Yearly (Maybe YearDay)
-	-- Days, Weeks, or Months of the year evenly divisible by a number.
-	-- (Divisible Year is years evenly divisible by a number.)
 	| Divisible Int Recurrance
+	-- ^ Days, Weeks, or Months of the year evenly divisible by a number.
+	-- (Divisible Year is years evenly divisible by a number.)
   deriving (Eq, Read, Show, Ord)
 
 type WeekDay = Int

doc/design/roadmap.mdwn

@@ -11,7 +11,7 @@ Now in the
 * Month 5 user-driven features and polishing
 * Month 6 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]]
 * Month 7 user-driven features and polishing
-* **Month 8 [[!traillink assistant/telehash]]**
+* **Month 8 [[!traillink git-remote-daemon]] [[!traillink assistant/telehash]]**
 * Month 9 [[!traillink assistant/gpgkeys]] [[!traillink assistant/sshpassword]]
 * Month 10 get [[assistant/Android]] out of beta
 * Month 11 [[!traillink assistant/chunks]] [[!traillink assistant/deltas]]

doc/devblog/day_149__signal.mdwn

@@ -0,0 +1,14 @@
+The git-remote-daemon now robustly handles loss of signal, with
+reconnection backoffs. And it detects if the remote ssh server has a too
+old version of git-annex-shell and the webapp will display a warning
+message.
+
+[[!img /assistant/connection.png]]
+
+Also, made the webapp show a network signal bars icon next to both
+ssh and xmpp remotes that it's currently connected with. And, updated the
+webapp's nudging to set up XMPP to now suggest either an XMPP or a ssh remote.
+
+I think that the `remotecontrol` branch is nearly ready for merging!
+
+Today's work was sponsored by Paul Tagliamonte.