Commit Graph

6007 Commits

Author SHA1 Message Date
Will Norris 7312e50924 website: strip directory index and file extensions
redirect to cleaner URLs without file extension or directory index
filename (index.html or README.md)

Fixes #732

Change-Id: I6332571b2d8ec1ea48e697d31017eb6a63fe1a12
2016-05-02 06:22:49 -07:00
Will Norris 1f0340b436 website: simplify docHandler
don't strip the "/doc" prefix, which simplifies some of the file
handling logic.  Also add a test case for the /docs/ => /doc/ redirect.

Change-Id: I96c60bc031daaeff7f78ca854b60bdc542913b3d
2016-05-01 21:53:22 -07:00
Will Norris a7a63cfd0d CONTRIBUTORS: update CLA link
Fixes #749

Change-Id: I36d33bc974c0fa3355d7f93f5bb74136fe4a65cc
2016-05-01 20:59:52 -07:00
mpl d2ee6fe5dd website: redirect builder to travis
Fixes #658

Change-Id: I16f7d840e74320aad518ae7bdfd5702bace85cd4
2016-04-30 17:35:29 -07:00
Mathieu Lonjaret 46fe23f05d Merge "make.go: just build website with -website" 2016-05-01 00:31:05 +00:00
mpl bc4dbb0b5a make.go: just build website with -website
That should make it easier to catch missing dependencies. Because
'go run make.go -website' will ignore whatever's in your GOPATH, and
only use what's in our vendor.

Change-Id: I94648633a9fa69a5742b7e83031dab34470b9cde
2016-04-30 17:29:12 -07:00
mpl 637c0571b7 vendor: fix more website (protobuf) deps
Fixes #747

Change-Id: I2baec20e730bee9d902dc57cf08acb599744e984
2016-04-30 17:07:13 -07:00
Brad Fitzpatrick e305847941 Merge "ui: fix reload menu item for broken websocket connection" 2016-04-30 21:28:24 +00:00
Brad Fitzpatrick b8b310ac14 Merge "Fix permissions for files" 2016-04-30 21:28:02 +00:00
Brad Fitzpatrick d9c986235c Merge "C+A: add Tilman Dilo (Individual CLA)" 2016-04-30 21:25:19 +00:00
Brad Fitzpatrick de4ab2ae55 Merge "importer/foursquare: import also the photo of the companion" 2016-04-30 21:24:53 +00:00
Brad Fitzpatrick ed5c30bbc3 Merge "importer/foursquare: increment importer version" 2016-04-30 21:24:46 +00:00
Brad Fitzpatrick fac5ce1915 Merge "A+C: add Stephen Searles (Individual CLA)" 2016-04-30 21:21:11 +00:00
Kate Pek 9122259e66 importer/foursquare: import also the photo of the companion
Change-Id: Ia7d60ed049a038fb1b729230ed9eb817b400b076
2016-04-30 09:52:43 -05:00
Kate Pek 0c7fd08d49 importer/foursquare: increment importer version
Change-Id: Ied05f79b3fe206186591282417f341443194f609
2016-04-29 23:21:10 -05:00
Will Norris 2a561536d4 Merge "vendor: update cloud,grpc,protobuf libraries" 2016-04-30 03:01:19 +00:00
Kate Pek e45087dd35 importer/foursquare: also import who checked in together
Change-Id: I036f673acc954c16ffa249126b4e7a4882e9a4a7
2016-04-29 21:43:46 -05:00
Will Norris 5dd8671051 vendor: update cloud,grpc,protobuf libraries
update additional supporting libraries needed with
219f966a95

github.com/golang/protobuf @ 7cc19b78d562895b13596ddce7aafb59dd789318
google.golang.org/grpc @ b062a3c003c22bfef58fa99d689e6a892b408f9d
google.golang.org/cloud @ 36e3752134d445180a77cd40c922c48850b6fe9c
 - same as before, just added missing 'internal' package

Tests:
 - go run make.go succeeds
 - camweb builds and runs
 - go test ./pkg/... has a couple of failures, but nothing that wasn't
 already failing before this change

Fixes #743

Change-Id: I0a81f471f79255fcb4e0d615630eecce1c5cd966
2016-04-29 19:42:33 -07:00
Brad Fitzpatrick 20e63e3530 Merge "schema/nodeaddr: add GivenName, FamilyName" 2016-04-30 02:35:03 +00:00
Kate Pek 96ed8597a4 schema/nodeaddr: add GivenName, FamilyName
Change-Id: I82b5365d24acf14537719e903e463f0030e80ec5
2016-04-29 21:32:48 -05:00
Will Norris 0b45279ce9 Merge "serverinit: remove trailing commas causing invalid JSON" 2016-04-29 19:50:19 +00:00
Will Norris d3baa6e638 serverinit: remove trailing commas causing invalid JSON
configHandler strips the key "_knownkeys" from all JSON objects in its
output using a regex on the marshaled JSON.  If this was the last key of
an object which contains multiples keys, this leaves the JSON in an
invalid state.  For example,

    {
        "foo": "bar",
        "_knownkeys": {}
    }

becomes:

    {
        "foo": "bar",
    }

The trailing comma here is illegal.  To fix this, we run one more regex
across the output removing any comma at the end of a line just before a
closing brace.  This is never valid in JSON, so is safe to remove
globally here.

Change-Id: I05f54e9f094fbe9cbc720f073b2b78ae80525106
2016-04-29 12:49:26 -07:00
mpl 6a80dd874d misc/docker/go: go 1.6.2
Change-Id: Ib1e479f02f1b103b371ca80d9f8a511f4f398e1a
2016-04-29 12:20:09 -07:00
mpl a0276d4f9d misc/docker: replace CopyObject calls
storage.Client.CopyObject does not exist anymore. Replaced with CopyTo
calls.

Also removed checks based on the presence of /.dockerinit to know
whether we're on docker because apparently they're gone or something.
I'll investigate why and a replacement later; we want a new GCE docker
image asap and I'm pressed for time.

Change-Id: I6b3ebcb048f03bdf53db94b41fe96ddcb6ed7537
2016-04-29 11:48:50 -07:00
Will Norris 0e708f0b74 Merge "serverinit: improve handling of redacted data in config handler" 2016-04-29 03:28:13 +00:00
Mathieu Lonjaret 5545134529 Merge "blobserver/cloudstorage: use cloud/storage Client" 2016-04-29 03:00:20 +00:00
Will Norris aff1874258 serverinit: improve handling of redacted data in config handler
make the "REDACTED" placeholder a valid JSON string and include trailing
comma in attempt to make the document valid JSON (primarily helpful with
browser extensions that parse and render JSON documents, even though the
content type is text/plain).

Add client_secret to the list of redacted keys (used with google cloud
storage, possibly others).

Change-Id: Ia10fc9fffbd667ea7018b750b2a98db0b05dcf82
2016-04-28 13:02:24 -07:00
Tilman Dilo d208b531c9 Fix permissions for files
Use mode 0644 instead of 0755 for non-vendored files.

Change-Id: Ifbe1d5e21f24814531248a8a6c84d6f0a72c071c
2016-04-28 21:15:09 +02:00
Tilman Dilo 318ce45a5d C+A: add Tilman Dilo (Individual CLA)
Change-Id: I3abc0786f1bd8bedb2473e9370365303a8a145fd
2016-04-28 21:12:30 +02:00
Tilman Dilo cb67c554ec ui: fix reload menu item for broken websocket connection
The "click to reload" menu item displayed when the websocket connection
fails was non-functional. Clicking on the menu item only produced an
error (Uncaught TypeError: Illegal invocation) in the JavaScript
console.

Change-Id: Iea44dd35c92c99562c35f87c38687f4fa433ad41
2016-04-28 21:11:44 +02:00
Will Norris a1ec9bf60e rename HACKING to CONTRIBUTING.md
GitHub treats the CONTRIBUTING file special, in that it is referenced
any time someone files a new issue or starts to create a pull request.
Also make minor updates to file to use markdown and current hacking
instructions.

Change-Id: I68f0d7a69397851ee6c65671ae692cbfb2b93946
2016-04-27 12:16:29 -07:00
Will Norris 7effca63b7 Merge "website: add html ext to docs/releases/*" 2016-04-27 18:53:54 +00:00
Will Norris e4b61b0146 website: add html ext to docs/releases/*
this is now needed to have camweb wrap the file in the site template
rather than just serving it raw.

Change-Id: I1ac20030dd7bf878429fd70386e2e2814c66822c
2016-04-27 11:52:13 -07:00
mpl 9e9d5e0bf2 blobserver/cloudstorage: use cloud/storage Client
Using go4.org/cloud/google/gcsutil
for the things we can't yet do efficiently with the cloud/storage
Client.

Fixes issue #652

Change-Id: I8a43a754c4e0762629ce2a21bb95d9991f6f4771
2016-04-27 11:25:58 -07:00
Mathieu Lonjaret c905fe1b47 Merge "vendor: update google.golang.org/cloud" 2016-04-27 18:08:24 +00:00
mpl 219f966a95 vendor: update google.golang.org/cloud
to rev 36e3752134d445180a77cd40c922c48850b6fe9c

So we get ErrObjectNotExist on ObjectHandle.Delete

And update google.golang.org/api to rev
9737cc9e103c00d06a8f3993361dec083df3d252
for consistency.

Change-Id: I58c706d1d71a98ad01f4fef8929eac52338c1bbe
2016-04-27 11:04:47 -07:00
Will Norris 7ec2b0ac2e website: update doc URLs
s/docs/doc/ and s/http/https/ for camlistore.org doc URLs in website and
code.

Change-Id: I875e2acece1f594a304f2bdb63f756fcb315abc8
2016-04-27 08:48:50 -07:00
Will Norris 95a55498e6 website: fix wikipedia links on prior-art page
Change-Id: I6afa1cc2459fb2d372349492890fba55048c0493
2016-04-27 08:11:30 -07:00
Will Norris 29dcc70f3c website: restore search-ui.txt with link to new page
The help page in the camlistore binary has a direct link for "Search bar
predicates" that links to this search-ui.txt on gerrit.  Restore this
file so that these links will still resolve, but with a pointer to the
new docs on camlistore.org.

Also update the help link for future builds of camlistore to point to
the correct URL.

Change-Id: Ib81ff820869d86e6e6f664e8b52c5f20d4eed4d3
2016-04-26 22:28:05 -07:00
Mathieu Lonjaret 11c23bfb2b Merge "website: update misc docs to markdown" 2016-04-27 01:13:02 +00:00
Will Norris 620d837a3d website: update misc docs to markdown
- merge json-signing/json-signing.txt into json-signing/README.md
- rename publishing/README to publishing/README.md
- convert several doc/* files

Change-Id: I0bb7c03adcfac3848f97a70092de384c72f45958
2016-04-26 18:10:58 -07:00
Will Norris dfdc297a2d Merge "website: terminology: fix protocol links" 2016-04-27 01:03:38 +00:00
mpl 74b9c311e8 website: terminology: fix protocol links
Change-Id: I67b391f604175105ffc8f6ac65436a3e222d4e68
2016-04-26 17:50:36 -07:00
mpl 794ed25819 website: keep doc/schema flat
It looks better than the half-organization we had so far, and it will
actually make it easier for editorial changes to come. Also keeps us
more honest about doing it sooner rather than later.

Change-Id: I6303325f6d75389c7e8ca908f3740cf92af3836a
2016-04-26 17:34:47 -07:00
Mathieu Lonjaret bc9ac9e966 Merge "website: convert schema docs to markdown" 2016-04-26 23:49:53 +00:00
Will Norris 2f79a55baa website: convert schema docs to markdown
Refs #720

Change-Id: Iccfaf7384cffa78a51606868f83f4019e9441791
2016-04-26 16:32:38 -07:00
Will Norris 3cc1efc75e website: serve non-HTML files as raw bytes
The website has several non-HTML files that mostly serve as examples
(eg: https://camlistore.org/doc/json-signing/example/signing-before.camli).
Today these files are parsed and rendered the same as HTML files, which
is particularly bad for these json-signing examples.  Instead, they
should be served raw, without any interpretation.

Change-Id: I09f7de130e55da7b2e585f1a110bbbf391f2279f
2016-04-26 16:25:45 -07:00
Will Norris 066db0952c website: use custom markdown options
This is all so that we can enable auto creating header IDs based on the
text of the header.  For example "# Foo" is converted to:

  <h1 id="foo">Foo</h1>

I'm not really sure why this isn't a default option, but whatever.  It's
also unfortunate that we have to copy all of the flags and extensions
from MarkdownCommon, but at least this will make it easier to add more
options in the future, I gues.

Change-Id: I65800c75560ad3b9a3fd0389b722c07ba11ee098
2016-04-26 12:47:40 -07:00
Will Norris e3777187be vendor: update github.com/russross/blackfriday
rev 151efb040f183f3b968215a236c71a2614b62879

Change-Id: I2f5a2231ce07d9fd3f64d13a6965e06c60738b51
2016-04-26 10:41:00 -07:00
Brad Fitzpatrick f53b531967 Merge "camweb: redirect /doc/dir to /doc/dir/ with trailing slash" 2016-04-26 17:00:58 +00:00