Commit Graph

569 Commits

Author SHA1 Message Date
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
Brad Fitzpatrick 1c4964c1bc Merge branch 'master' of ssh://camlistore.org:29418/camlistore 2013-06-14 12:56:04 -07:00
Brad Fitzpatrick ca58d8e2e0 Remove noisy var _ = log.Printf lines.
Change-Id: Ia58b8ef5f271f542ae4fe61c7fb1497322770322
2013-06-14 12:55:55 -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