commit 37d0a57e9d59eaafd32ffe10f6ced023759e9a94
Merge: ddc034a 1c81a61
Author: Isis Lovecruft <i...@torproject.org>
Date: Mon Aug 17 01:24:33 2015 +0000
Merge branch 'trac-16828'
src/js/application/app.js | 50 ++++++++++++------------
src/js/components/AlertBoxComponent.js | 2 +-
src/js/components/BandwidthStatsComponent.js | 8 ++--
src/js/components/LoadingIndicatorComponent.js | 2 +-
src/js/controllers/ApplicationController.js | 24 ++++++------
src/js/controllers/Top10Controller.js | 2 +-
src/js/helpers/dataTablesRenderer.js | 8 ++--
src/js/helpers/formatter.js | 28 ++++++-------
src/js/helpers/handlebarsHelper.js | 38 +++++++++---------
src/js/helpers/util.js | 48 +++++++++++------------
src/js/mixins/ContentReadyTriggerableMixin.js | 2 +-
src/js/mixins/PeriodsMixin.js | 16 ++++----
src/js/models/OnionooBandwidthHistory.js | 8 ++--
src/js/models/OnionooClientsHistory.js | 8 ++--
src/js/models/OnionooDetail.js | 50 ++++++++++++------------
src/js/models/OnionooUptimeHistory.js | 8 ++--
src/js/models/OnionooWeightsHistory.js | 6 +--
src/js/models/TemporaryStore.js | 10 ++---
src/js/routes/BridgeDetailRoute.js | 8 ++--
src/js/routes/RelayDetailRoute.js | 12 +++---
src/js/routes/StaticRoutes.js | 6 +--
src/js/routes/SummarySearchRoute.js | 18 ++++-----
src/js/routes/Top10Route.js | 6 +--
src/js/views/DetailViews.js | 8 ++--
src/js/views/HistoryGraphView.js | 40 +++++++++----------
src/js/views/SummariesView.js | 36 ++++++++---------
26 files changed, 226 insertions(+), 226 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
