Commit Graph

402 Commits

Author SHA1 Message Date
Brad Fitzpatrick 313f8d25cb camlistored: log more version info at start
Change-Id: I3e1e27f6a475e438bb3bf6c06ca3a0941a2944eb
2013-11-28 08:55:53 -08:00
Brad Fitzpatrick eae8a74fc9 serverconfig/genconfig: add kv queues to all sync handlers.
In the future this might be more configurable (e.g. mysql or sqlite or whatever, or different
paths).  But this works for now.

Change-Id: I85853e6bfdd9063fc2eba5922b138d5552b730a9
2013-11-24 15:12:11 -08:00
Brad Fitzpatrick 9e3a9fde51 server/camlistored: add start-up test that tests default production config file
Marked as broken for now. Will fix in subsequent commits.

Change-Id: If41932a72312ce8fbde1d237c3f84fa0acae83ee
2013-11-24 15:03:34 -08:00
Aaron Boodman 650bd9b61e Display a folder icon and make camliPath attributes navigable.
Like we do for camliMember.

Change-Id: I2db51d7397e0f8ab86ea71716fe06099ba22005a
2013-11-22 22:49:07 -08:00
mpl f8b41e236e Merge "server/publish.go: use go html template for publishing" 2013-11-19 22:22:17 +00:00
mpl a6aeff034c server/publish.go: use go html template for publishing
Change-Id: Ic1c55d35e52e407864d339927b453de58a64e03c
2013-11-19 17:50:26 +01:00
Aaron Boodman 3f7543853a Bugfix: incorrect baseURL passed to InstallHandlers
Change-Id: Iaf26a806358cd82ca09c48d83ca86155e27c289d
2013-11-17 00:41:01 -08:00
Aaron Boodman e4f25a2444 First little bit of Flickr importer.
Change-Id: Ia42b07a81b01904f5722d06653c4bf9de2e81c64
2013-10-20 11:18:53 -07:00
Brad Fitzpatrick cf116c6da9 importer: work on infrastructure for third-party import from other sites
Change-Id: Ib4e5e4d543a1b2a913b99fa0a4d92f1a5b94c5dc
2013-10-19 15:48:05 -07:00
Aaron Boodman 02665d5d3c Use pushstate() to give searches URLs and history entries.
Also, remove note about bref support from search instructions since
apparently that isn't supported yet.

Change-Id: I1ccbb8be44aa62ae7191aef913c7a226fd90a775
2013-10-16 23:54:26 -07:00
Aaron Boodman 8418852996 Combine search and index page functionality.
Also:

* Changed favicon to a safe
* Clean up design of toolbar
* SVG support buggy in Chrome, replace SVG checkmark icons with PNG

Screen cap:
http://vault.aaronboodman.com/share/sha1-2dbb2b515fc84f2ef1395ee263cd41c1a6700de2?via=sha1-6eb9c7651ffa8e6f4f95e8fc6800a4672c4e179a&assemble=1

Change-Id: Ic5d2eb30ea1d72022a2b8804cae887319ac32a1b
2013-10-16 01:08:02 -07:00
Aaron Boodman 74eb8e6c3c Further visual refinements to layout of homepage:
* Increase default image size a few settings
* Increase gutter between items
* Remove extraneous padding and whitepsace
* Remove unneeded gigantic heading
* Move build version into statusbar
* Change algorithm for fitting rows -- instead of preferring to clip
  edges of image, instead prefer to adjust height of rows. I find it
  looks more interesting visually when the widths of the images vary
  more.
* Replace folder and file icon with something better looking
* Swap order of + and - buttons in toolbar, they were backward from
  what is typical

Change-Id: Idfe85a813926c2c9eea774a86046df62ecacd45c
2013-10-04 14:04:38 -07:00
Aaron Boodman aac43b56fc Move to "G+-style" selection.
To select an item, click the checkmark that overlays on rollover.
To navigate, just click anywhere else on the item.

Also move selection from additive by default rather than exclusive.

Change-Id: I47e6ca1942fe1fdaaf615f6ab0e0a547f1a51735
2013-10-03 22:06:31 +00:00
Aaron Boodman f322018816 Move the button to create permanode into toolbar.
Also:
* Make the entire BlobItemController a drop target for new files,
  except for when over a set, then the set is the target.
* Minor visual refinements to highlight states during dragging.
* Fix bugs/flicker in dragdrop code.
* Fix bug where there is an empty button in toolbar before the first
  item is selected.

Change-Id: I3c40a476395c885477e1316e6ff168399640e347
2013-10-01 00:16:29 -07:00
Andrew Gerrand 4ca346f124 add diskpacked storage system
Change-Id: Ieb16459c06d596ad49bbe78b6e058955fcd6f649
2013-09-02 10:35:32 +10:00
Brad Fitzpatrick ca64e4f508 camlistored: on SIGINT, shut down cleanly, closing the kvfile index db
Change-Id: Ifcb8c22b088586bc72ad98dacc3be2d46e77928b
2013-08-26 21:07:28 -05:00
Brad Fitzpatrick ef6bc9499e Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2013-08-25 12:58:34 -05:00
Brad Fitzpatrick 46020e1551 Make kvfile index the default if SQLite isn't available.
We now work out of the box, with no external dependencies.

Change-Id: I8d0cedb33518e418a7ff28cdb22f9ba9ef400d6f
2013-08-25 12:57:51 -05:00
Brad Fitzpatrick 1e15d7ee89 Merge "camlistored: Adding --openbrowser flag, determines whether start page should be opened in browser. Start page should be / on the initial startup to let the user to config the server, and /<uiPath> on the following starts." 2013-08-25 17:31:35 +00:00
Burcu Dogan d0d5f3a1fa camlistored: Adding --openbrowser flag, determines whether start page should be opened in browser. Start page should be / on the initial startup to let the user to config the server, and /<uiPath> on the following starts.
Change-Id: I3ac055161c5023bd338fccccda83376df7381c64
2013-08-25 12:30:46 +02:00
Brad Fitzpatrick d6a0b34e5f camlistored: link in kvfile
Change-Id: I55f65275b45f7de0efc0c52e84ac61f4baebaa38
2013-08-23 17:14:33 -05:00
Josh Huckabee 8bf1eb8a9b Add postgres setting to default config file.
Change-Id: I45f374e61f17286f5c825ef537d052407ff1bccd
2013-08-22 10:02:58 -07:00
Brad Fitzpatrick b0d2a8f0e5 Merge "Adding Google Drive as a storage backend experimentally. No cheap-enough way of enumerating Drive files, needs to be fixed once Drive supports range queries. Allows you to sync to /sto-googledrive/, but not from." 2013-08-17 15:51:51 +00:00
Burcu Dogan 6e6e910af1 Adding Google Drive as a storage backend experimentally. No cheap-enough way
of enumerating Drive files, needs to be fixed once Drive supports
range queries. Allows you to sync to /sto-googledrive/, but not from.

Change-Id: I6ac5ef02c5f51a6abdab5c207a3a5693c6bb8581
2013-08-17 15:30:02 +02:00
mpl d992780f03 Merge "camlistored: help getting started on windows" 2013-08-16 17:19:12 +00:00
mpl f5709afdd8 camlistored: help getting started on windows
-fail early when new config has sqlite but no sqlite installed
-hint at the server config doc url
-added windows with mysql section in the server config doc
-fixed typo in mongo indexer option

Change-Id: I4266eb6e34a55901e6af90a32eb1411fb5c37688
2013-08-16 19:14:30 +02:00
mpl 40951c103f appengine: fix the UI
-dev-appengine populates the default sourceRoot.
-app.yaml filters out the go files from the static
resources
-the UI handler warns that sourceRoot is required

Change-Id: I816456a882ff4b0573bc8962cce85139d8a0f611
2013-08-16 18:49:51 +02:00
mpl 489c78746b ui: deal better with unexpected non JSON responses
Change-Id: Ieacac4dc734421743ca30bf79b0f3afdbbe00892
2013-08-11 21:11:02 +02:00
Brad Fitzpatrick ba63f77d32 Merge "Improve appearance of non-image permanodes." 2013-08-05 15:01:20 +00:00
Brad Fitzpatrick 1f1c54e9f3 Merge "Schedule relayout whenever children are added to BlobItemContainer." 2013-08-05 14:59:59 +00:00
Aaron Boodman 5e24502348 Schedule relayout whenever children are added to BlobItemContainer.
This fixes some bugs where we don't relayout when items are added
to BlobItemContainer for various reasons.

Change-Id: Ie434acc12e660af438b93d2dabd41f3d75fb7493
2013-08-05 00:05:32 -07:00
Aaron Boodman ace41589a8 Improve appearance of non-image permanodes.
The add button still looks poo, but that will be a separate change.

Change-Id: Iea5fd53f7f4eabfc8c2ed45c043fcbd661b68077
Screenshots: http://imgur.com/JARUznn,tsv6dgU
2013-08-04 22:55:08 -07:00
Brad Fitzpatrick e3d3238989 closure: remove weird line breaks from buggy goimports, fmt
Change-Id: I65c8952d7fb3fbcdbaf61f004addf4514a8eee9a
2013-08-03 22:42:49 -07:00
mpl 66bc4f35d6 Merge "dev-server: remove. replaced by devcam server." 2013-08-03 16:34:35 +00:00
mpl f4ef8c0375 dev-server: remove. replaced by devcam server.
Fix related docs, config files, buildbot...

Change-Id: I638d3856f42953603b13204fb56782974d0db9ee
2013-08-03 01:12:38 +02:00
Brad Fitzpatrick e8d0200a11 Merge "integration tests: kill camlistored when all tests are done" 2013-08-02 19:04:41 +00:00
mpl 5fa82a3abb integration tests: kill camlistored when all tests are done
-osutil: PollParent to monitor parent process.
-camlistored: option to kill itself if it has been orphaned.

Change-Id: I87193254d55847e46134439ecd1b04f71718d083
2013-08-02 15:42:49 +02:00
Aaron Boodman 24458fca93 Tile images nicely within BlobItemContainer.
Screenshots here: http://imgur.com/XN9qFLP,PeEDPnW,CS35Pw6,VS0nHaG,SNT1ZXZ,2nMWVYz,8RmuLuw,NE8b26n,EFErMdg

Change-Id: I6a66b5b782363882261b80e7ac9930ff1046efa6
2013-08-01 22:25:52 -07:00
Aaron Boodman 02e0d5fc33 Prevent BlobItemContainer from receiving focus.
This seems to fix https://code.google.com/p/camlistore/issues/detail?id=183.
I could not find the code that is actually causing scrolling to occur ... I am
guessing something in Closure somewhere.

However, I also couldn't think of any reason for this component to be
focusable, and this doesn't seem to break anything that I can see.

Change-Id: Iaf64555ee175c774a218bb32d9bb4f97f46cc636
2013-07-28 17:17:33 -07:00
mpl 847c583183 UI toolbar: open search or index in same window/tab
Change-Id: I242fc4a23437b8ccf6bc6f33c3f8a7d9fdfc0023
2013-07-16 16:43:03 +02:00
mpl d5641cce0f UI index: enable drag and drop on a collection
Dropping anywhere on the container is now disabled.
One can either drop on the CreateItem (which results
in the same as dropping on the container was), or
drop on a collection thumbnail, which will not only
create the permanodes but add them to the collection
on the fly.

Change-Id: Ia4d761b2be25822a561c94c397dded02853e5b77
2013-07-15 17:32:53 +02:00
Brad Fitzpatrick d9eee3fe21 Merge "blobinfo: protect against xss from filename" 2013-07-08 22:58:01 +00:00
mpl 4a36967bc1 blobinfo: protect against xss from filename
http://camlistore.org/issue/173

Change-Id: I0b94578cea671ab3ba330a498f835a6e0bfdfc68
2013-07-09 00:21:41 +02:00
Michael Zuffoletti c2669a6dfc issue 23: Fix google storage blobserver as sync dest
Change-Id: I33d88dc5028ebb76d4c17d2a00d8f8346114f876
2013-07-08 11:33:10 -05:00
Brad Fitzpatrick 9468e5ba70 More docs. Every package is documented now.
misc.CountingReader moves into readerutil.

pkg/atomics is folded into pkg/types.

pkg/test/testdep is folded into pkg/test, with better name/docs.

Old cruft from pkg/webserver is deleted.

Change-Id: I3f72d8b29804254ef944995fb085837c878f79f5
2013-07-07 21:12:30 -07:00
mpl 6e7030d7bb Merge "ui: use local sprite for the toolbar bg" 2013-07-05 18:02:06 +00:00
mpl b47c75be7d ui: use local sprite for the toolbar bg
http://camlistore.org/issue/170

Change-Id: I66c7dee6f7072d477fed0eb41027f712d72bc8fb
2013-07-05 20:01:00 +02:00
mpl 004c261358 closure: GenJSDeps now takes a VFS, delete ui/deps.js
This changes allows to always dynamically serve deps.js, generated
either from the local files, or from the embedded resources.
ui.go and publish.go now make use of it.

http://camlistore.org/issue/151

Change-Id: I129895b2c65a0726c1239bdd7387c62e90649a9d
2013-07-05 19:43:22 +02:00
mpl 3fdf0b0af6 Merge "server_connection: show error when xhr fails" 2013-07-04 20:52:57 +00:00
Brad Fitzpatrick f3e2862660 Merge "pics.js: fix element index bug and indent" 2013-07-04 20:11:51 +00:00
mpl 3cec70b4ad ui: rm wantsRecentPermanodes and index-compiled.html
Change-Id: I5dd8d0b11b5b82f51738fbe5669f5a7798929300
2013-07-04 21:47:34 +02:00
mpl e95ddeb36a pics.js: fix element index bug and indent
Change-Id: Id1aee8f1725ccb2ef1e7fbc85f1293b89a9ec28e
2013-07-04 16:11:58 +02:00
mpl 9b392f39a4 server_connection: show error when xhr fails
Change-Id: Ibe82cb33f04cc606740ec136e1ffb524a7025730
2013-07-04 14:48:36 +02:00
mpl e2f9403f63 ui/blobinfo.js: check mimeType presence to avoid exception
http://camlistore.org/issue/165

Change-Id: Ie1ee86b5cc7807786d428efb92f2f571dd0450f2
2013-06-27 17:14:20 +02:00
Brad Fitzpatrick fd759e2413 Show UI from base URL.
Change-Id: I1b722241fce0be7ebbce7bbdb87bc9b6e96b9121
2013-06-26 12:50:23 -07:00
Brad Fitzpatrick a826b177f9 Don't bring out failures to open a browser. The URL is already printed.
I don't care that xdg-open isn't available.

Change-Id: I453c44a172399fe8ecf9aa0551a5628f408f5f28
2013-06-26 12:48:21 -07:00
Brad Fitzpatrick da86949a92 Fix UI's debug JSON verification
Fixes https://code.google.com/p/camlistore/issues/detail?id=163

Change-Id: I6bdd57b9c47b6465ba01336a3a5f0487889ea327
2013-06-26 11:15:17 -07:00
Brad Fitzpatrick 909d310e2f Prettier JSON claims from web UI.
Fixes https://code.google.com/p/camlistore/issues/detail?id=162

Change-Id: I0a154c267665d189d43b0742047a8229bf627e65
2013-06-26 11:07:18 -07:00
mpl 0de2881a16 client: help (wrt to the gpg key) initialize the config
Change-Id: I983e4396abacbc4d8fc354863cffeece65dd5b90
2013-06-22 01:16:11 +02:00
Brad Fitzpatrick 1c9436d26a Make sourceRoot take precedence over fileembedded resources. 2013-06-20 14:58:12 -07:00
Brad Fitzpatrick b4087ccc36 Remove CAMLI_DEV_UI_FILES and last zembed file. 2013-06-20 13:44:30 -07:00
Brad Fitzpatrick 48d282991c Remove all the html/css/js zembed files from the tree, for now. 2013-06-20 11:49:10 -07:00
mpl d9258434fe ui: zembeds should belong to package ui, not newui
Change-Id: I5d69e73280051eb8b97f3e082e5cfe285439dac6
2013-06-20 19:07:05 +02:00
Brad Fitzpatrick 10d000d900 ui: serve Closure from embedded zip data when available
Change-Id: I9bb6bb4f13f69b293fd98441d82068c0677ffbd5
2013-06-18 23:14:36 -07:00
Brad Fitzpatrick 83e42a14a8 Add server/camlistored/ui/closure package stub.
Change-Id: I1b8fd14e1d30326077e313d53594136e0b7c9de5
2013-06-18 11:36:44 -07:00
mpl ed798d8118 ui: update zembeds because of previous search changes
Change-Id: Iab9e8d3ad1ee5d2ccc163b637fae3c7038f1ef4b
2013-06-13 01:26:07 +02:00
Brad Fitzpatrick 1eb2866d0f Merge "ui: always reset blobcontainer children upon a search" 2013-06-12 22:04:44 +00:00
Brad Fitzpatrick a71162ab5f Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2013-06-12 13:45:19 -07:00
mpl 084ce4c187 ui: always reset blobcontainer children upon a search
Fixes: http://camlistore.org/issue/143

Change-Id: Ic2f139dc207f518c7904bcbcb1577115e93ca3c8
2013-06-12 17:05:57 +02:00
mpl a32b4a10be Merge "sqlite: Write-Ahead Logging, for improved concurrency" 2013-06-12 15:00:30 +00:00
Brad Fitzpatrick 11c32c142b Start of encryption support.
Change-Id: If99ac252fffa8b50f0a17e94e8aa454295dd7e2b
2013-06-12 04:35:50 -07:00
mpl 777abd6e31 ui: fix blobitem title issues
http://camlistore.org/issue/141

Change-Id: I391bfba6a2083132e8998fcc8c2ae712cfc69836
2013-06-11 14:53:23 +02:00
mpl 75507e65fa newui: Final move to get rid of the old ui!
1) Everything in ui/ except for js-notes.txt was removed.
2) mv newui/* ui/
3) modified pkg/server/ui.go to make it all work
4) modified Makefile to generate server/camlistored/ui/deps.js
5) regenerated all the zembeds
6) Some fixes to attempt to make it (re-)work on appengine:
  -removed the Go1.1 check
  -added pkg/osutil/restart_stub.go (for restarting a process)
7) The closure handler now redirects to the online files when
the closure library is not on disk, because we do not embed
the required closure js files.

Change-Id: Id1bcf007550cafb7188ba2674352e8f3bd07fb8c
2013-06-11 13:25:59 +02:00
Brad Fitzpatrick 5e13871b67 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2013-06-10 01:34:39 +02:00
Brad Fitzpatrick c6cb32bcac fileembed: put all metadata first, and also support rolling checksum splitting of large embeds
Change-Id: I9da21c9a21cb2f9b04484d4374a621cb4b97679d
2013-06-10 01:11:03 +02:00
mpl 4ea052fca0 newui: permanode: rm type drop down, added cammount tip
Change-Id: Iec6f4fb7c3e7ad1ed92ee409822f15a5e2d41e11
2013-06-10 00:41:05 +02:00
mpl ddc9a32426 newui: fixed bug on permanode page, constrained a type, added a TODO
Change-Id: Ibb92f4fbc9a4a433b9f3ebd53c9f5b8ccc50edea
2013-06-09 20:18:36 +02:00
mpl 277795ad46 Merge "server status: bugfixes, and rid of version as a field." 2013-06-09 17:12:11 +00:00
mpl 9942cda125 server status: bugfixes, and rid of version as a field.
Also smaller font on the index page

Change-Id: I5918dedfadf551a8a982d74670fefc4174555c72
2013-06-09 19:27:17 +02:00
mpl 7059a616c0 show server status on index page
We're only showing build version for now.
Next step would be status handler.

See http://camlistore.org/issue/111

Change-Id: I9e0792abe9ffed8139d38478d186b6e75f99de7e
2013-06-09 18:46:24 +02:00
mpl b815a01347 Merge "show server status on index page" 2013-06-09 16:34:05 +00:00
mpl 39f1c2bae1 ui: published gallery fix
Change-Id: I42320d31da7393a2062833897ec581a245608d7c
2013-06-08 19:08:29 +02:00
mpl 3040e3852e Merge "WIP: switch from ui to newui" 2013-06-05 12:29:29 +00:00
mpl 11a3f78691 WIP: switch from ui to newui
This CL proposes 4 changes:

1) When making the embeds, any .html files in newui is rewwritten
on the fly so that the resulting embed uses all.js instead of
individual .js files. all.js is the only javascript file embedded
for newui.

2) Various bugs and paths in the newui/*.js files were fixed so that
everything works when using all.js

3) pkg/server/ui.go was modified so that all features from ui should
now have an equivalent in newui, that is served through ui/new/.
In a next step, we can move back everything from newui/ into ui/ and
completely get rid of the old ui.

4) The published gallery now uses closure too.
In another next step, we should probably work on serving its static
part directly from an .html file or (include it in the zembed somehow?)
instead of generating it at every request. Or at least cache it?

This commit includes the zembeds in newui, except for zembed_all.js.go
since it is large and it would take a lot of space in the git history
everytime we change it.
The plan is to roll-sum it into chunks to address that problem.

Change-Id: I381d8ddf3a2bbe37e3c4b1c4bf423f16beffaaf4
2013-06-04 16:34:51 +02:00
Brad Fitzpatrick 45287dbd15 Merge "newui: filetree" 2013-05-25 21:42:48 +00:00
Brad Fitzpatrick e7486b0009 Update embeds
Change-Id: If959ebbfc1932b5ae89eac3bb480e90f95abe22a
2013-05-25 14:54:35 -07:00
mpl 64ddd47788 newui: filetree
Change-Id: Ibf8972a57c7253e55bcfcc679d141e933db3fe7b
2013-05-24 20:00:22 +02:00
Brad Fitzpatrick eb76b61a18 Merge "newui: debug page" 2013-05-23 19:08:33 +00:00
Brad Fitzpatrick 09eb1ce549 Merge "newui: search; select collection, like on index page" 2013-05-23 19:08:03 +00:00
Brad Fitzpatrick c88abec2b0 Merge "newui: permanode page: show members as blob container" 2013-05-23 19:07:44 +00:00
mpl b1577e34b9 ui: fix filetree (subsequent to describe response changes)
Change-Id: Ib715693ea98206158680cd9bec1566d6fe11ca96
2013-05-23 18:04:56 +02:00
mpl b126f548d3 newui: permanode page: show members as blob container
Change-Id: Ifd2a52e6ef97f97b9fb16bc11888be6875faf832
2013-05-23 16:54:33 +02:00
mpl 0a6a178333 newui: debug page
Change-Id: I9b6cbf007686cc0566dbf3c1d2c14ad3e83749fd
2013-05-22 17:09:02 +02:00
mpl d71d149522 newui: search; select collection, like on index page
This change also introduces the "bref:" prefix search,
to search a permanode by blobref (mainly to then
set that permanode as the current collection).

Change-Id: I9a8e6663dc6e6aff599c6740936b770cd5c54b4a
2013-05-21 23:12:11 +02:00
mpl 2ca201dd41 newui: index; select a current set, add members to it
This change adds 2 buttons to the toolbar.

1) setAsCollecButton_ is enabled only when a single item
(which has no content) is selected. When clicked, the button
sets that item as the currently selected collection/set
(BlobItemContainer.currentCollec_).

2) checkedItemsAddToSetButton_ is enabled when
currentCollec_ is set and some items are selected. When
clicked, it adds the selected item(s) to the current collection.

Change-Id: Ib8dcfa308b03b114e54612cd790e4b24e60a9d53
2013-05-21 20:35:16 +02:00
mpl 1d8bcfb908 newui: added ctrl-selection of items
http://camlistore.org/issue/134

Change-Id: I88c6f27658915b50399ef5f1fc00abdffefbe099
2013-05-20 16:05:27 +02:00
mpl 867dfb8706 newui: fix bug and behaviour for shift-selection of items
http://camlistore.org/issue/134

Change-Id: Id9f732a84fb1e54b9cff2e843957ffa639c02154
2013-05-19 00:49:29 +02:00
mpl af204bca92 newui: search page, with index page style
Change-Id: Iad9a3e914a4ffa79af6629c88a13a9946b7f3a2c
2013-05-19 00:38:19 +02:00
mpl 644561ad68 newui: blobinfo page
Change-Id: Iecc82e5feac704dfe7e280a6f21a17098a36070b
2013-05-13 23:17:12 +02:00
mpl abbcc38ee7 newui: permanode page
Change-Id: I3f2c5b54de2a43d5a53b1a31d7ecbf4b70afb6cf
2013-05-12 23:09:10 +02:00
mpl ff59e54b9a newui: index.html free of camli.js
All the deps needed from camli.js have moved into
server_connection.js, closure style.

Change-Id: Ic04847f428fdc983f660c12ae32fc75c80767438
2013-05-10 00:22:20 +02:00
mpl a4aba6671a sqlite: Write-Ahead Logging, for improved concurrency
http://camlistore.org/issue/114

Change-Id: I93c3d48f06a6cb0703bd9ce3f89b03fc59826a73
2013-05-01 18:04:03 +02:00
Brad Fitzpatrick 6be77f09e4 Merge "Allow HTTPS with a self-signed certificate." 2013-05-01 02:30:23 +00:00
Brad Fitzpatrick 85c0fa9c61 Merge "search: factorize max results sanitation, allow max specified from ui" 2013-05-01 02:22:24 +00:00
mpl ac431439f3 Allow HTTPS with a self-signed certificate.
A new client configuration parameter, "trustedCerts" (list of strings)
is introduced. A certificate fingerprint is defined as the 10 digits
prefix of the sha1 of the whole certificate (in ASN1. DER form).
trustedCerts should contain the list of fingerprints of the
certificates we trust. If not empty, the server's certificate
is checked against that list, instead of using the full x509 validation
on it.

-added a dial function and tls configuration, which check if we're using
SSL, and if we're in "trustedCerts" mode.
pkg/client/client.go
pkg/client/config.go

-moved android specific hacks from camput to the client layer, so that
the dial and tls config could reuse/access them. Also allows future
reuse for other commands, such as camget.
pkg/client/android.go

-adapted camput to the above changes:
cmd/camput/android.go
cmd/camput/camput.go
cmd/camput/files.go

-server prints a hint when it generates the self-signed:
pkg/misc/misc.go
server/camlistored/camlistored.go

-camliactivity:
clients/android/res/xml/preferences.xml
clients/android/src/org/camlistore/Preferences.java
clients/android/src/org/camlistore/SettingsActivity.java
clients/android/src/org/camlistore/UploadService.java
clients/android/src/org/camlistore/UploadThread.java

http://camlistore.org/issue/131

Change-Id: I6be20161549a69aafc8eb7b9e96e9351dc1c5b09
2013-04-23 17:10:37 +02:00
mpl 7c08f37abe search: factorize max results sanitation, allow max specified from ui
Change-Id: I066369829816189dbd2f682ce003c8b82022d131
2013-04-04 15:38:55 +02:00
mpl 146c5053b5 ui: small js bugfix (not null check)
Change-Id: I7c7b218263b28d1a8701972cb9eddfccbbe6275c
2013-04-04 01:12:20 +02:00
Brad Fitzpatrick 4c7e985c14 uploadhelper: use a type for JSON response, not maps.
Change-Id: I642af4daf97829a813bf7dad61cc7683ec780e69
2013-02-11 20:33:53 -08:00
Brad Fitzpatrick 9e694121d0 More closure annotations. Down to 12 warnings.
Change-Id: I40bd64d02c94b52eac7f522e52b694266163ea93
2013-02-10 21:05:30 -08:00
Brad Fitzpatrick 2ee7bb3359 More type annotations. 16 warnings.
Change-Id: I67350719305279c0d3e7c3869f53476f56f256a4
2013-02-10 20:42:48 -08:00
Brad Fitzpatrick 77d248076f More Closure annotations. Down to 17 warnings.
Change-Id: I9671072d9020e37c95be8dcdf8574017ccd3457d
2013-02-10 20:36:25 -08:00
Brad Fitzpatrick ab0db703ea More Closure type annotations.
Change-Id: I8d1d4af37add37a5512017cdd3dccade1ccf6d9e
2013-02-10 20:01:21 -08:00
Brad Fitzpatrick f8912713ca newui: more js type annotation fixes
Change-Id: I0c7bdc265c8f0ff746dcd1e1a90d54054958c8b7
2013-02-10 18:14:42 -08:00
Brad Fitzpatrick 1fe472a202 newui: more closure deps, reduces compiler warnings
Change-Id: Ifc20c3cbee34b1158195231e20646f1f68a4b1ef
2013-02-10 17:12:10 -08:00
mpl 0a84607099 search handler: all funcs now rid of manual maps responses.
serveDescribe, servePermanodesWithAttr, and serveSignerPaths
rewritten like serveRecent. Got rid of populateJSON.

http://code.google.com/p/camlistore/issues/detail?id=101

Change-Id: Id730d40005476634b138b13260248e497d1a87d0
2013-02-09 02:12:06 +01:00
Brad Fitzpatrick 78ccdc24e9 rebuild embeds
Change-Id: I4e23ec211a5f14938eba250abcdc36e031f8f8a7
2013-02-07 19:34:10 -08:00
Brad Fitzpatrick 6cc5f33da1 search: handler response type cleanup (Issue 99).
Notably, don't mix 'meta' bag keys with rest of response. Makes it easier for both Go and Closure types to not mix keys from one type with another type.

Change-Id: I65e51f2a6c236c5111b5a9b88830e1220d6b29d4
2013-02-07 09:33:00 -08:00
mpl 306213b32b Merge "Make newui ready to dev on with closure compiler, plus misc cleanup." 2013-02-07 15:24:08 +00:00
mpl ee29f1f8e7 Make newui ready to dev on with closure compiler, plus misc cleanup.
Added env var in dev-server and rules in Makefile to build
all.js with the closure compiler from the js files in newui.

Misc related changes:
-fixed a few closure annotations and added a few as well.
-added missing options to dev-server usage.
-renamed CAM_HTTP_DEBUG into CAMLI_HTTP_DEBUG for consistency.

Change-Id: Ica2c12358150aec24147628201e6f7a5852f9383
2013-02-07 15:25:10 +01:00
Brad Fitzpatrick ddcec4e92c Add --version flags to tools.
Change-Id: I1c86c3de09fb59bc20539f7d1efbd4d4710bf494
2013-02-02 10:59:39 -08:00
Brad Fitzpatrick 2bc2ba019a Rearrange the server directory a bit, and update some READMEs
Change-Id: If0cb7b07d3b7a4c7e2c714807858d3b79d06b188
2013-02-02 08:56:57 -08:00
Brad Fitzpatrick 215e4ffaa5 sigdebug: update disco global variable to be Camli.config. re-run make embeds
Change-Id: If03e8d2fbd709d90810bedac8506058a4026dc04
2013-01-31 15:52:24 -08:00
mpl 53c009cd42 Merge "newui: wip on making new ui work with closure compiler" 2013-01-26 21:36:04 +00:00
mpl d429186441 newui: wip on making new ui work with closure compiler
Still does not work with ADVANCED_OPTIMIZATIONS. The
code to load the generated all.js is commented out in
index.html.

Change-Id: I6a2ec7b3b6226214e85cbf76b2a8f2ab4d9160cc
2013-01-26 22:38:33 +01:00
Brad Fitzpatrick 26f8b015d8 camli.js: add jsdoc with @expose to Camli.onConfiguration
Change-Id: I174f2688fe72fd951e668c2686831915664baa71
2013-01-26 11:15:14 -08:00
Brett Slatkin d5cd809164 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2013-01-20 16:18:25 -08:00
Brett Slatkin 447355ca7d newui: Create set from selection working; cleaning up various JSdocs 2013-01-20 16:18:22 -08:00
Brad Fitzpatrick 96d1784501 Clean merge junk
Change-Id: Iff8fb872c2bddb178d019d103c6f56c28661c92f
2013-01-20 15:48:19 -08:00
Lindsey Simon 88f068b009 Implements select and multi-select on blobitemcontainer
Change-Id: I23dab29d57a11408fab6f55e6c83981819d284fa
2013-01-20 15:45:04 -08:00
Brett Slatkin bcdc6cd982 newui: Fix titles for collections; adds drag/drop message while mid-drag 2013-01-20 15:32:15 -08:00
Brett Slatkin 306c1a7ec5 newui: Fixing configuration callback function 2013-01-20 14:00:48 -08:00
Brett Slatkin 7ee20dd614 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2013-01-20 13:56:19 -08:00
Brett Slatkin 13b844cc3e newui: First attempt to add drag/drop upload to blob item container 2013-01-20 13:56:13 -08:00
Brad Fitzpatrick 0d33507ab6 camli.js: global cleanup: change setTextContent to Camli.setTextContent.
Change-Id: If5d949debe9621f692d01034ac31fe87802d7156
2013-01-20 13:14:18 -08:00
Brad Fitzpatrick c466d080df camli.js: more global cleanup
Change-Id: I1ae3e5014969adfe41e15bd97ff4daf7b42e614e
2013-01-20 12:51:38 -08:00
Brad Fitzpatrick 392640da89 camli.js: global cleanup. remove onConfiguration.
Change-Id: I1a74298ea1f333e060cebcf1221008705bcdb8ec
2013-01-20 12:46:50 -08:00
Brett Slatkin 45f54ffb1f newui: Cleaning up TODOs in comments 2013-01-20 11:13:20 -08:00
mpl 2ff6cab635 ui: some javascript cleanup.
Reuse thumbnails code from index.js in gallery.js
and permanode.js.
And drop _camliBlobTitleOrThumb.

Change-Id: Idb00f25a89d4346cdf1e7e00778de4db39e9bb97
2013-01-18 15:01:26 +01:00
Brad Fitzpatrick 6ca0efac8c camlistored: much better sqlite support, by default, and help/docs/hints 2013-01-10 16:16:10 -08:00
mpl 67c5678062 Index directories with "fileinfo", and use this to
find their name in a search request.

Fixes http://code.google.com/p/camlistore/issues/detail?id=79

Change-Id: I755afd8f52dbd2f8a48ba72bed0a6b0192d1dd71
2013-01-09 16:59:04 +01:00
Brad Fitzpatrick 2f188a1916 Fix JavaScript UI things I broke earlier when simplifying signing discovery
Change-Id: Idf4effe3cbf97ec4ccb51197a0b3c857cb7c3569
2013-01-08 19:40:27 -08:00
Brad Fitzpatrick 7b7af4c457 App Engine: compiles and kinda starts again; doesn't work.
With SDK 1.7.4.

Change-Id: Ide16c990fc139e7f450cea508c74f13ed79aac21
2013-01-07 17:20:48 -08:00
Brett Slatkin ebccaa15bb newui: Fixing up closure annotations
Change-Id: I13c6e9e250221612199d82a3edc642b627acc6e1
2012-12-23 17:55:34 -08:00
Brett Slatkin f2d3cb893a Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 17:52:23 -08:00
Brad Fitzpatrick 3ecd83ba7d newui: wrap camli.js; make permanode creation work again
Change-Id: Ia4ef0428e905006402cd2ef34b819b6584ed8f23
2012-12-23 17:52:23 -08:00
Brett Slatkin eb7cfb5a95 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 17:52:13 -08:00
Brett Slatkin 4a73f954cf newui: Toolbar bigger/smaller hooked up and working
Change-Id: I93f85fcf69948e6f5d8c838c7f1865ed7809236f
2012-12-23 17:52:09 -08:00
Brad Fitzpatrick d037c6e0cc Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 17:33:46 -08:00
Brad Fitzpatrick 939b6f4f4f camli.js: move more stuff to be camli prefixed
Change-Id: I029a47286ed194a3e4d3f9d987a389f6c514abb8
2012-12-23 17:33:38 -08:00
Brett Slatkin 028bcf0232 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 17:27:39 -08:00
Brett Slatkin 80171f6692 newui: Adds a toolbar class with bigger/smaller buttons; they do nothing yet
Change-Id: I8e053062e832239f6c34769faa71b84ab174684b
2012-12-23 17:27:31 -08:00
Brad Fitzpatrick 0e168cecd4 camli.js: kill global disco variable.
Change-Id: I25437bfded3fe9ff704539d929521b1c04f8b133
2012-12-23 17:19:59 -08:00
Brad Fitzpatrick 3c89f7fe97 ui: simplify signing config discovery, clean up logging
Change-Id: I4e9810499b7fe34b1e7d8c32dd612cb1d6e6c348
2012-12-23 17:08:01 -08:00
Brett Slatkin 511eb7c6d4 newui: Links to permanodes working
Change-Id: Iaaf9ca22dbd401d5c0b2e75d0349358f8282ca68
2012-12-23 16:47:03 -08:00
Brett Slatkin b2885cedfa newui: Cleaning up styling of create item
Change-Id: Ie35684c4efba4ce4cec777537b8a0783b51b311f
2012-12-23 16:32:30 -08:00
Brett Slatkin c46875692a newui: Adds a click handler for the create item
Change-Id: I2ff17d3bd08959507b43d04a5f5a1f8d5dbbdd9d
2012-12-23 16:26:04 -08:00
Brad Fitzpatrick 742d81f27c newui: create button style
Change-Id: I273b2c6c892cb0a50b323b07443854e79fc9bf94
2012-12-23 16:23:23 -08:00
Brett Slatkin 1a59cce8bc newui: Obviously, vertical align top was required to make the create box line up properly for inline-block flow
Change-Id: I3243c8bd11753e15515de0e3b73daa87682c966a
2012-12-23 16:05:23 -08:00
Brett Slatkin 6003fc6174 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 16:01:37 -08:00
Brett Slatkin 7b420e7d37 newui: Using spaces instead of tabs in js/html/css
Change-Id: Icd5a74e080f8802d9d5260270205c4eb39f584eb
2012-12-23 16:01:15 -08:00
Brad Fitzpatrick b2b200141f Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 15:59:05 -08:00
Brad Fitzpatrick 2766e2d60f newui: kinda wiring up the create button
Change-Id: Ib114da06c89543fda71104eef49433c100f60112
2012-12-23 15:59:01 -08:00
Brett Slatkin 4736fb57d5 Merge branch 'master' of ssh://camlistore.org:29418/camlistore
Conflicts:
	server/camlistored/newui/index.html

Change-Id: Ib11e629a8281c63b504e5291a191b30dc1bb4a39
2012-12-23 15:55:13 -08:00
Brett Slatkin 455a2e9d23 newui: Do not show focus on BlobItemContainer
Change-Id: I723af0a05ada913c0ae7983761927f9a20e7afe9
2012-12-23 15:53:22 -08:00
Brad Fitzpatrick eaa22b2dbc newui: start of a the creation plus button component.
Change-Id: I208c11be27f879b3ed476d4f2210fed12c8a0cc3
2012-12-23 15:42:03 -08:00
Brett Slatkin 3f69a0eb7d newui: Index page actually loads recent blobs
Change-Id: I888c9500bbcfc608a9a495f38239b8dd5cc64c83
2012-12-23 15:28:11 -08:00
Brett Slatkin dd5e72cb27 newui: BlobItemContainer can show results from ServerConnection recent blobs
Change-Id: I9784dc6462309a08fe7cb0a6ff8fe9283f9967ef
2012-12-23 15:25:39 -08:00
Brett Slatkin 0c02bc194a newui: Server connection mock getting recent blob list, but not hooked into ui
Change-Id: I85952ae039d80d6a8796f0108e080a5d14c56010
2012-12-23 15:18:09 -08:00
Brett Slatkin 0e24b6b25b newui: Adds ServerConnection; basic plumbing through to BlobItemContainer
Change-Id: I86f50c860bbebc1dc1790378cd23b7ae4b286398
2012-12-23 14:36:59 -08:00
Brett Slatkin 25038770a4 newui: Index now renders vault name
Change-Id: I8107a61c4c928729ca751308b3dfe788c7a755d1
2012-12-23 14:21:17 -08:00
Brett Slatkin 410257b70b newui: Adds simplest BlobItemContainer for showing a list of blob thumbnails
Change-Id: I283f955f21076b9a36d763be02c961ffca0475d9
2012-12-23 13:54:42 -08:00
Brett Slatkin 7d3ace5ac2 newui: Showing title in BlobItem thumbnail
Change-Id: Ib9c90cd01a39f109d6870e16d3c6ab2e98c98326
2012-12-23 13:37:42 -08:00
Brett Slatkin 6dfc690cc6 Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2012-12-23 12:43:56 -08:00
Brett Slatkin d4b6e1fc7c newui: Progress on blob_item component; able to show a thumbnail
Change-Id: I01105b8cadbc9fdf26b2d1277260d3afc7f71e8b
2012-12-23 12:43:46 -08:00
Brad Fitzpatrick 9147750d2f newui: automatic deps.js handler
Change-Id: Ic32aca321cca72cb498d7a17c56b9e7d4ac74321
2012-12-23 12:39:15 -08:00
Brett Slatkin 113f5e5f9d newui: Beginnings of Closure deps build
Change-Id: I38165135e6b8cc74e105f43f79934222c33765f1
2012-12-23 11:45:58 -08:00
Brad Fitzpatrick 921176d1ed Add newui index.html
Change-Id: I4967865332e454ca329eb4cdfd2ecb60622bbcdd
2012-12-23 11:06:58 -08:00
Brad Fitzpatrick da813ff7b6 Missing semicolon
Change-Id: Id58835a3e8d37f6a1ee0990a2e1204a5129bbc60
2012-12-22 12:14:05 -08:00
Brad Fitzpatrick 1118e8a52c More index.html work
Change-Id: Ifa57be7d7d1bc27257fe0f8bd90da9c75bdc4dc6
2012-12-11 19:33:15 -08:00
Brad Fitzpatrick 8a8aece4f0 Unify sort/go dropdowns into just View, make some functional
Change-Id: I5da584e550971465d69fbe5155414e83dfdcc8dd
2012-12-11 19:06:47 -08:00
Brad Fitzpatrick abb0e307d6 Show owner name on index page
Change-Id: Ic845283da88eea57a43a13ea13b2993070856102
2012-12-11 18:41:23 -08:00
Brad Fitzpatrick f0dfc6b6b7 Make recent.html the main page.
Change-Id: I50fde12eacbc59e996b845e0ee4d898fe7ad2764
2012-12-11 18:29:58 -08:00
Brad Fitzpatrick 4c923a3b25 Index page (recent.html) toolbar work, mostly non-functional
Change-Id: Idef921bc4f4847ac58d55645a8602b5a8dd9ba5d
2012-12-11 20:45:15 -05:00
Brad Fitzpatrick 5905638de3 Minor JS cleanups
Change-Id: I2d0628a3438ad6298e6c119ff7bd89e954871533
2012-12-11 18:36:34 -05:00
Brad Fitzpatrick 4fbce6f15b Add camliCondCall; use it. For optional hooks.
Change-Id: I63cf8b21d05cd4ff924433e7821dd756976d12ff
2012-12-07 14:09:07 -05:00
Brad Fitzpatrick 31df4a7a01 Add generic file icon.
Change-Id: I23517e6112ddfd7048a575161a7785b73fb7bd0f
2012-12-06 17:36:34 -08:00
Brad Fitzpatrick c368e4a2a8 Click to make new permanode
Change-Id: I78e5f732beb0857eb9958b2a187c68b1a7b68e55
2012-12-06 17:23:34 -08:00
Brad Fitzpatrick 3dc3241ceb use classList add/remove
Change-Id: If521a42bbbe13f61145e001e7897a68a3c491192
2012-12-06 17:18:22 -08:00
Brad Fitzpatrick f9154d8761 Recent page: drag & drop onto big plus tile.
Change-Id: Id78edf9d268df4266576e39ce8207ec06a0b99d6
2012-12-06 17:14:18 -08:00
Brad Fitzpatrick c606e06276 Move more of permanode.js's uploading logic into camli.js, and document it better.
Change-Id: I68098e7bce50286c1621b818a5fd4ede165149a0
2012-12-06 15:58:42 -08:00
Brad Fitzpatrick 0d16c1d290 Remove unused code.
Change-Id: I275f89d1cc493be4938093fc9bacd1618cd5f798
2012-12-06 15:27:07 -08:00
Brad Fitzpatrick 752ed053d3 Add some missing vars
Change-Id: I66b3f6da878d7c9e9cc5bce4cac2ff8d033487c8
2012-12-06 15:08:00 -08:00
Brad Fitzpatrick d1c8a85308 Make the permanode file upload onchange do something.
Change-Id: I7e3ce0257906e733e8f81dd5a94b2eb34361bcc3
2012-12-06 14:32:45 -08:00
Brad Fitzpatrick f7562e033a Remove useless params.
Change-Id: Ia08a8e7282b69010b59561d6faa74adb27c4cd79
2012-12-06 14:19:15 -08:00
mpl 19edba9f64 newui layout, only for dev-server use for now.
Change-Id: I0e77b8088b2e04fd56e017678cb6e0a476b10682
2012-12-04 21:41:35 +01:00
Brad Fitzpatrick 6cb3b6d69f Forgot to make embeds
Change-Id: Ib90ba363ce740549be0cd7e22f20437d1396b0ff
2012-12-01 12:41:00 -08:00
Brad Fitzpatrick 7ebc09ef25 reformat javascript with consistent indent
Change-Id: Idc70d6959b3708bc3b5893dffeaebd9950016ab6
2012-12-01 10:55:22 -08:00
mpl cb0a0951d8 Merge "file embedding: enable compression (mainly for large .js files)." 2012-11-30 17:58:05 +00:00
mpl f7ff5bb17b file embedding: enable compression (mainly for
large .js files).

We will need this when we start getting large js
files generated when using the closure library.

Change-Id: Iaecacd54c3d08637918b1afd420fb90f1a84aabb
2012-11-30 19:03:37 +01:00
Brad Fitzpatrick ed67d8926a Prevent browser range selection 2012-11-28 10:49:22 -08:00