Commit Graph

2393 Commits

Author SHA1 Message Date
Brad Fitzpatrick 45287dbd15 Merge "newui: filetree" 2013-05-25 21:42:48 +00:00
Brad Fitzpatrick da9e7c8f34 Add Makefile hint
Change-Id: Ie10821f6821b8e63f2a143e9e4c68f244d2da149
2013-05-25 15:00:00 -07: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 893b5b2f22 camput: sqlite backend for have cache and stat cache
http://camlistore.org/issue/73

Change-Id: Id6fb95f1980139f2b525321a7e1b553cb11fe727
2013-05-01 18:42:48 +02:00
Brad Fitzpatrick 2ebd1aa8e4 Merge "camput: reenable -secret-keyring, use flag.StringVar" 2013-05-01 14:34:12 +00:00
mpl db9fdb7e6e camput: reenable -secret-keyring, use flag.StringVar
http://camlistore.org/issue/76

Change-Id: I37229a1082e5d955cadcc63521ea1b13dd63a33c
2013-05-01 16:48:19 +02:00
mpl af542f5cae client: fix "method not an expression" error for Go1
Change-Id: Id46cfafb6585fb074415d10affbb835373d27112
2013-05-01 15:08:58 +02:00
Brad Fitzpatrick 6be77f09e4 Merge "Allow HTTPS with a self-signed certificate." 2013-05-01 02:30:23 +00:00
Brad Fitzpatrick 89f7315ae7 Merge "camput: refactor; break up uploadNodeRegularFile" 2013-05-01 02:27:29 +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 e9443ec182 search: refactor serveEdgesTo with annotated structs
http://camlistore.org/issue/99

Change-Id: I84ed551db4fecbd1ca06d76759d7512d1651bbf2
2013-04-26 18:33:27 +02:00
mpl 5b73925c2a pre-commit hook: skip deleted files
http://camlistore.org/issues/74

Change-Id: Ie1cdeca8d22d0a41ced2a3a3d9bd7bc4b6c89951
2013-04-25 19:25:32 +02:00
mpl 9b145ad1d7 camput: refactor; break up uploadNodeRegularFile
Change-Id: Ifde8f1a249eb4831757a09ea0ac881b049a90525
2013-04-24 17:51:04 +02: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
Brad Fitzpatrick cb5d6be1bb Merge "camput: change "name" option to "title"." 2013-04-22 15:03:24 +00:00
mpl 0b873649cb camput: change "name" option to "title".
Title is the attribute used in the ui, and actually recorded
by the indexer, so having "name" in camput was not consistent.

Change-Id: I6f63e54e3b19a83031f3c56c717b27336b175284
2013-04-22 17:13:50 +02:00
mpl 07e5106035 Merge "schema: add Share type" 2013-04-22 13:59:41 +00:00
mpl eb109f4364 Merge "index: set MySQL to binary charset" 2013-04-18 12:36:48 +00:00
mpl be2fd70e3c index: set MySQL to binary charset
The immediate concern was to make the index case sensitive,
but the values should be stored in binary anyway as this
layer is just obeying the IndexStorage interface and should
not be concerned with character sets.

http://camlistore.org/issue/130

Change-Id: Iee913b0bd9e5c0c32a5c5570310c2ac5d0cfddf8
2013-04-18 00:59:17 +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
mpl 17119dade8 setup wizard: parse shareHandler and memIndex fields as booleans
http://camlistore.org/issue/128

Change-Id: Iee55f4e758a0429d6490efe745f5256580efee6e
2013-04-01 17:06:03 +02:00
mpl b410b1df6e Merge "search handler: return correct thumbnail dimensions" 2013-03-26 14:27:01 +00:00
mpl 0dfd84a7d8 search handler: return correct thumbnail dimensions
images: DecodeConfig to get the predicted width
and height after EXIF correction
search&index: add GetImageInfo and use it in search
to predict the thumbnail dimensions

http://camlistore.org/issue/115

Change-Id: I358136a2ab03ea09c8f8fd2fa0dc574921c819c5
2013-03-25 17:06:15 +01:00
Brad Fitzpatrick c35c4ff233 rename dev-camsync to dev-camtool
Change-Id: Ic1681fa95cadc212c2e1ced05d2b01afea98d8ea
2013-03-24 21:26:56 -07:00
mpl 1148a51b09 camtool dbinit: sqlite support
Change-Id: I649a28e52df8d2689daa784dd2b1c06770e4b857
2013-03-20 18:10:57 +01:00
mpl 61f0d3c691 third_party: update mymysql to d9480a7740
Fixes broken build on gotip, since
https://code.google.com/p/go/source/detail?r=ea7a6c956f6a86b68d07d31b9fb923843d661aaa

Change-Id: I93d2e7eb8ec3a1502a3fb588dbcb48b43cc48daf
2013-03-19 18:56:37 +01:00
mpl f377546d31 Merge "website: link to packages and commands from docs" 2013-03-18 20:52:05 +00:00
mpl 201ab5be2a website: link to packages and commands from docs
Change-Id: I5acf8ec76b5dc886acf1015dcf310df97c3bf6fc
2013-03-18 16:53:51 +01:00
mpl 739c883374 Merge "website: clean up PDoc hack" 2013-03-18 15:12:13 +00:00
mpl feaf289d5b website: clean up PDoc hack
Change-Id: Idf5ea94058d1da653442d435f8823f2f399f3f8e
2013-03-18 16:08:10 +01:00
mpl 52159792f0 website: do not override gitweb's font size
Change-Id: Ieb426ca28cdf45bf40582a8053357a833397d82d
2013-03-18 15:45:03 +01:00
mpl a538726253 Merge "website,genfileembed: exclude zembeds and fileembed.go from godoc" 2013-03-16 00:17:10 +00:00
mpl 8f8373fa76 website: use copy of package.html instead of directly golang's
Change-Id: I4ba47ade6c3307929aac489ff8735c5cf774074f
2013-03-16 01:26:57 +01:00
mpl 8d3c5acca7 website,genfileembed: exclude zembeds and fileembed.go from godoc
Change-Id: I6af25a566a519274b15b72c3e41dccd016de5442
2013-03-16 01:16:40 +01:00