Skip to content
Snippets Groups Projects
Commit afdf8630 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge branch 'master' into about_metabase

parents 3e2e0d76 f601f74c
No related branches found
No related tags found
No related merge requests found
Showing
with 663 additions and 38 deletions
......@@ -26,7 +26,8 @@
"semi": 0,
"no-console": 0,
"global-strict": 0,
"new-cap": 0
"new-cap": 0,
"strict": [2, "never"]
},
"plugins": [
"react"
......
This diff is collapsed.
'use strict';
var ActivityServices = angular.module('metabase.activity.services', ['ngResource', 'ngCookies']);
ActivityServices.factory('Activity', ['$resource', '$cookies', function($resource, $cookies) {
......
"use strict";
import _ from "underscore";
var DatabasesControllers = angular.module('metabaseadmin.databases.controllers', ['metabase.metabase.services']);
......
'use strict';
var AdminDatabases = angular.module('metabaseadmin.databases', [
'metabaseadmin.databases.controllers'
]);
......
'use strict';
import MetadataHeader from './MetadataHeader.react';
import MetadataTableList from './MetadataTableList.react';
import MetadataTable from './MetadataTable.react';
......
"use strict";
import Input from "metabase/components/Input.react";
import Select from "metabase/components/Select.react";
......
'use strict';
import SaveStatus from "metabase/components/SaveStatus.react";
import Toggle from "metabase/components/Toggle.react";
......
'use strict';
export default React.createClass({
displayName: "MetadataSchema",
propTypes: {
......
'use strict';
import Input from "metabase/components/Input.react";
import MetadataField from "./MetadataField.react";
import ProgressBar from "metabase/components/ProgressBar.react";
......
'use strict';
import _ from "underscore";
import ProgressBar from "metabase/components/ProgressBar.react";
......
'use strict';
import _ from "underscore";
import MetadataEditor from './components/MetadataEditor.react';
......
'use strict';
angular
.module('metabase.admin.metadata', [
'metabase.admin.metadata.controllers'
......
"use strict";
import { createAction } from "redux-actions";
import moment from "moment";
import { normalize, Schema, arrayOf } from "normalizr";
......
"use strict";
import React, { Component, PropTypes } from "react";
import _ from "underscore";
......
"use strict";
import React, { Component, PropTypes } from "react";
import _ from "underscore";
import cx from "classnames";
......
"use strict";
import React, { Component, PropTypes } from "react";
import Icon from "metabase/components/Icon.react";
......
"use strict";
import React, { Component, PropTypes } from "react";
import cx from "classnames";
......
"use strict";
import React, { Component, PropTypes } from "react";
import { connect } from "react-redux";
......
'use strict';
import { createStore, applyMiddleware, combineReducers, compose } from 'redux';
import promiseMiddleware from 'redux-promise';
import thunkMidleware from "redux-thunk";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment