Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CE079200CC5 for ; Tue, 27 Jun 2017 06:21:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CCAD5160BF8; Tue, 27 Jun 2017 04:21:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1E9D3160BDE for ; Tue, 27 Jun 2017 06:21:10 +0200 (CEST) Received: (qmail 91194 invoked by uid 500); 27 Jun 2017 04:21:10 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 91175 invoked by uid 99); 27 Jun 2017 04:21:10 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jun 2017 04:21:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E35A31A7AE8 for ; Tue, 27 Jun 2017 04:21:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.221 X-Spam-Level: X-Spam-Status: No, score=-4.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id hb5-IO2CdhrN for ; Tue, 27 Jun 2017 04:21:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 7180A5F54F for ; Tue, 27 Jun 2017 04:21:07 +0000 (UTC) Received: (qmail 91141 invoked by uid 99); 27 Jun 2017 04:21:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jun 2017 04:21:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CEA1FDFEF5; Tue, 27 Jun 2017 04:21:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmuehlner@apache.org To: commits@guacamole.incubator.apache.org Date: Tue, 27 Jun 2017 04:21:06 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-guacamole-client git commit: GUACAMOLE-334: Merge ability to download connection history results as csv. archived-at: Tue, 27 Jun 2017 04:21:12 -0000 GUACAMOLE-334: Merge ability to download connection history results as csv. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b26a664d Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b26a664d Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b26a664d Branch: refs/heads/master Commit: b26a664d66fd14a22eb7300d29aa20390cf408ec Parents: ef9ba68 9902698 Author: James Muehlner Authored: Mon Jun 26 21:17:57 2017 -0700 Committer: James Muehlner Committed: Mon Jun 26 21:17:57 2017 -0700 ---------------------------------------------------------------------- .../directives/guacSettingsConnectionHistory.js | 49 +++++++++ .../webapp/app/settings/services/csvService.js | 106 +++++++++++++++++++ .../main/webapp/app/settings/styles/history.css | 19 +++- .../templates/settingsConnectionHistory.html | 1 + guacamole/src/main/webapp/translations/en.json | 6 +- 5 files changed, 179 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b26a664d/guacamole/src/main/webapp/translations/en.json ----------------------------------------------------------------------