mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22604 commits 13 branches 443 tags 106 MiB
Commit graph

286 commits

Author SHA1 Message Date
Joey Hess
7cfa1d5363 typo 2013-03-16 14:50:30 -04:00
Joey Hess
996e899acc webapp: Encourage user to install git-annex on a server when adding a ssh server, rather than just funneling them through to rsync. 2013-03-16 12:58:59 -04:00
Joey Hess
79f10b75c1 Add incrementalbackup repository group. 2013-03-16 11:17:53 -04:00
Joey Hess
77c82de4ea webapp: Display an alert when there are XMPP remotes, and a cloud transfer repository needs to be configured. 2013-03-15 17:52:41 -04:00
Joey Hess
39e979fb65 webapp: Improved UI for pairing your own devices together using XMPP. 2013-03-15 15:19:07 -04:00
Joey Hess
48d9a3182f reorg templates 2013-03-15 12:47:41 -04:00
Joey Hess
52f8ec3dc7 change syncing pause icon 
This icon was using paused to indicate syncing was paused, while the
transfers display uses the same icon as a way to *pause* a transfer.
 2013-03-15 01:43:51 -04:00
Joey Hess
291230511a tweak repo drag indicator UI 2013-03-15 00:41:42 -04:00
Joey Hess
810a06b771 webapp: Repository list is now included in the dashboard, and other UI tweaks. 2013-03-15 00:34:42 -04:00
Joey Hess
6c7ce8f193 reorg repolist 2013-03-14 22:10:51 -04:00
Joey Hess
bcc40eac4a another hamlet compat fix 2013-03-14 16:22:18 -04:00
Joey Hess
bac84ecbcd some hamlet versions do not support nested tuples 2013-03-14 15:28:11 -04:00
Joey Hess
f3c999062d re-setup repolist after longpoll refresh 2013-03-14 14:50:44 -04:00
Joey Hess
99dc302d06 webapp: Repository costs can be configured by dragging repositories around in the repository list. 2013-03-14 13:12:27 -04:00
Joey Hess
6af91dadb8 AJAX reordered list back to yesod. THIS TOOK 3 HOURS. Aargh 2013-03-14 11:56:06 -04:00
Joey Hess
b9b5c3991c drag and drop repo list (doesn't yet actually change cost settings) 2013-03-13 22:47:16 -04:00
Joey Hess
581fe0644f proof of concept remote reordering UI (needs to be changed to use drag and drop) 2013-03-13 17:59:33 -04:00
Joey Hess
0ef8d806ac gratuitous rename HomeR -> DashboardR 2013-03-12 22:18:36 -04:00
Joey Hess
8221c2b4ed split repolist out of configuration, into its own tab (temporarily) 2013-03-12 21:51:03 -04:00
Joey Hess
285838633b show build flags on webapp about page 2013-03-09 14:59:38 -04:00
Joey Hess
6e7a43ab61 avoid listing glacier when prompting to set up a transfer repository after xmpp 2013-03-07 13:01:18 -04:00
Joey Hess
f8c2dc82d8 show when not connected to xmpp server 2013-03-06 22:02:47 -04:00
Joey Hess
f8f4de45d5 fix pair complete alert combining 
The pairing complete alert had been conbining with some other alert, fixed
this and now it's displayed once xmpp pairing is complete on both sides.
 2013-03-05 16:23:56 -04:00
Joey Hess
3ceaf4e972 wording 2013-03-04 15:53:37 -04:00
Joey Hess
281005fd92 restored lost line 2013-03-04 15:53:22 -04:00
Joey Hess
08bdea7e52 webapp: New preferences page allows enabling/disabling debug logging at runtime, as well as configuring numcopies and diskreserve. 2013-03-03 17:07:27 -04:00
Joey Hess
95a244d9c4 work around yesod bug that causes a warning 
I think this is fixed in newer versions of yesod, so this commit can be
reverted when dropping support for Debian wheezy.
 2013-02-27 18:31:59 -04:00
Joey Hess
cfb1c838b4 wording 2013-02-27 02:42:13 -04:00
Joey Hess
e598b78a69 webapp: Can now add a new local repository, and make it sync with the main local repository. 2013-02-18 20:37:26 -04:00
Joey Hess
aa158a147d blog for the day 2013-02-18 18:52:47 -04:00
Joey Hess
6a067e5c28 manual and source repository groups 2013-01-21 04:18:46 -04:00
Joey Hess
06aae8fe74 link to logs on error page 2013-01-15 16:32:00 -04:00
Joey Hess
e15cca7db8 webapp: Now has a page to view the log, accessed from the control menu. 2013-01-15 13:52:35 -04:00
Joey Hess
5a9f8acb99 webapp: More adjustments to longpoll code to deal with changes in variable quoting in different versions of shakespeare-js. 2013-01-14 18:35:33 -04:00
Joey Hess
dbdfb5a8ec copyright update 2013-01-12 13:27:48 -04:00
Joey Hess
c548a6a39c webapp: Adjust longpoll code to work with recent versions of shakespeare-js. 
A while ago I added code to support recent versions of shakespeare-js,
(commit fe11b3a940). But it seems that resulted
in quoting of all strings inserted into javascript files, which means it's
now impossible to do the type of metaprogramming that longpolling.julius
relied on. I have found another way to accomplish the same thing without
needing to generate unique function names. Hopefully it's portable.

Opinion of shakespeare-js now at rock bottom. One of these days, this
needs to be redone to use Fay.
 2013-01-09 23:47:24 -04:00
Joey Hess
bad9b6761d restart UI 
Browser behavior is not ideal; a new tab is opened on restart.
Browsers won't let me redirect to a file:// so I cannot use the old tab.
 2013-01-03 18:50:30 -04:00
Joey Hess
09cbbaf537 move local repo list out of control menu 2013-01-03 16:34:57 -04:00
Joey Hess
de2e287133 webapp: Add UI to stop assistant. 
Would like to also have restart UI, but that's rather harder to do,
seems it'd need to start another copy of the webapp, and redirect the
browser to its new url, but running two assistants in the same repo at
the same time isn't good.
 2013-01-03 15:24:21 -04:00
Joey Hess
d5f18291c5 typo 2013-01-03 13:31:27 -04:00
Joey Hess
42e25f4893 fix layout 2013-01-01 15:34:42 -04:00
Joey Hess
c9fd389fbf webapp: Encryption can be disabled when setting up remotes. 2012-12-04 13:28:22 -04:00
Joey Hess
4f4209b833 webapp: Added help buttons and links next to fields that require explanations. 2012-12-02 22:33:30 -04:00
Joey Hess
c941523b63 webapp: Prettify error display. 2012-12-02 15:02:49 -04:00
Joey Hess
3dfc9cadb0 simplify 2012-11-25 00:38:11 -04:00
Joey Hess
59733456ed refactor 2012-11-25 00:27:17 -04:00
Joey Hess
463cf58140 webapp and assistant glacier support 2012-11-24 16:30:15 -04:00
Joey Hess
453587d392 UI for enabling existing webdav remotes 2012-11-17 16:10:13 -04:00
Joey Hess
7addb89dc1 webapp: support box.com 2012-11-17 15:30:11 -04:00
Joey Hess
d468e37f46 automatic repolist updating 2012-11-13 17:50:54 -04:00
Joey Hess
75dbce69e6 Show error message to user when testing XMPP creds. 2012-11-13 13:21:09 -04:00
Joey Hess
23d3e1c5f7 add 2012-11-11 22:29:38 -04:00
Joey Hess
8b22bd8831 add a yes/no confirm for xmpp pairing requests 2012-11-11 22:29:16 -04:00
Joey Hess
b91f07fe83 split up xmpp and local pairing UIs 2012-11-11 17:41:56 -04:00
Joey Hess
b160856297 end of xmpp pairing page encourages adding a shared cloud repository 2012-11-10 20:38:52 -04:00
Joey Hess
75048b43e2 split repository comfiguration page into several widgets 2012-11-10 17:08:43 -04:00
Joey Hess
fd22734392 show when a buddy is already paired 2012-11-10 16:36:21 -04:00
Joey Hess
42f030c905 XMPP pair requests are now received, and an alert displayed 2012-11-03 17:46:22 -04:00
Joey Hess
b95c255b6d XMPP pairing notifications are now sent 
Rest of pairing process still to do.
 2012-11-03 16:01:09 -04:00
Joey Hess
2541b109e0 layout 2012-11-02 21:37:25 -04:00
Joey Hess
a6d15938ab fix marking git-annex clients away when they disconnect 2012-11-02 21:36:26 -04:00
Joey Hess
54fcfd42d2 typo 2012-11-02 21:31:08 -04:00
Joey Hess
6a61829e2d add buddy list to pairing UI 2012-11-02 21:13:06 -04:00
Joey Hess
088e89b422 adjust wording, which was a bit incorrect due to new and planned features 
xmpp sync in particular
 2012-10-31 16:28:40 -04:00
Joey Hess
796ebaf6f8 add a link to vixie's personal colo list 2012-10-31 16:24:21 -04:00
Joey Hess
4b55761a79 improve layout 2012-10-31 16:23:02 -04:00
Joey Hess
a4c6b30e2c avoid using Blaze directly 
New 0.5 changes the api, rather gratuitously, so run away. I can juse use
Hamlet here.
 2012-10-31 13:27:56 -04:00
Joey Hess
96c7a5ce32 fix intro display when there is 1 remote 2012-10-30 18:21:13 -04:00
Joey Hess
b72d04988f add an icon for The Cloud 
I am befuddled that Twitter Bootstrap has no built-in Icon for The Cloud,
and also that Chromium's depiction of CLOUD (U+2601) has an uncanny
resemblance to PILE OF POO (U+1F4A9) when rendered small, and looks like a
looming Frankenstorm when rendered large, and not a sweet, sunny, nothing
can go wrong The Cloud.
<http://www.fileformat.info/info/unicode/char/2601/browsertest.htm>

So, I must resort to irony in my choice of icons.
 2012-10-27 11:24:35 -04:00
Joey Hess
6803667f00 store xmpp creds from form 2012-10-26 17:13:30 -04:00
Joey Hess
07494cbb4b XMPP configuration form 
Currently relies on SRV being set, or the JID's hostname being the server
hostname and the port being default. Future work: Allow manual
configuration of user name, hostname, and port.
 2012-10-26 14:17:09 -04:00
Joey Hess
4aaa8665e1 add template for xmpp, not used yet 2012-10-25 16:50:41 -04:00
Joey Hess
5265ca4423 add link 2012-10-17 16:30:32 -04:00
Joey Hess
59170c4187 hyperlink to repository edit form from transfer display 2012-10-17 14:45:58 -04:00
Joey Hess
362e18e3fd allow renaming git remotes in the edit form 2012-10-14 17:18:01 -04:00
Joey Hess
d9e65ff4be format 2012-10-14 15:22:33 -04:00
Joey Hess
a7642b3b6e add syncing enabled/disabled to repo list with icon, and toggle link 
The toggle link doesn't work yet.

Also lots of refactoring and type improvements
 2012-10-12 01:09:28 -04:00
Joey Hess
0b266f970f set/unset annex-sync, rather than annex-ignore 
This reserves annex.ignore for repos that should not be visible at all;
repos with syncing disabled are now skipped by the assistant, but are
displayed in the list and can be configured.
 2012-10-11 19:22:29 -04:00
Joey Hess
f31d292ab1 after setting up a new repo, go to a special version of the configuration page 2012-10-11 17:35:08 -04:00
Joey Hess
5b9900133c allow disabling syncing to a repo on its edit form 
This is not quite right yet, since it disables it so hard it doesn't show
up in the repo list anymore!
 2012-10-11 17:14:42 -04:00
Joey Hess
4ef6dac5c2 webapp: Improve wording of intro display. Closes: #689848 2012-10-11 15:04:38 -04:00
Joey Hess
f06587ba23 basic repository edit form 
Only shows description so far.
 2012-10-09 15:11:48 -04:00
Joey Hess
b6a3f03f82 add "configure" link to each repository in the webapp's repo list 2012-10-09 14:43:53 -04:00
Joey Hess
1087fac544 add a alert at the top of the main part of the webapp, above the transfers display 
Based on feedback that it was too sparse to be clear what it's doing.
 2012-09-28 13:30:29 -04:00
Joey Hess
8b61bac418 put version on about page 2012-09-27 18:09:05 -04:00
Joey Hess
a02d6b36d8 Add OSX standalone app license bundle, and arrange for the About page 
to link to it.
 2012-09-27 16:47:52 -04:00
Joey Hess
53c970429f stub in NAS 2012-09-27 13:00:16 -04:00
Joey Hess
8bc70a85c6 add tooltips 2012-09-27 12:55:00 -04:00
Joey Hess
c2c577f34f allow enabling existing S3 repos 2012-09-26 15:24:23 -04:00
Joey Hess
17708dd173 add a configurator for S3 2012-09-26 14:44:07 -04:00
Joey Hess
6cea492cf2 fix link 2012-09-18 21:28:41 -04:00
Joey Hess
18bae020ed make other repositories list list all autostarted repos 
And add a form to add another, unrelated repository
 2012-09-18 17:50:07 -04:00
Joey Hess
811f81f481 italicise unconfigured repos 2012-09-13 17:31:36 -04:00
Joey Hess
74906ed13f UI for enabling special remotes 
Now other repositories can configure special remotes, and when their
configuration has propigated out, they'll appear in the webapp's list of
repositories, with a link to enable them.

Added support for enabling rsync special remotes, and directory special
remotes that are on removable drives. However, encrypted directory special
remotes are not supported yet. The removable drive configuator doesn't
support them yet anyway.
 2012-09-13 16:50:02 -04:00
Joey Hess
4227050bbe add note about LANs 2012-09-11 15:31:38 -04:00
Joey Hess
c20d6f4189 responding to pair requests *almost* works 2012-09-10 17:53:51 -04:00
Joey Hess
690b424cad unify bootstrap icon names in a data type 2012-09-09 15:09:22 -04:00
Joey Hess
f75ac910c4 display icon for alerts with no header too 2012-09-09 14:59:46 -04:00
Joey Hess
c066faf4b9 wording 2012-09-09 01:05:23 -04:00
Joey Hess
1e41c0d85e update pair request alert when button is pressed 2012-09-09 01:02:44 -04:00
Joey Hess
f62cc48482 reorg templates 2012-09-08 23:32:08 -04:00
Joey Hess
6e60b08060 moved the PairStage inside the Verifiable data 2012-09-08 21:06:10 -04:00
Joey Hess
e59b0a1c88 first pass at alert buttons 
They work fine. But I had to go to a lot of trouble to get Yesod to render
routes in a pure function. It may instead make more sense to have each
alert have an assocated IO action, and a single route that runs the IO
action of a given alert id. I just wish I'd realized that before the past
several hours of struggling with something Yesod really doesn't want to
allow.
 2012-09-08 19:57:15 -04:00
Joey Hess
0f0c7f8d70 added pair listener thread 2012-09-08 15:07:44 -04:00
Joey Hess
3dd4b4058f implement pair request broadcasts 
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.
 2012-09-08 13:04:19 -04:00
Joey Hess
0c01348b65 pairing passphrase entry form, validation, etc 
Actually 3 forms in one, this handles the initial passphrase entry, and the
confirmation, and also varys wording if the same user or a different user
is confirming.
 2012-09-08 02:02:39 -04:00
Joey Hess
46fd6b54c7 rsync.net configurator tested and 100% working 2012-09-04 15:27:06 -04:00
Joey Hess
b584d96c13 rsync.net configurator display 
Doesn't set up the repo yet.
 2012-09-03 00:39:55 -04:00
Joey Hess
6a45ca4658 reorg page, split out each cloud provider into a separate column 2012-09-03 00:13:19 -04:00
Joey Hess
b6a91d7a4d defer setting up ssh public key until after confirmation 2012-09-02 20:43:32 -04:00
Joey Hess
014974a7da allow making encrypted rsync special remotes 
wow, that was easy!
 2012-09-02 17:32:24 -04:00
Joey Hess
94d75d88ab layout 2012-09-02 15:37:18 -04:00
Joey Hess
97ce4d24cb adding ssh remote working 
Rsync remote still needs work
 2012-09-02 15:27:00 -04:00
Joey Hess
78f9e954a0 show modal while cloning to removable drive 2012-09-02 15:04:29 -04:00
Joey Hess
837cd79e4f add ssh confirmation page 
also broke out webapp types into a separate module
 2012-09-02 00:49:25 -04:00
Joey Hess
32ab049f9c ssh connection testing and key setup 2012-09-01 20:37:35 -04:00
Joey Hess
10a48da988 typography 2012-08-31 19:39:44 -04:00
Joey Hess
54a492db5f UI for adding a ssh or rsync remote 2012-08-31 18:59:57 -04:00
Joey Hess
86fb1305dc split out local repo configurators 2012-08-31 15:17:12 -04:00
Joey Hess
9219f0baee display "paused" when transfer is paused 
This makes the buttons in the UI a little clearer. I'd prefer to enable the
barberpole animation for running transfers, but that is jerky looking due
to the way the dashboard is updated.
 2012-08-29 18:34:50 -04:00
Joey Hess
37eed5d8d0 fix button display for paused transfer 2012-08-10 18:50:21 -04:00
Joey Hess
09449792fa factor out onclick javascript 2012-08-08 17:07:38 -04:00
Joey Hess
94fcd0cf59 add routes to pause/start/cancel transfers 
This commit includes a paydown on technical debt incurred two years ago,
when I didn't know that it was bad to make custom Read and Show instances
for types. As the routes need Read and Show for Transfer, which includes a
Key, and deriving my own Read instance of key was not practical,
I had to finally clean that up.

So the compact Key read and show functions are now file2key and key2file,
and Read and Show are now derived instances.

Changed all code that used the old instances, compiler checked.
(There were a few places, particularly in Command.Unused, and the test
suite where the Show instance continue to be used for legitimate
comparisons; ie show key_x == show key_y (though really in a bloom filter))
 2012-08-08 16:20:24 -04:00
Joey Hess
96950a3b40 add pause/start and cancel buttons to transfer display 2012-08-08 14:14:19 -04:00
Joey Hess
77cd327170 fix display of icon in block alert heading 2012-08-06 17:15:27 -04:00
Joey Hess
94e92a1b58 make alerts change tense when they finish 2012-08-06 15:00:46 -04:00
Joey Hess
aab3a01a71 merge two repository screens into one 2012-08-05 19:55:06 -04:00
Joey Hess
46feae36b6 remove links from unimplemented options 2012-08-05 19:21:28 -04:00
Joey Hess
a3f76fe696 wording 
De-emphasize "clone", because it's not that simple. The removable drive may
already have an annex with content; if so it'll get synced in.
 2012-08-05 15:57:30 -04:00
Joey Hess
ccedd06023 make button primary 2012-08-05 14:49:38 -04:00
Joey Hess
e125ce74b8 work toward adding new repos on removable drives 
This actually does add a new repo, but it doesn't yet set up
remotes, or sync to it.
 2012-08-04 18:17:16 -04:00
Joey Hess
e0c3958d9a improved config 2012-08-03 20:40:34 -04:00
Joey Hess
1bd2be549f add extra sidebar widget 
html is slightly broken
 2012-08-03 20:10:32 -04:00
Joey Hess
bbea7757ab update 2012-08-03 17:22:35 -04:00
Joey Hess
b1a5a4f985 moving toward configuring new repos in the webapp 2012-08-03 14:36:16 -04:00
Joey Hess
02556b5acd remove duplicate nojs refresher 2012-08-03 10:06:34 -04:00
Joey Hess
1f89712e6b add a navbar button that opens the repo in the desktop's native file browser 
This should work on linux (xdg-open) and OSX (open). If the program
is not in $PATH, it falls back to opening a browser window/tab with file:///

The only tricky bit is the javascript code, that handles clicking on the
link. This is to avoid unnecessary page refreshes. Until I added the
return false at the end, the <a>'s normal click event also fired, so two
file browsers opened. I have not checked portability extensively.
 2012-08-03 10:02:56 -04:00
Joey Hess
7cc5fdbd7b layout 2012-08-02 09:08:58 -04:00
Joey Hess
ffeb060002 don't use hamlet for htmlshim 
This allows me to not build-depend on blaze-markup, which was causing
me some trouble when tring to build with cabal on debian. Seems debian
ships Text.Blaze.Renderer.String in two packages.
 2012-08-01 21:28:37 -04:00
Joey Hess
bab80bf24a full input validation for repository path 
Expands ~ , checks for every crazy input problem I can think of
 2012-07-31 20:56:10 -04:00
Joey Hess
c950e8fba0 move out to template 2012-07-31 18:33:19 -04:00
Joey Hess
4b5ffe8f9b implemented the addrepository form 
shiny!
 2012-07-31 17:57:08 -04:00
Joey Hess
c70496dc7f improve first run screen 2012-07-31 16:13:09 -04:00
Joey Hess
0d3686972d form 2012-07-31 12:33:52 -04:00
Joey Hess
04794eafc0 webapp now starts up when run not in a git repo 2012-07-31 12:17:31 -04:00
Joey Hess
e9d9d9d5ea add icons 2012-07-31 03:10:16 -04:00
Joey Hess
02b345249b stub 2012-07-31 02:35:07 -04:00
Joey Hess
c77411053b remove clickability on brand 2012-07-31 02:33:51 -04:00
Joey Hess
2c8bbdf307 made navbar work 
also added an About page and a stub Config page.
 2012-07-31 02:30:26 -04:00
Joey Hess
5fed026bcd reorg templates 2012-07-31 01:24:49 -04:00