Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system.
Этот коммит содержится в:
@@ -1,15 +1,15 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
var client = require('./client.jsx');
|
||||
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
||||
var BrowserStore = require('../stores/browser_store.jsx');
|
||||
var ChannelStore = require('../stores/channel_store.jsx');
|
||||
var PostStore = require('../stores/post_store.jsx');
|
||||
var UserStore = require('../stores/user_store.jsx');
|
||||
var utils = require('./utils.jsx');
|
||||
import * as client from './client.jsx';
|
||||
import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
|
||||
import BrowserStore from '../stores/browser_store.jsx';
|
||||
import ChannelStore from '../stores/channel_store.jsx';
|
||||
import PostStore from '../stores/post_store.jsx';
|
||||
import UserStore from '../stores/user_store.jsx';
|
||||
import * as utils from './utils.jsx';
|
||||
|
||||
var Constants = require('./constants.jsx');
|
||||
import Constants from './constants.jsx';
|
||||
var ActionTypes = Constants.ActionTypes;
|
||||
|
||||
// Used to track in progress async calls
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
const Utils = require('./utils.jsx');
|
||||
const InviteMemberModal = require('../components/invite_member_modal.jsx');
|
||||
const UserProfile = require('../components/user_profile.jsx');
|
||||
const ChannelStore = require('../stores/channel_store.jsx');
|
||||
const Constants = require('../utils/constants.jsx');
|
||||
const TeamStore = require('../stores/team_store.jsx');
|
||||
import * as Utils from './utils.jsx';
|
||||
import InviteMemberModal from '../components/invite_member_modal.jsx';
|
||||
import UserProfile from '../components/user_profile.jsx';
|
||||
import ChannelStore from '../stores/channel_store.jsx';
|
||||
import Constants from '../utils/constants.jsx';
|
||||
import TeamStore from '../stores/team_store.jsx';
|
||||
|
||||
export function createChannelIntroMessage(channel, showInviteModal) {
|
||||
if (channel.type === 'D') {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// See License.txt for license information.
|
||||
|
||||
var BrowserStore = require('../stores/browser_store.jsx');
|
||||
var TeamStore = require('../stores/team_store.jsx');
|
||||
var ErrorStore = require('../stores/error_store.jsx');
|
||||
import BrowserStore from '../stores/browser_store.jsx';
|
||||
import TeamStore from '../stores/team_store.jsx';
|
||||
import ErrorStore from '../stores/error_store.jsx';
|
||||
|
||||
export function track(category, action, label, property, value) {
|
||||
global.window.analytics.track(action, {category, label, property, value});
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
var keyMirror = require('keymirror');
|
||||
import keyMirror from 'keymirror';
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
ActionTypes: keyMirror({
|
||||
RECIEVED_ERROR: null,
|
||||
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
const highlightJs = require('highlight.js/lib/highlight.js');
|
||||
const highlightJsDiff = require('highlight.js/lib/languages/diff.js');
|
||||
const highlightJsApache = require('highlight.js/lib/languages/apache.js');
|
||||
const highlightJsMakefile = require('highlight.js/lib/languages/makefile.js');
|
||||
const highlightJsHttp = require('highlight.js/lib/languages/http.js');
|
||||
const highlightJsJson = require('highlight.js/lib/languages/json.js');
|
||||
const highlightJsMarkdown = require('highlight.js/lib/languages/markdown.js');
|
||||
const highlightJsJavascript = require('highlight.js/lib/languages/javascript.js');
|
||||
const highlightJsCss = require('highlight.js/lib/languages/css.js');
|
||||
const highlightJsNginx = require('highlight.js/lib/languages/nginx.js');
|
||||
const highlightJsObjectivec = require('highlight.js/lib/languages/objectivec.js');
|
||||
const highlightJsPython = require('highlight.js/lib/languages/python.js');
|
||||
const highlightJsXml = require('highlight.js/lib/languages/xml.js');
|
||||
const highlightJsPerl = require('highlight.js/lib/languages/perl.js');
|
||||
const highlightJsBash = require('highlight.js/lib/languages/bash.js');
|
||||
const highlightJsPhp = require('highlight.js/lib/languages/php.js');
|
||||
const highlightJsCoffeescript = require('highlight.js/lib/languages/coffeescript.js');
|
||||
const highlightJsCs = require('highlight.js/lib/languages/cs.js');
|
||||
const highlightJsCpp = require('highlight.js/lib/languages/cpp.js');
|
||||
const highlightJsSql = require('highlight.js/lib/languages/sql.js');
|
||||
const highlightJsGo = require('highlight.js/lib/languages/go.js');
|
||||
const highlightJsRuby = require('highlight.js/lib/languages/ruby.js');
|
||||
const highlightJsJava = require('highlight.js/lib/languages/java.js');
|
||||
const highlightJsIni = require('highlight.js/lib/languages/ini.js');
|
||||
|
||||
highlightJs.registerLanguage('diff', highlightJsDiff);
|
||||
highlightJs.registerLanguage('apache', highlightJsApache);
|
||||
highlightJs.registerLanguage('makefile', highlightJsMakefile);
|
||||
highlightJs.registerLanguage('http', highlightJsHttp);
|
||||
highlightJs.registerLanguage('json', highlightJsJson);
|
||||
highlightJs.registerLanguage('markdown', highlightJsMarkdown);
|
||||
highlightJs.registerLanguage('javascript', highlightJsJavascript);
|
||||
highlightJs.registerLanguage('css', highlightJsCss);
|
||||
highlightJs.registerLanguage('nginx', highlightJsNginx);
|
||||
highlightJs.registerLanguage('objectivec', highlightJsObjectivec);
|
||||
highlightJs.registerLanguage('python', highlightJsPython);
|
||||
highlightJs.registerLanguage('xml', highlightJsXml);
|
||||
highlightJs.registerLanguage('perl', highlightJsPerl);
|
||||
highlightJs.registerLanguage('bash', highlightJsBash);
|
||||
highlightJs.registerLanguage('php', highlightJsPhp);
|
||||
highlightJs.registerLanguage('coffeescript', highlightJsCoffeescript);
|
||||
highlightJs.registerLanguage('cs', highlightJsCs);
|
||||
highlightJs.registerLanguage('cpp', highlightJsCpp);
|
||||
highlightJs.registerLanguage('sql', highlightJsSql);
|
||||
highlightJs.registerLanguage('go', highlightJsGo);
|
||||
highlightJs.registerLanguage('ruby', highlightJsRuby);
|
||||
highlightJs.registerLanguage('java', highlightJsJava);
|
||||
highlightJs.registerLanguage('ini', highlightJsIni);
|
||||
@@ -1,14 +1,62 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
require('./highlight.jsx');
|
||||
const TextFormatting = require('./text_formatting.jsx');
|
||||
const Utils = require('./utils.jsx');
|
||||
import highlightJs from 'highlight.js/lib/highlight.js';
|
||||
import highlightJsDiff from 'highlight.js/lib/languages/diff.js';
|
||||
import highlightJsApache from 'highlight.js/lib/languages/apache.js';
|
||||
import highlightJsMakefile from 'highlight.js/lib/languages/makefile.js';
|
||||
import highlightJsHttp from 'highlight.js/lib/languages/http.js';
|
||||
import highlightJsJson from 'highlight.js/lib/languages/json.js';
|
||||
import highlightJsMarkdown from 'highlight.js/lib/languages/markdown.js';
|
||||
import highlightJsJavascript from 'highlight.js/lib/languages/javascript.js';
|
||||
import highlightJsCss from 'highlight.js/lib/languages/css.js';
|
||||
import highlightJsNginx from 'highlight.js/lib/languages/nginx.js';
|
||||
import highlightJsObjectivec from 'highlight.js/lib/languages/objectivec.js';
|
||||
import highlightJsPython from 'highlight.js/lib/languages/python.js';
|
||||
import highlightJsXml from 'highlight.js/lib/languages/xml.js';
|
||||
import highlightJsPerl from 'highlight.js/lib/languages/perl.js';
|
||||
import highlightJsBash from 'highlight.js/lib/languages/bash.js';
|
||||
import highlightJsPhp from 'highlight.js/lib/languages/php.js';
|
||||
import highlightJsCoffeescript from 'highlight.js/lib/languages/coffeescript.js';
|
||||
import highlightJsCs from 'highlight.js/lib/languages/cs.js';
|
||||
import highlightJsCpp from 'highlight.js/lib/languages/cpp.js';
|
||||
import highlightJsSql from 'highlight.js/lib/languages/sql.js';
|
||||
import highlightJsGo from 'highlight.js/lib/languages/go.js';
|
||||
import highlightJsRuby from 'highlight.js/lib/languages/ruby.js';
|
||||
import highlightJsJava from 'highlight.js/lib/languages/java.js';
|
||||
import highlightJsIni from 'highlight.js/lib/languages/ini.js';
|
||||
|
||||
const highlightJs = require('highlight.js/lib/highlight.js');
|
||||
const marked = require('marked');
|
||||
highlightJs.registerLanguage('diff', highlightJsDiff);
|
||||
highlightJs.registerLanguage('apache', highlightJsApache);
|
||||
highlightJs.registerLanguage('makefile', highlightJsMakefile);
|
||||
highlightJs.registerLanguage('http', highlightJsHttp);
|
||||
highlightJs.registerLanguage('json', highlightJsJson);
|
||||
highlightJs.registerLanguage('markdown', highlightJsMarkdown);
|
||||
highlightJs.registerLanguage('javascript', highlightJsJavascript);
|
||||
highlightJs.registerLanguage('css', highlightJsCss);
|
||||
highlightJs.registerLanguage('nginx', highlightJsNginx);
|
||||
highlightJs.registerLanguage('objectivec', highlightJsObjectivec);
|
||||
highlightJs.registerLanguage('python', highlightJsPython);
|
||||
highlightJs.registerLanguage('xml', highlightJsXml);
|
||||
highlightJs.registerLanguage('perl', highlightJsPerl);
|
||||
highlightJs.registerLanguage('bash', highlightJsBash);
|
||||
highlightJs.registerLanguage('php', highlightJsPhp);
|
||||
highlightJs.registerLanguage('coffeescript', highlightJsCoffeescript);
|
||||
highlightJs.registerLanguage('cs', highlightJsCs);
|
||||
highlightJs.registerLanguage('cpp', highlightJsCpp);
|
||||
highlightJs.registerLanguage('sql', highlightJsSql);
|
||||
highlightJs.registerLanguage('go', highlightJsGo);
|
||||
highlightJs.registerLanguage('ruby', highlightJsRuby);
|
||||
highlightJs.registerLanguage('java', highlightJsJava);
|
||||
highlightJs.registerLanguage('ini', highlightJsIni);
|
||||
|
||||
const HighlightedLanguages = require('../utils/constants.jsx').HighlightedLanguages;
|
||||
import * as TextFormatting from './text_formatting.jsx';
|
||||
import * as Utils from './utils.jsx';
|
||||
|
||||
import marked from 'marked';
|
||||
|
||||
import Constants from '../utils/constants.jsx';
|
||||
const HighlightedLanguages = Constants.HighlightedLanguages;
|
||||
|
||||
function markdownImageLoaded(image) {
|
||||
image.style.height = 'auto';
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
const Autolinker = require('autolinker');
|
||||
const Constants = require('./constants.jsx');
|
||||
const Emoticons = require('./emoticons.jsx');
|
||||
const Markdown = require('./markdown.jsx');
|
||||
const UserStore = require('../stores/user_store.jsx');
|
||||
const Utils = require('./utils.jsx');
|
||||
import Autolinker from 'autolinker';
|
||||
import Constants from './constants.jsx';
|
||||
import * as Emoticons from './emoticons.jsx';
|
||||
import * as Markdown from './markdown.jsx';
|
||||
import UserStore from '../stores/user_store.jsx';
|
||||
import * as Utils from './utils.jsx';
|
||||
|
||||
// Performs formatting of user posts including highlighting mentions and search terms and converting urls, hashtags, and
|
||||
// @mentions to links by taking a user's message and returning a string of formatted html. Also takes a number of options
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
|
||||
var ChannelStore = require('../stores/channel_store.jsx');
|
||||
var UserStore = require('../stores/user_store.jsx');
|
||||
var PreferenceStore = require('../stores/preference_store.jsx');
|
||||
var TeamStore = require('../stores/team_store.jsx');
|
||||
var Constants = require('../utils/constants.jsx');
|
||||
import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
|
||||
import ChannelStore from '../stores/channel_store.jsx';
|
||||
import UserStore from '../stores/user_store.jsx';
|
||||
import PreferenceStore from '../stores/preference_store.jsx';
|
||||
import TeamStore from '../stores/team_store.jsx';
|
||||
import Constants from '../utils/constants.jsx';
|
||||
var ActionTypes = Constants.ActionTypes;
|
||||
var Client = require('./client.jsx');
|
||||
var AsyncClient = require('./async_client.jsx');
|
||||
var client = require('./client.jsx');
|
||||
var Autolinker = require('autolinker');
|
||||
import * as Client from './client.jsx';
|
||||
import * as AsyncClient from './async_client.jsx';
|
||||
import * as client from './client.jsx';
|
||||
import Autolinker from 'autolinker';
|
||||
|
||||
export function isEmail(email) {
|
||||
//var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
|
||||
|
||||
Ссылка в новой задаче
Block a user