Hugh Miles 1060484836 Merge conflicts

2017-12-11 13:43:04 -08:00

..

assets

0.22.0

2017-12-11 13:39:14 -08:00

bin

fix unicode issues (#2308 #2282) (#2401)

2017-03-14 09:53:31 -07:00

connectors

[Bugfix] _add_filters_from_pre_query doesn't handle dim specs (#3974)

2017-12-11 12:35:25 -08:00

data

DECKGL integration - Phase 1 (#3771)

2017-11-16 00:30:02 -08:00

db_engines

[flake8] Resolving Q??? errors (#3847)

2017-11-13 21:06:51 -08:00

migrations

fix 'superset db history' (#3948)

2017-11-29 20:52:56 -08:00

models

Adding YAML Import-Export for Datasources to CLI (#3978)

2017-12-05 11:14:52 -08:00

static

Rremove unused symlinks (#1736)

2016-12-01 19:52:46 -08:00

templates

Simplify login form for oauth

2017-12-11 13:41:25 -08:00

translations

Basic German Translation (#3740)

2017-11-09 20:45:37 -08:00

views

Merge conflicts

2017-12-11 13:43:04 -08:00

__init__.py

Alternate PR to #3970 (#3997)

2017-12-04 08:19:51 -08:00

cache_util.py

[flake8] Resolve I??? errors (#3797)

2017-11-07 20:23:40 -08:00

cli.py

Adding YAML Import-Export for Datasources to CLI (#3978)

2017-12-05 11:14:52 -08:00

config.py

Alternate PR to #3970 (#3997)

2017-12-04 08:19:51 -08:00

dataframe.py

Workaround pandas bug in datetimes with time zones (#3910)

2017-11-20 08:33:18 -08:00

db_engine_specs.py

Add support of another DatabaseError format (#4019)

2017-12-06 21:49:03 -08:00

dict_import_export_util.py

Adding YAML Import-Export for Datasources to CLI (#3978)

2017-12-05 11:14:52 -08:00

extract_table_names.py

[flake8] Resolve I??? errors (#3797)

2017-11-07 20:23:40 -08:00

forms.py

Import CSV (#3643)

2017-11-27 21:07:12 -08:00

import_util.py

[flake8] Resolve I??? errors (#3797)

2017-11-07 20:23:40 -08:00

jinja_context.py

[flake8] Resolve I??? errors (#3797)

2017-11-07 20:23:40 -08:00

legacy.py

[flake8] Resolving Q??? errors (#3847)

2017-11-13 21:06:51 -08:00

security.py

[flake8] Resolving Q??? errors (#3847)

2017-11-13 21:06:51 -08:00

sql_lab.py

[flake8] Resolving Q??? errors (#3847)

2017-11-13 21:06:51 -08:00

sql_parse.py

[flake8] Resolving Q??? errors (#3847)

2017-11-13 21:06:51 -08:00

stats_logger.py

[flake8] Resolving Q??? errors (#3847)

2017-11-13 21:06:51 -08:00

utils.py

[3541] Augmenting datasources uniqueness constraints (#3583)

2017-11-19 20:09:18 -08:00

viz.py

resolve python2 str() issue (#4030)

2017-12-09 14:23:24 -08:00