Commit Graph

1003 Commits

Author SHA1 Message Date
Mario Russo 4c53a1cd27 ui: updates to file upload dialog
-display total/transferred bytes rather than num files
-upload is now context sensitive if currently viewing a set
-updated closure dependencies

https://code.google.com/p/camlistore/issues/detail?id=336
https://code.google.com/p/camlistore/issues/detail?id=504

Change-Id: I8dee1ee2711c06dfdc9d59e8d0fa0e4ebc641092
2014-11-16 15:31:08 +01:00
Salmān Aljammāz 4e39af1086 Generate self-signed certs with the correct hostname.
This change makes gce/create.go generate a self-signed certificate
with the hostname from the -hostname argument and upload it to GCS
before creating a new camlistore instance.

It also makes camlistored use baseURL to figure out the hostname
when generating its self-signed certificate.

Change-Id: I64f85853dab34a7ce95e5d5997e58f2e5da43496
2014-11-13 15:53:40 +00:00
Aaron Boodman 755cf0eb0f Merge "Fix bug where 'no results' message sometimes showed momentarily." 2014-11-08 07:46:38 +00:00
Aaron Boodman d9316ff8dd Fix bug where 'no results' message sometimes showed momentarily.
SearchSession::isComplete() could sometimes return the wrong answer.
Nulling out the continuation is needed to make loadMoreResults()
idempotent. So had to add more state to SearchSession specifically
for tracking completeness.

Change-Id: Ic2a90c73f3a764f358476cffa6d498ea53103421
2014-11-07 23:44:39 -08:00
Aaron Boodman 8ac319f437 Merge "Fix scrolling on firefox" 2014-11-06 17:25:35 +00:00
Brad Fitzpatrick 0e841e0f51 Rename pkg/misc to pkg/hashutil
It only had one function anyway.

Change-Id: Iec4b7868d823148c8e1d2607347fe9d3c1463403
2014-11-06 13:31:58 -03:00
Aaron Boodman 96bae4b0e2 Fix scrolling on firefox
Change-Id: Ic023dba06680f3d4772fe709b7f5f0dd0d54e7ae
2014-11-06 11:04:21 +00:00
Mario Russo 4cf29f33d3 ui: added 'No results found' message to blob item container
this patch incorporates visual feedback from aaron

Change-Id: Ib7b8bbc7daa958693dafc9b2108cac3ee91bb870
2014-11-06 10:52:47 +01:00
Aaron Boodman 0ba58ae829 Fix badly aligned piggy animation in upload dialog.
Change-Id: I69e9432a90382a2ece9c5f77c089de7f7c9ea492
2014-11-04 16:45:24 -08:00
Aaron Boodman ac67a8d479 Moved contextual nav items back to a sidebar.
Global nav items remain in piggy menu.

This is an adaptation of https://camlistore-review.googlesource.com/#/c/3898/ by Mario Russo <mail.mr@gmail.com>.

Change-Id: I85f7f386aa0573026253e13c5bd12b46ad08f83a
2014-11-04 15:34:08 -08:00
Aaron Boodman 3fde03eb39 Add an 'upload...' button to the piggy menu.
Bug: https://code.google.com/p/camlistore/issues/detail?id=504
Change-Id: I736499ee10e9d07e15432eff2224a64abb1569ce
2014-10-26 01:41:19 -07:00
Aaron Boodman b4a03836c0 Show a more obvious drop target when dragging items onto UI.
This also shows a very crude upload progress.

Bugs:
https://code.google.com/p/camlistore/issues/detail?id=336
https://code.google.com/p/camlistore/issues/detail?id=504

Change-Id: I3c232c94d0238290abc295b59871eb7206624960
2014-10-26 01:04:12 -07:00
Mario Russo a8c7b8d7fb ui: tags control
Removing DEBUG_TAGS flag so that tags control is available by default.
Request per Aaron (https://camlistore-review.googlesource.com/#/c/3806/)

Change-Id: If1ad842a563d1992fb8ca203c67502825d2eb64c
2014-10-12 15:32:48 +02:00
Tamás Gulácsi 3686417bac Import pkg/sorted/leveldb in server/camlistore
To be able to use it (ATM only in low-level config, by specifying
metaIndex with the stores/queues/caches).

Change-Id: I7743ebffb90f59b83124063f8f488a9b80c869ca
2014-09-25 18:40:33 +02:00
Mario Russo 5385ff14a9 ui: introduction of tagging controls to new contextual nav bar.
Currently disabled but can be tested via the DEBUG_TAGS flag in index.js. Potential enhancements are documented in tags_control.js. This patch
removes one piece of unused code.

Change-Id: I751fca63fbc93c209628f03a3f3aa6e87d01e309
2014-09-22 23:19:39 +02:00
Eric Drechsel 906ef089e6 UI permanode aspect: Don't save if nothing changed.
Bug: https://code.google.com/p/camlistore/issues/detail?id=505
Change-Id: I6816a51c2f005c7d903c9a02aa1410a52177cbec
2014-09-07 21:35:02 -07:00
Lindsey Simon 9cb690bea8 Adds less (css pre-processor) to fix missing CSS prefixes
Change-Id: I47a90ff128abfeac00c886a3dece4ffa38c704c8
2014-09-04 17:32:01 -07:00
Aaron Boodman 2acf13c702 Fix FOPA (flash of permanode aspect) when clicking permanodes with children.
We were waiting to show the container aspect until the child search session
returned. This meant that we temporarily showed the permanode aspect then
swapped to the container aspect shortly thereafter (because the container
aspect is higher priority).

The right solution to this is to change the search protocol so that clients
can know how many children a permanode has without getting the entire list
of them. But for now, it just so happens that search returns the entire
list, so we can use that instead.

Change-Id: Iaf93f689e965a1dc9ef73d834d46c57026c100cd
2014-09-03 00:30:46 -07:00
Aaron Boodman 6f91febae4 Don't trigger sad piggy when we purposely close sockets.
Change-Id: I2e3b0e894fff180a028fcffbf649ff18f69fd963
2014-09-03 00:07:08 -07:00
Aaron Boodman dbdda81230 Be defensive against getting null updates on web socket.
Change-Id: Id7a7b850ddaa57fe24d8e7ec380fb8881b27def5
2014-09-03 00:00:28 -07:00
Aaron Boodman 95bf8e42a3 Get continual server status updates over websocket.
Also show channel-level websocket errors in piggy menu.

Change-Id: Iad5f00e5578f28f837cd2e88cbdab3f715a9fed1
2014-08-30 09:43:27 -07:00
Aaron Boodman 16085b9a4d Move importerRoot from status.json to discovery.
It seems to make more sense there...

Change-Id: I8450f1cb30ed331cfe15ddb49f55438c5bf9fd5b
2014-08-30 09:09:05 -07:00
Aaron Boodman 40390c651a Adjust position of error icon.
Change-Id: I2b86d8b52a3c616ca3f2408973d85e70fb27a2d7
2014-08-29 20:55:52 -07:00
Aaron Boodman ef5e0dfc82 Show server errors in the piggy menu.
When there is a server error, the piggy becomes sad and periodically
shakes his head. When you expand the piggy menu you see one or more
entries explaining why he is sad.

Change-Id: If1e28dbf02c9befaa46b62838cb704220f719bc6
2014-08-29 16:08:19 -07:00
Brad Fitzpatrick 77a5f0f375 Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-08-25 16:50:42 -07:00
Brad Fitzpatrick 1d95b1133b Disable App Engine build tests, since GAE is Go 1.2 and we need 1.3
Will renable when App Engine supports Go 1.3.

Change-Id: I777f83f3b040aa873bf9d92f2401d7f430e930f0
2014-08-25 16:39:41 -07:00
Aaron Boodman 1f57cf3924 Merge "Rewrite permanode detail in React." 2014-08-22 23:25:34 +00:00
Aaron Boodman c07828d663 Rewrite permanode detail in React.
This is more general than the old one... it allows generic editing
of all attributes.

Change-Id: I308e39034cf206f9cd8e99cb52863a09c2755705
2014-08-22 16:16:39 -07:00
Aaron Boodman 0d923c6207 Add a link in the piggy drop down to importers UI
Change-Id: I4a2ba7127822e85f086ff4155c079a74ee31fae6
2014-08-21 10:36:39 -07:00
Aaron Boodman 90d1df956f Hide contents view on empty permanodes.
Otherwise, we end up showing a stupid empty contents view for every
tweet, foursquare checkin, etc.

This has the downside that when you remove the last item from a
set, the contents view goes away.

Change-Id: If5f53a713aaff63d9fb294b675a5e55ca452eff1
2014-08-20 19:13:19 -07:00
Aaron Boodman 8e876b51b9 Always show the search aspect for searches, even when results are empty.
Before we did not show the search aspect when the results were empty.
This was intended for the case where you're looking at an image or
something that doesn't have children.

But it had the side effect of meaning that we didn't show the search
aspect for empty sets, or empty search results, which isn't right
because you still want users to be able add items to empty sets.

Change-Id: Iad187b38317a5adcefbfd06f92047c03c5815583
2014-08-18 19:24:29 -07:00
Aaron Boodman 940150a5c7 Reimplement the Blob aspect using React.
Change-Id: I819b4d1dda86fe80db203f10e1e8a1b23b0777d5
2014-08-18 18:19:50 -07:00
Aaron Boodman a4abea7525 Change URL format for individual blobs in the web UI.
Instead of /ui/?b=<hash>, /ui/?p=<hash>, /ui/?d=<hash>, etc...,
it's now just: /ui/<hash>

This makes constructing links easier, because you don't have to
know whether a blob is also a permanode, or a directory, or
whatever.

Change-Id: I771fa1b1699b9009269c7eee632e7e8fd5335331
2014-08-18 18:17:47 -07:00
Brad Fitzpatrick d36efd7434 ui: Change text Server status, not just Sync status
Change-Id: I9de4d6c6ee391fac81401331f907bbbd57ab7faf
2014-08-16 14:52:57 -07:00
Aaron Boodman 4b9874afd5 Fix UI refresh when you don't have websocket support.
I broke this in an early CL. Damn you JavaScript and your non-compiling.

Change-Id: I796bb19855802d7663e0aed9c7e30ddcc4061b44
2014-08-16 11:05:29 -07:00
Aaron Boodman 89bcd69bed Merge "Add a piggy menu item to go to the sync status page." 2014-08-16 04:20:08 +00:00
Aaron Boodman 2cb1956a3a Add a piggy menu item to go to the sync status page.
Also add support for piggy menu items that are just links. Links are
nice because you can right-click 'em and so on.

Change-Id: I0cfb4ba6f58141ee396916925793a06033457028
2014-08-16 10:57:11 -07:00
Brad Fitzpatrick 9dae4f7ddf Since GCE only links to the HTTP url, redirect HTTP requests to https.
Change-Id: I50ff31f0d27437a11f672565e5f0870aaa2fd81b
2014-08-15 23:17:14 -07:00
Brad Fitzpatrick 4106d1bd2e Merge branch 'master' of https://camlistore.googlesource.com/camlistore 2014-08-15 22:29:55 -07:00
Brad Fitzpatrick cab5f227f6 Handle serverinit.DefaultEnvConfig return values correctly.
Change-Id: I074507fc1e32d62f2d1b8af00f4ce47d733d89a7
2014-08-15 22:05:33 -07:00
Brad Fitzpatrick 79335328cc Make 2048 bit keys instead of 1024.
Change-Id: I82a93a7fc5ba8e6b688a422b55b868bb3f3969fa
2014-08-15 22:05:08 -07:00
Aaron Boodman 1e0db747fd Make directory aspect actually work.
Change-Id: I560cb9c8d91a395c26253d7fd4a8ec605671a910
2014-08-15 21:37:43 -07:00
Aaron Boodman 6b9ed9e467 Some cleanup: remove an unneeded file and rename another.
Change-Id: I7ef87c7fcfc831d40b2c507128de04b7c8b20d1c
2014-08-15 21:37:22 -07:00
Aaron Boodman a6450f6468 Merge "Propagate all clicks in the hacky child frame up to the main app." 2014-08-16 04:20:08 +00:00
Aaron Boodman 48803d183b Propagate all clicks in the hacky child frame up to the main app.
This is temporary duct tape to make the child frames work better
utnil they are rewritten.

Change-Id: I1822af95620164896b959f946b9a888e6ecdf91f
2014-08-15 21:19:54 -07:00
Brad Fitzpatrick 9fbec8dd12 serverinit, camlistored: support environment-specific default config files
When running on GCE now, the default config file is a function of
attributes on the instance.

Change-Id: I62fe23ecf28757a6baee6bd432f080f223a389c5
2014-08-15 20:50:59 -07:00
Brad Fitzpatrick 2ee36e4f1a Embed Mozilla's Root CA set for use in Docker environments without CA files.
Thanks to Adam Langley and Kelsey Hightower for pointers:

https://github.com/kelseyhightower/contributors/blob/master/certs.go
https://medium.com/@kelseyhightower/optimizing-docker-images-for-static-binaries-b5696e26eb07
https://github.com/agl/extract-nss-root-certs

Change-Id: I440cedf476446da852c409958a877fbcdb464340
2014-08-15 17:15:09 -07:00
Aaron Boodman e9b8024007 Create a cache of search sessions to improve performance for common navigations.
This was done in a more manual way in the old UI. This is a bit more general.

Change-Id: I2a0f14a7023edc17c4853a2bc1fa5c7987f71de9
2014-08-14 17:14:24 -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
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 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 b6cff26139 camlistored: register a jsonconfig _gce_instance_meta lookup func
Change-Id: I1f3201be49aed32ac572282ffa4581ce4c71184f
2014-08-06 17:00:58 -07:00
Brad Fitzpatrick 5540a38dbd More work towards making the /gcs/ filesystem paths work on GCE. Incomplete.
Change-Id: I58ceec5d1c1cb61cbaa7d7e68a13ed5482dfbb0d
2014-08-05 12:45:10 -07:00
Brad Fitzpatrick acf2eeb2d4 remove redunant part of error message
Change-Id: I87958658d5af5f4b52cdadbf0b9d0b3748bd1738
2014-08-04 22:50:56 -07:00
Brad Fitzpatrick a01175d45c On GCE, use VM instance attribute camlistore-config-bucket to find config dir (bucket)
Change-Id: I56a7df55c182938eaf787b2ac6a32e20867409d5
2014-08-04 22:49:22 -07:00
Brad Fitzpatrick c8322af356 Add well-known filesystem abstraction package 'wkfs' for cloud deployment ease.
Part of Camlistore deploy to GCE easily. Will use paths like /gcs/bucket/foo or /gce-meta/attr for some
things previously-assumed to only be stored on the OS filesystem.

Change-Id: I2ed6cf5759c4d277f4e89a33a0fcfeee8bcbbf82
2014-08-04 21:27:07 -07:00
Brad Fitzpatrick 1bfd1b7d98 camlistored, serverinit: allow server config from URLs.
paves the way for server config from GCE metadata, too.

Change-Id: I9e54e3ad79eb53e7ae96159f2aa02f4a017e8e11
2014-08-02 16:53:58 -07:00
Brad Fitzpatrick afe0bfc5ac Rename flag for consistency.
Change-Id: Iaa2d0fc4bf02a27a30eb85aee9b8f757440a35c6
2014-08-02 14:31:02 -07:00
Brad Fitzpatrick 1577fc1e56 Merge "netutil: add HostPort, serverinit: return app baseURL" 2014-08-01 18:50:59 +00:00
Aaron Boodman 00552a0ded Merge "Require date and username before custom rendering Twitter items." 2014-08-01 18:50:59 +00:00
Aaron Boodman 8dba194013 Render containers with the camliContentImage attr as folders for now.
Something fancier would be better, but without this change they'd get
rendered as single images, which would be confusing.

Change-Id: Icd08eb1716ae1f3bebe2f064388cac822a0a4e63
2014-08-01 11:52:24 -07:00
mpl 0a869ad067 netutil: add HostPort, serverinit: return app baseURL
Context: http://camlistore.org/issue/479

This patch allows camlistored to wait for all the apps to be serving,
before printing its own listening address.

Change-Id: I4035b115a03ef6a2a43177b83b5b65ebc50a2188
2014-08-01 00:01:27 +02:00
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 de204ded6a Require date and username before custom rendering Twitter items.
Change-Id: I642ceac6c3ccca18dc32cc092a513604152384cb
2014-07-01 14:23:38 -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 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 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