Brad Fitzpatrick
883c8b752d
Merge "images/fastjpeg: use jpeg.Decode when djpeg fails."
2014-08-14 16:48:12 +00:00
Brad Fitzpatrick
57856c092f
Make Google oauth2 support work again.
...
Change-Id: I7f5f3c714c7385685c283fec5362db5ca1c31f81
2014-08-13 17:17:21 -07:00
Bill Thiede
4bcaaf82cc
images/fastjpeg: use jpeg.Decode when djpeg fails.
...
Return error of type ErrDjpegFailed when djpeg or parsing the PNM returned
fails.
Attempt to decode image again with standard library.
Change-Id: I2a0cb7b52885732b7cbbffb8e34993d232781bc0
2014-08-12 20:20:20 -07:00
mpl
3fbc92a4ae
Merge "client&camput: use cmdmain.Stderr for logging"
2014-08-12 20:33:50 +00:00
Bill Thiede
12a9f6b1ed
android: logging/whitespace cleanup.
...
Addressing feedback from https://camlistore.org/r/3416
Change-Id: Ied7e86e12861ec27be0e2f3d41aefcd92ec5d1a3
2014-08-12 21:00:44 -07:00
Brad Fitzpatrick
413163e8f9
Merge branch 'master' of https://camlistore.googlesource.com/camlistore
2014-08-12 14:03:27 -07:00
Brad Fitzpatrick
1b22acca30
Update goauth2 to f06a85362aa5
...
Change-Id: I581d449099b6201dc78593c3394fa3ae0954e0c3
changeset: 75:f06a85362aa5
tag: tip
user: Brad Fitzpatrick <bradfitz@golang.org>
date: Tue Aug 12 13:58:32 2014 -0700
summary: oauth: clean up docs, code, fix data race, don't send client_secret in two places
2014-08-12 14:03:22 -07:00
Brad Fitzpatrick
a1fc7e5aea
Don't use untagged struct literals.
...
Change-Id: I115592d815e6419eeffb5f23c3df953068d27371
2014-08-12 14:01:33 -07:00
mpl
0fa50c4355
client&camput: use cmdmain.Stderr for logging
...
And use -verbose in tests, for easier debugging.
Change-Id: Iac5e1a8e9c987f82fc221ce73c7e3ca10a86a924
2014-08-12 22:41:55 +02:00
Brad Fitzpatrick
dcf482b3e4
start of 0.9 release notes
...
Change-Id: I2a0ae60f0be17de99ad30c661981bc1baf1a57c7
2014-08-11 22:11:18 -07:00
Brad Fitzpatrick
d5805a9f9b
Start of the 'blobpacked' storage type.
...
Change-Id: Ib8061edaa37c43553ced7eba06dd4baf1a984040
2014-08-11 22:07:25 -07:00
Brad Fitzpatrick
766919ec33
schema: more minor FileReader cleanups
...
Change-Id: Ia37d82024faf16c262f339d8f7f807d23670edda
2014-08-11 17:32:00 -07:00
Brad Fitzpatrick
71a1a1ff8d
schema: reduce FileReader blob reads 32-85x by caching the last blob read
...
Little reads into big blobs kept re-reading the same blob.
Change-Id: I098c9d9a9443dacc93f60f96fff1edd421ced198
2014-08-11 15:55:50 -07:00
Brad Fitzpatrick
fe481e5da7
schema: some FileReader cleanups: use blob.Ref as map key, simplify zeroReader
...
Change-Id: I37ec27bfe9673e7d5566216269d94d109215ac99
2014-08-11 15:53:33 -07:00
Brad Fitzpatrick
3d058eca20
test fetcher: add more stats
...
Change-Id: Iad880544174c812a49640939b8fb2922da738b28
2014-08-11 15:38:53 -07:00
mpl
145e8d1edb
Merge "make.go: enable if_mods_since flag"
2014-08-11 21:21:48 +00:00
mpl
f7e03db48e
Merge "test/integration: add sharing test"
2014-08-11 21:41:03 +00:00
Brad Fitzpatrick
e62b02ec55
Merge "android: Add QR code scanning to SettingsActivity."
2014-08-11 22:58:05 +00:00
Bill Thiede
bec12c5270
android: Add QR code scanning to SettingsActivity.
...
Import src/com/google/zxing from
https://github.com/zxing/zxing/android-integration/src/ at revision:
commit 7d35bd0bddbe84185b9f79c5cb07749a8767c952
Author: Sean Owen <srowen@gmail.com>
Date: Wed Aug 6 09:05:22 2014 +0100
Uses zxing dervied barcode scanner apps to do the heavy lifting. If the
user does not already have the app installed a dialog will open that
directs them to install it from the Google Play store.
Addresses https://camlistore.org/issue/372
Change-Id: Ic398b77cd9795aca533be101b2ebcd5631cc7f20
2014-08-11 10:24:46 -07:00
Brad Fitzpatrick
f896ae934c
Merge branch 'master' of https://camlistore.googlesource.com/camlistore
2014-08-11 10:17:00 -07:00
mpl
f9162702cb
make.go: enable if_mods_since flag
...
And use the flag in integration tests.
devcam server already uses it.
Does not fully work yet with devcam test.
Change-Id: I0dbd2b28ff60090133abf0b9578e33d5788a6603
2014-08-11 19:00:55 +02:00
Brad Fitzpatrick
90de301210
Update goauth2 in third_party to 8273d5a0e11a
...
Change-Id: Ibe23ad22887ba8ddc6c6a02e8ff81525015e96e6
2014-08-10 10:52:19 -07:00
Aaron Boodman
0f0ad341c4
Fix piggy menu on mobile for reals, this time with actual testing.
...
Touch devices still deliver 'mouseover' events, so you can't rely
on that. Anyway, on things like the Chromebook pixel there is a
mouse and a touchscreen. So it just has to work for both modes
simultaneously.
Change-Id: Ia63f159d5c7edd319a56cf1f79d65d799a71367c
2014-08-10 16:18:59 +00:00
Aaron Boodman
12dcf822cc
Make the piggy menu work on mobile devices.
...
Change-Id: Iab7a557d3c8d1ac5099ce09709b4493363570a64
2014-08-10 08:43:16 -07:00
Aaron Boodman
ad33510071
Reset selection on navigation.
...
This fixes https://code.google.com/p/camlistore/issues/detail?id=484 .
Would be better to store it in history and restore, but ... later.
Change-Id: If8c1d3fab89a689be859c70c2cba71583dfdc789
2014-08-09 23:07:41 -07:00
Aaron Boodman
03f0f598da
Moved the nav from the side to across the top.
...
Various other related improvements.
Change-Id: I4469991ef4327a9a80f1bbf5ba5fed2a10f4eb79
2014-08-09 21:07:29 -07:00
mpl
d953dee008
devcam test: do not "recurse" temp GOPATH, docs, couple more options.
...
Problem: make.go creates an isolated temp gopath ./tmp/build-gopath. The
integration tests make use of that gopath (by running make.go) to build
the tools, and run the test world in it. Similarly, devcam test uses
make.go to setup that temp gopath, and runs the tests from the source
files in that gopath. Consequently, when the integration tests are run
through devcam test, even though they're run from the temp gopath, they
would use the make.go in it, which would create a nested temp gopath
(CAMLIROOT/tmp/build-gopath/src/camlistore.org/tmp/build-gopath) in
which to run the tests.
This patch addresses this issue by creating a new flag (-envGoPath), and
the corresponding env var (CAMLI_MAKE_USEGOPATH), which tells make.go
not to create a new temporary gopath (and hence not to mirror any
files), and to rely on the already set GOPATH env var instead.
Also refactored make.go a bit, and added a couple options and doc to
devcam test.
Change-Id: Ia8a5d7a31e6e317f05218d9e18fb886001cd19cb
2014-08-08 22:02:57 +02:00
mpl
7b6b67cb17
Merge "buildbot: option to skip test suite, mainly for debugging."
2014-08-08 19:03:56 +00:00
mpl
1d67424167
Merge "devcam test: do not "recurse" temp GOPATH, docs, couple more options."
2014-08-07 20:26:28 +00:00
mpl
74385935b4
Merge "mysql: create database now distinct from create tables"
2014-08-07 19:41:10 +00:00
mpl
df7952b9ba
mysql: create database now distinct from create tables
...
Because we do not want the database name to be optional with a
placeholder (/*DB*/) in the statement that creates the database, since
it is not actually optional there - as opposed to when creating tables.
Change-Id: I05351d76d95071492d763758a11454f219524510
2014-08-08 20:06:02 +02:00
Brad Fitzpatrick
9607667c2f
wkfs/gcs: support for writing files
...
Change-Id: I4916dc6b07130d31c732da9df0dd3e7189eb8075
2014-08-08 11:03:27 -07:00
Brad Fitzpatrick
815317b8b9
googlestorage: some code and doc polish
...
Change-Id: Ibf84c403d03552296a5f22a26859b247d59ddcf5
2014-08-08 11:03:10 -07:00
Brad Fitzpatrick
ec900d6bd9
pkg/client: some more wkfs usage
...
Change-Id: Ib4098304beb52492e1b62bfeb88962c9d4095c0d
2014-08-08 11:02:06 -07:00
Brad Fitzpatrick
d2e964a9da
webserver: use wkfs for tls cert/key
...
Change-Id: Ifdccd5421f54bad206b03d48bad264c3a4539e70
2014-08-08 10:58:56 -07:00
Brad Fitzpatrick
7146e3b1e9
camlistored: change an ioutil.ReadFile to wkfs
...
Change-Id: Id5d50d33bcfb7395b55f0f28776e1f6c880ccf46
2014-08-08 10:55:25 -07:00
Brad Fitzpatrick
f764d2ca06
camlistored: missing error checks in self-signed cert writing
...
Change-Id: I19629179b580859fa670fa22f4ca319280728d2a
2014-08-08 10:53:44 -07:00
Brad Fitzpatrick
79904dd933
Merge branch 'master' of https://camlistore.googlesource.com/camlistore
2014-08-08 10:48:16 -07:00
Brad Fitzpatrick
2f4e571e7c
wkfs: make Create use OpenFile(WRONLY) instead of RDWR
...
Change-Id: Ifbd82b1392a436229fd350a604e1125cf7b1f64d
2014-08-08 10:14:10 -07:00
mpl
44ac2e4a3e
camtool/dbinit: replace dbname placeholder before creating table
...
Change-Id: I1a6c9f10c0731f5422a1d9780815e6e5235bb090
2014-08-08 17:44:17 +02:00
mpl
98d967ce39
camtool/dbinit: fix error printing
...
Change-Id: I749eae0207f5aa96bb342cf961d8511344acc26c
2014-08-08 17:24:48 +02:00
mpl
975e251c36
client/upload: decode JSON response into struct instead of map
...
Change-Id: I63c660ae48bf7d896eed69aed84a805158709c86
2014-08-08 16:02:57 +02:00
Brad Fitzpatrick
c5fd9fb7b9
jsonconfig: skip over nil values when expanding
...
Change-Id: I5dfb7b3022da1ec689cf767e5d088c73c5589386
2014-08-08 06:47:10 -07:00
Brad Fitzpatrick
6e7d3e3e1e
serverinit: clean up and simplify the high-to-low-level config generator
...
Change-Id: Ia45457718fb8832b4da32d4d6c87c8a5ba9e2301
2014-08-07 18:47:42 -07:00
Brad Fitzpatrick
49dbfd27ad
Merge branch 'master' of https://camlistore.googlesource.com/camlistore
2014-08-07 12:34:02 -07:00
Brad Fitzpatrick
c0a149ac3e
Move GCE stuff out of camlistored into new package. Use from camtool.
...
Now camtool dumpconfig works on GCE too using the same mechanisms as camlistored.
Change-Id: I11c5311a6b7ace35fb0c6dd661ba9bdcad7820ed
2014-08-07 12:33:52 -07:00
Brad Fitzpatrick
da3ce4a13b
schema: use existing constant instead of literal
...
Change-Id: Ia988f4c897788be696326de9a75973161ae3d550
2014-08-07 11:04:09 -07:00
mpl
f6f1280c33
Merge "client: actually print error from server when upload fails"
2014-08-07 13:28:25 +00:00
mpl
d5505cbf28
Merge "client: output response on sharing error, for easier debugging"
2014-08-07 13:28:25 +00:00
Brad Fitzpatrick
031c6199da
sorted/mysql: automatically find IPs of hosts named *.cloudsql.google.internal
...
Change-Id: Ib03add64c2c6b4de7fc6059f2a9c22065e2b2e7d
2014-08-06 17:28:55 -07:00