Commit graph

20092 commits

Author SHA1 Message Date
http://joeyh.name/
09d1204e7b Added a comment 2014-06-18 16:22:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlEXAlu8qKv_FHYOv-uEohdGgMY_Lw-Ges
c2f1c63ef6 2014-06-18 12:28:05 +00:00
https://launchpad.net/~maestro-alubia
506a402e45 Added a comment: Congratulations! 2014-06-18 09:08:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
9dc5c762f1 Added a comment 2014-06-18 07:35:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
65d3b9b25c 2014-06-18 00:14:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
64e1f6472c 2014-06-18 00:14:04 +00:00
Joey Hess
4873348200 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-17 19:52:17 -04:00
Joey Hess
9fb8038166 Windows: Assistant now logs to daemon.log.
Yes, this means that git annex webapp on windows execs git-annex, which
execs itself to set env, and the execs itself again to redirect logs.

This is disgusting. This is Windows(TM).
2014-06-17 19:27:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlPfB0_GcGJ827kZqRE1PF4D23rxpfOeg4
84469d8ba2 Added a comment 2014-06-17 19:18:09 +00:00
Joey Hess
8eb45f674f
update 2014-06-17 14:34:51 -04:00
Joey Hess
3b914da9bc
update 2014-06-17 14:33:47 -04:00
Joey Hess
611cd84bb2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-17 14:31:09 -04:00
Joey Hess
ee7be354a1 devblog 2014-06-17 14:29:00 -04:00
Joey Hess
1fcd0c8c4d don't start minimized 2014-06-17 14:28:44 -04:00
Joey Hess
8f98d28da4 Windows: Fix opening file browser from webapp when repo is in a directory with spaces. 2014-06-17 14:21:08 -04:00
Joey Hess
5977e161f3 close 2014-06-17 14:07:16 -04:00
Joey Hess
a8b6ff0ff2 crazy quote for spaces 2014-06-17 14:05:31 -04:00
Joey Hess
883aa84209 windows no-DOS-box and autostart, at last
Using the crazy but apparently best approach of a VB Script that runs
git-annex, in a hidden DOS window.

Note that currently the git-annex messages are not directed to daemon.log.
Would probably need another layer of script. Also problimatic since the
repository may not exist yet.
2014-06-17 13:57:00 -04:00
http://joeyh.name/
32c7fdc0f2 Added a comment 2014-06-17 17:18:34 +00:00
http://joeyh.name/
e027801e6e Added a comment 2014-06-17 17:10:28 +00:00
http://joeyh.name/
914ed75599 Added a comment 2014-06-17 16:56:32 +00:00
http://joeyh.name/
5f3f9601c9 Added a comment 2014-06-17 16:52:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
ba952aca3c 2014-06-17 13:47:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
ec14987706 Added a comment 2014-06-17 00:01:35 +00:00
Joey Hess
5b6f0e317e Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 19:56:19 -04:00
Joey Hess
9e1270d723
devblog 2014-06-16 19:55:45 -04:00
http://joeyh.name/
4a4238a373 Added a comment 2014-06-16 23:48:03 +00:00
http://joeyh.name/
672f359260 Added a comment 2014-06-16 23:47:36 +00:00
Joey Hess
257223c748 branch 2014-06-16 19:12:38 -04:00
Joey Hess
0af4dd673c permissions ugh 2014-06-16 19:12:01 -04:00
Joey Hess
7a8f8b5ac9 refactor 2014-06-16 18:59:23 -04:00
Joey Hess
784e916ded Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 18:35:59 -04:00
Joey Hess
d27891a70d split out windows service todo 2014-06-16 18:34:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
bd2626c8cd Added a comment 2014-06-16 18:19:20 +00:00
http://joeyh.name/
b031978e7a Added a comment 2014-06-16 18:04:48 +00:00
http://joeyh.name/
d96639cb51 Added a comment 2014-06-16 17:59:20 +00:00
http://joeyh.name/
a33baab2ab Added a comment 2014-06-16 17:58:22 +00:00
http://joeyh.name/
c46c963909 Added a comment 2014-06-16 17:55:13 +00:00
http://joeyh.name/
c30564d824 Added a comment 2014-06-16 17:52:34 +00:00
Joey Hess
e8b4eb0cdb Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 11:33:00 -04:00
Joey Hess
501cc8623a assistant: Fix one-way assistant->assistant sync in direct mode.
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.

This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.

Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
2014-06-16 11:32:13 -04:00
http://joeyh.name/
a78636e78a Added a comment 2014-06-16 15:10:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
52334386b9 Added a comment: debug output 2014-06-16 14:17:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8wY171R5c4u_jPmB6LU6n6Px2xePM4sE
f19b868173 2014-06-16 13:23:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
90d80a3a61 2014-06-16 13:08:18 +00:00
Frank2
9ddd8c306f 2014-06-14 22:25:25 +00:00
http://olivier.mehani.name/
7ba53fe00c Added a comment 2014-06-14 14:15:55 +00:00
http://olivier.mehani.name/
ed2f71e422 Added a comment: Manual solution 2014-06-14 13:59:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwfqF4wL6l_O26RyzoBowUMvQ_955Vpao
0a478056dd Added a comment 2014-06-14 06:29:55 +00:00
http://joeyh.name/
1dadac2390 Added a comment 2014-06-13 18:35:53 +00:00