Joey Hess
6de38a2ca8
Merge branch 'master' into assistant
2012-07-26 14:28:19 -04:00
Joey Hess
860415aa5b
webapp: check that the shim exists, and restart the assistant if not
2012-07-26 14:27:32 -04:00
Joey Hess
f3efc6dc93
update
2012-07-26 13:47:41 -04:00
Joey Hess
e15878d9e2
Merge branch 'master' of ssh://git-annex.branchable.com
2012-07-26 13:37:00 -04:00
Joey Hess
756c80b67a
move to old
2012-07-26 13:36:28 -04:00
jtang
b77eb6b47e
Added a comment
2012-07-26 17:35:18 +00:00
Joey Hess
2181b8488f
Merge branch 'master' of ssh://git-annex.branchable.com
2012-07-26 13:30:04 -04:00
http://joeyh.name/
f0e683bbd4
Added a comment
2012-07-26 17:27:39 +00:00
Joey Hess
fbf5b7b090
reply
2012-07-26 13:24:01 -04:00
http://joeyh.name/
8c3491f50c
Comment moderation
2012-07-26 17:21:26 +00:00
Joey Hess
987af3bac7
Merge branch 'master' of ssh://git-annex.branchable.com
2012-07-26 13:18:09 -04:00
jtang
efadf5215a
2012-07-26 17:17:10 +00:00
Joey Hess
047c343d77
Merge branch 'master' of ssh://git-annex.branchable.com
2012-07-26 13:16:13 -04:00
Joey Hess
16b26c837b
close
2012-07-26 13:15:24 -04:00
Joey Hess
df00c6166c
update deps
...
Note that here I don't need blaze-markup for cabal to succeed, but Jimmy
reports he does. Seems like Text.Blaze.Renderer.String moved from blaze to
blaze-markup in some version.
2012-07-26 13:13:23 -04:00
http://joeyh.name/
cadf331a77
Added a comment
2012-07-26 17:09:59 +00:00
http://joeyh.name/
a2e3b93fd5
Added a comment: not good..
2012-07-26 17:09:16 +00:00
jtang
d788920ff7
2012-07-26 17:09:09 +00:00
Joey Hess
bad5dff96e
response
2012-07-26 13:06:47 -04:00
Joey Hess
78002d4976
only enable dbus on linux for now
2012-07-26 13:05:52 -04:00
Joey Hess
1f040ad058
fixed
2012-07-26 13:02:22 -04:00
Joey Hess
8e49206af5
fix normal build to include OPTFLAGS
2012-07-26 13:02:00 -04:00
Joey Hess
0a652440ae
fixed
2012-07-26 13:00:29 -04:00
Joey Hess
2f775ef3e3
fix OSX open call
2012-07-26 12:59:40 -04:00
Joey Hess
7051e5c41c
Merge branch 'master' of ssh://git-annex.branchable.com
2012-07-26 12:58:12 -04:00
Joey Hess
510247ce05
blog for the day
2012-07-26 12:57:41 -04:00
Joey Hess
95f4b192f0
on second thought, the session cookie is still useful to support setMessage
2012-07-26 12:41:20 -04:00
Joey Hess
3c117685eb
on second thought, let's use --restart rather than --force
...
--force could enable other, unwanted behavior
2012-07-26 12:17:28 -04:00
Joey Hess
a453be4195
disable client session cookie
2012-07-26 12:10:53 -04:00
Joey Hess
d9e9840c3f
update
2012-07-26 11:53:18 -04:00
Joey Hess
cccdb44874
git annex webapp --force forces a restart of the daemon
...
Useful for testing..
2012-07-26 11:52:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
82cc8d6691
2012-07-26 15:42:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
430f1a4cd7
2012-07-26 11:31:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
ffb67f9946
2012-07-26 11:24:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
5457303c1c
2012-07-26 11:24:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
587fe27951
2012-07-26 11:19:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
8393249325
2012-07-26 11:08:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
e09c57ab5c
2012-07-26 10:49:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c7ae36403b
2012-07-26 10:18:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c633739f46
2012-07-26 10:02:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
fa8c41d251
2012-07-26 09:55:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
69ea2ccf2f
2012-07-26 09:50:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
3c7cd590d8
2012-07-26 09:35:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
bdf4e05669
2012-07-26 09:27:35 +00:00
Joey Hess
c4830aaa6c
Merge branch 'master' into assistant
...
Conflicts:
doc/design/assistant/webapp.mdwn
2012-07-26 05:22:44 -04:00
Joey Hess
c3131aafc4
updae
2012-07-26 05:22:17 -04:00
Joey Hess
1290534ba1
updae
2012-07-26 05:21:05 -04:00
Joey Hess
b89b801567
update
2012-07-26 05:20:52 -04:00
Joey Hess
6cecc26206
update build deps
2012-07-26 05:13:27 -04:00
Joey Hess
9d6b59d0e2
use the secret token for authentication, and add to all dynamic urls
2012-07-26 04:50:09 -04:00
