Commit Graph

483 Commits

Author SHA1 Message Date
mpl 41bdd85120 ui/permanode: cope better with not a permanode case
A camliPath can now have a file blob as a target (instead of a
permanode). And when we render these camliPath members as links, since
it can happen that these members haven't been described, we can't know
in advance whether to link them as permanodes or as blobs, so we
always default to permanode. Therefore, it can now legitimately happen
that we end up on the permanode page, while the blobRef is actually
one of a non permanode.

This patch tries to cope with that situation in a bit nicer way.

Context: http://camlistore.org/issue/470

Change-Id: Ic3b728541e164a6e6056d8f275a1d7e76b41e043
2014-07-30 01:07:06 +02:00
mpl b7d8d55bb3 pkg/webserver: use a custom logger, if provided
http://camlistore.org/issue/479

Change-Id: I41bd0a02d40e9ad94f655b5c1abdfa5db76c7019
2014-07-29 01:40:51 +02:00
Brad Fitzpatrick 7bd5e287d4 Merge "Fixed calls to formatting functions" 2014-07-21 17:34:27 +00:00
tnt 6868a882b9 Fixed calls to formatting functions
Change-Id: I3ec2af85364674ac6f1a88cd12b6cb369d8e50e1
2014-07-21 22:06:53 +00:00
mpl b82459424d devcam server --makethings
Only creates twitter things for now.

http://camlistore.org/issue/417

Change-Id: I05d548e012586279e165c01468524ceb055ff17b
2014-07-21 23:24:33 +02:00
Brad Fitzpatrick cc418dac8f Merge "legal: package for compiled-in licenses" 2014-07-11 17:08:59 +00:00
Piotr S. Staszewski 5e61e2d84e legal: package for compiled-in licenses
Initial implementation, printing helper and 'wiring' for cam* tools.

Change-Id: Icf8baa77ee1f12495be8f1a57b7d575d6918cb5c
2014-07-10 23:01:54 +02:00
Aaron Boodman 90cb6a84fb Merge "Replace cam.Nav with cam.NavReact. We weren't using the non-React one anymore." 2014-07-02 19:49:24 +00:00
Aaron Boodman 4009ece74e Replace cam.Nav with cam.NavReact. We weren't using the non-React one anymore.
Change-Id: I9369dda7ed4b9fc45a1fd91ef0c6343f37e3baf5
2014-07-04 21:33:27 -07:00
mpl cc40a72019 Merge "ui/permanode.js: some clean up" 2014-07-02 20:24:16 +00:00
mpl 37a000e400 ui/permanode.js: some clean up
-removed redundant "gallery" feature (since container aspect does it)
-> allowed to get rid of blob_item_container dependency.

-removed the whole resolvedMetaData business. If one wants to derive
properties (such as the title) from children blobs/permanodes, just
create a new BlobItem for that child and get the properties with
methods on that child.
-> makes for clearer code, and easier to prevent null errors.

-started making use of search session

Change-Id: Ic706c96e1c05ad5489ab4b14ed21e315a557a8a8
2014-07-03 22:42:31 +02:00
Aaron Boodman f61d429d32 Merge "Always handle clicks on aspect links in JavaScript." 2014-07-01 18:32:25 +00:00
Aaron Boodman fef60569f4 Always handle clicks on aspect links in JavaScript.
It would be better to support real URLs for these, but I need to
figure out how routing those should work first.

So for now this is maybe less annoying.

Change-Id: I1992d23cb0f94b509f73db23a542b56ca5df7531
2014-07-01 14:51:48 -07:00
Aaron Boodman 5b0cba5b50 Don't custom render a Twitter item with incomplete data.
Change-Id: I03aad6b6f7f4d0b95e79818c0db4765dc09ee253
2014-07-01 14:20:13 -07:00
Aaron Boodman 6cfd84b278 Don't do local navigation if a modifier key is pressed.
Change-Id: I8e3996628f8c247652c8a51a8bcf602d5bdfef02
2014-06-28 20:00:48 -07:00
Brad Fitzpatrick 8465f4b92b Merge "ui: bulk tagging in debug console." 2014-06-26 18:37:03 +00:00
Brad Fitzpatrick 488f1b4481 Merge "ui: fix permanode page" 2014-06-21 16:11:18 +00:00
Brad Fitzpatrick 0c772ef189 ui: fix permanode page
This was null. Not sure why.

Change-Id: I501ab108a386832cf9f7f7d41b3c7172329f45f4
2014-06-21 09:51:44 -07:00
Aaron Boodman 1138db00cd start at twitter renderer.. pretty ugly right now. still working on it...
Change-Id: I7e4940d05bf0eb03f2eb68fb330a8fbe77c38173
2014-06-20 06:25:18 -07:00
mpl 58aeb1bd01 ui/blob.js: hash for non ascii too
http://camlistore.org/issue/450

Change-Id: Ic474833927d28de0ba403eeabef6295e406463a2
2014-06-20 21:04:04 +02:00
Mario Russo d05e8a7ba1 ui: bulk tagging in debug console.
Implemented bulk tagging operations via single command 'tag'. Add, Delete, Set, and Clear modes are available (add, del, set, clear). Help on command usage is supplied via -help argument.

basic usage: tag <mode> (args)
tag add 1,2,3
tag del 1,2
tag set 1
tag clear
tag -help

Caveats:
Client will attempt to add/remove tags regardless if the selected permanode contains those values. So it will add a tag multiple times and attempt to delete a tag that is not set.

Change-Id: Ib5c8ccc3d74e49701629c37397de478b95db4fd6
2014-06-14 21:32:26 +02:00
mpl a34f9e2669 publisher app
http://camlistore.org/issue/365

Change-Id: I281fdcbbe6a2bdf15607e75a21bc93b453f82c85
2014-06-15 00:03:03 +02:00
mpl 7052f8b6f1 ui/search_session: test for safe this.data_
Context: http://camlistore.org/issue/352

Change-Id: Ic8e21f78bdd1cd356a6ef09cbfcaa759f228a6bc
2014-06-09 19:18:06 +02:00
mpl ab01a64601 ui/permanode.js: describe members as well
This change is needed to display the members list/gallery.

Change-Id: I5ee645feceaa5f842ab493ee523d7b3539c76652
2014-05-30 02:18:17 +02:00
Tamás Gulácsi cbb777ffb0 Rewrite Picasa importer for the new Importer API
Reorganizes common OAuth2 things into importer/oa2_importers.go
Rewrites CallbackURLParameters to return url.Values.

A controversial workaround for nil context has been left out,
and this may cause panic and will need a proper fix.

Change-Id: I0789f4732412aa559078ec2c6b6797925ab8cd05
2014-05-21 22:37:50 +02:00
mpl 5070358023 ui/permanode.js: use new query API for describing
Fixes http://camlistore.org/issue/446

Change-Id: I76b432719cf380d126c2d7d3afae133175893890
2014-05-21 19:05:12 +02:00
mpl 03c676342f ui/search_session.js: make PAGE_SIZE_ static
Change-Id: Ife649587eb52188eaa3b5bbf0de01890c14cc9c4
2014-05-21 00:59:53 +02:00
mpl 50fb21d51c Merge "importer: update flickr" 2014-05-20 13:28:56 +00:00
mpl 2504230fb9 importer: update flickr
Works but only lightly tested.
Could use lots of refactoring with code common with twitter.
Needs a test too.

Change-Id: I07f72d29acbc0226aeeedba0afe0bf7eeeac5ad3
2014-05-20 01:40:52 +02:00
Aaron Boodman 0ac94db14b Don't process keyboard shortcuts when search box is focused.
Change-Id: I344c43c0048ace921b89b15c94c36e63d072cd3c
2014-05-18 15:54:42 -07:00
Aaron Boodman 1d71b7896a Merge "Support video content in detail view" 2014-05-18 19:19:12 +00:00
Aaron Boodman f7adfc2869 Support video content in detail view
Change-Id: I1a8d7bceefeff94a70dedf7cee7a9778fa61dd43
2014-05-18 12:16:35 -07:00
Aaron Boodman 3cad7e8ffd Merge "Beginning of a weird debug console thing that Brad requested." 2014-05-18 19:15:38 +00:00
Aaron Boodman fd7b2e518f Beginning of a weird debug console thing that Brad requested.
To open, type '|' while the search view is open.

Change-Id: Id5ff1325fb00a91fe76c618e215b742803c37f24
2014-05-16 17:28:33 -07:00
Brad Fitzpatrick 56ed064b6a Start of 'proxycache' blobserver type.
Change-Id: I8702c1d02203090899eee6c0a555f6fc1dba4e7e
2014-05-15 12:12:21 -07:00
Brad Fitzpatrick 7caa13966b Merge "Feed (rss/atom/rdf) importer" 2014-05-14 22:17:16 +00:00
mpl cdd9a7322e Merge "app/hello: dummy server application (hello world)" 2014-05-08 20:52:10 +00:00
mpl 21dda2b4ef app/hello: dummy server application (hello world)
Change-Id: I6690b9459325af5a76d1de679d56701eefdd195e
2014-05-08 22:15:01 +02:00
mpl 4b1fb3d138 Merge "search: sort by creation time" 2014-05-08 17:11:45 +00:00
mpl 2088ce739b search: sort by creation time
Change-Id: I3695d91dde0d42419c62a23f20ba19416c53e5ef
2014-05-08 18:55:53 +02:00
Eric Drechsel f4e051fe6c ui: fix 437, error in container aspect when children aren't in searchSession
Change-Id: I04e217483bc1f1b1bd55a8afedb8da8f9dcdb296
2014-05-05 19:25:43 -07:00
Brad Fitzpatrick 384b627b5e ui: reduce describe depth, using recursive describe instead
Updates issue https://code.google.com/p/camlistore/issues/detail?id=319

Change-Id: Ie02b0f565c6ff4c9582cecc78914392a60bf9502
2014-05-04 20:03:00 -07:00
Aaron Boodman 81cfa6f39f Don't show checkmark in container aspect right now because it's not operable
Change-Id: I63ccc449802e1d5437431ec3e3305d735a7d335e
2014-05-02 20:12:22 -07:00
Aaron Boodman 888a2e9f3f Add container aspect.
Change-Id: I54ea18ab91edb28413e01583231457b5190532c2
2014-05-02 20:11:01 -07:00
Aaron Boodman 4be7f8f977 Add a directory aspect.
Change-Id: I27700cabafda6143534b999859f071f478f44a36
2014-05-02 19:19:17 -07:00
Aaron Boodman f03f0568cc Remove cam.reactUtil.quacksLike because React 0.10.0 has this built-in.
Change-Id: Id76bfe32b52fcc3896eb57cd03c1967c6b8fbfac
2014-05-02 19:17:04 -07:00
Aaron Boodman df38df2275 Aspects: A new idea for the detail page.
http://imgur.com/Re14XKc,6fYHJqp,39nnQiT#0

Camlistore is built around the idea that every object is a blob,
but blobs can also self-describe themselves as more than a blob.

For example, some blobs are also files, or images, or sets, or
permanodes, or movies, or foursquare checkins. Etc.

Here is an idea for the detail page that reflects that underlying
reality of Camlistore.

Each blob has a single canonical URL in the web UI for its detail
page. Currently this is /?p=<...>, but should ideally be just
/<blobref>.

Within the web UI, many "aspects" register interest in providing
views on blobs. Each time the user navigates to a detail page,
each aspects gets to say whether it can provide a useful view on
the blob.

Aspects are currently rendered (crappily) as tabs along the bottom
of the UI. I'm not sure how they should actually be rendered, this
is temporary.

This patch includes the following aspects:
- image (the old image detail)
- permanode (the old old permanode page)
- blob (the old old blob page)

Change-Id: Idb3cdbb203799a5d9c113d1b37b67a2724040085
2014-05-02 19:13:08 -07:00
Aaron Boodman 632366d148 Upgrade React to 0.10.0.
Change-Id: I1c47fec4293b762f26103d41ebd1faacb96e26e5
2014-05-02 19:10:09 -07:00
mpl ef5acd75e3 twitter importer: fixed to new API
Change-Id: I490001a1f780f1074baa78a4daa563e55096242c
2014-04-23 16:53:49 +02:00
Matt Jibson b7ee0a982e Feed (rss/atom/rdf) importer
Adapted from http://github.com/mjibson/goread.

Change-Id: Id3b61b155624d8c34aadd77a82c40ea4d44d66c0
2014-04-21 00:28:13 -04:00