Граф коммитов

32 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
86fb0d87a3 Adding caching layer to some posts calls (#4779) 2016-12-14 00:24:24 -03:00
George Goldberg
e7710cf1d2 PLT-4847 Fix formatting of links imported from Slack. (#4674)
This fixes mailto: links built from email addresses posted to Slack as
described in the ticket, but also fixes any other type of URL that has
been auto-linked in the Slack messages.
2016-11-29 14:07:07 -05:00
George Goldberg
be0ae36422 Fix failure to import same Slack archive to 2 teams. (#4650)
This fixes the issue where you can't import 2 Slack exports with any
users who's emails appear in both exports onto different teams of the
same server.

Fixes #4126
2016-11-28 10:39:06 -05:00
Christopher Speller
18745b2d5c Increase Channel Purpose length to 250, and add channel field length handling code to the slack importer (#4458)
* Increase Channel Purpose length to 250.

This commit increases the maxmimum length of the channel purpose field
to 250, including the database migration necessary.

It also adds a method to the Slack importer to check the lengths of
channel properties before importing, and truncate them if necessary.

Fixes #4168

* Fix database migration.
2016-11-04 17:20:21 -04:00
George Goldberg
4476adf131 Channel link marker changed from ! to ~ (#4433)
Fixes PLT-4570
2016-11-03 15:26:00 -04:00
George Goldberg
7d91f17914 Import Slack bot_message type posts. (#4261)
This includes all messages from integrations, as far as I can tell.

Messages are "owned" by a special user that is deactivated once the
import completes.

Override User Names are only shown where the individual Slack posts have
a username override in them. Ones set centrally through the Slack Web
Hooks administration, or by Slack-official integrations, aren't known so
we can't set them on the imported posts. Same for icons.

The attachment "colors" aren't imported as Mattermost does not appear to
have any equivalent feature.

Fixes PLT-48
2016-11-03 15:04:01 -04:00
George Goldberg
54277eae28 Warning in log when a Slack channel import fails. (#4262)
Previously it just wrote to the summary, and as a debug level message in
the log, so if you had the log level set to warn, you might never find
out that importing a channel failed.
2016-10-31 09:02:54 -04:00
George Goldberg
8c8bc7111c Slack import unit tests (#4201)
* Slack Import unit tests (for some functions).

Covers the completely self contained functions in the Slack Importer
that are straightforward to unit test.

JSON processing functions are not yet unit tested.

* Unit tests for Slack Import JSON parsing.

This tests the 3 functions for parsing JSON, using a sample set of
Slack data for posts, channels, and users.
2016-10-12 10:03:30 -04:00
George Goldberg
552508706d Import /me messages from Slack. (#4164)
Use message formatting consistent with how Mattermost does for the /me
command for new messages.
2016-10-12 09:33:58 -04:00
George Goldberg
5ca05124cf Import Slack uploads if present in zip archive. (#4088)
* Import Slack uploads if present in zip archive.

This is part 3 of PLT-4280, to support importing file uploads when
importing from Slack. It is assumed the uploads in the zip archive will
be present as per the output of slack-advanced-exporter:

https://github.com/grundleborg/slack-advanced-exporter

If the uploads are not present (ie. this is a vanilla Slack export
archive) uploads are treated in the same way as before this patch,
providing only a link to the upload on Slack's servers.

* Update to new Files API.
2016-10-12 09:31:05 -04:00
George Goldberg
cd5bf7cb5a Correctly import Slack topic and purpose. (#4152)
In order to maintain consistency with how topic and purpose are used in
Slack, the mapping is as follows:

Slack   -> Mattermost
=====      ==========
Purpose -> Purpose
Topic   -> Header
2016-10-05 08:14:36 -04:00
George Goldberg
1a5a624470 Fix import of Slack file_comment messages. (#4132)
At the moment, the importer fails to parse the JSON of these types of
message, and so ignores them.

This fix means they are now parsed and imported just as if they were
standalone messages (not file comments), which is better, and what the
existing code clearly intended to happen.

For the future, they should probably be changed to be imported as
replies to the message with the file attached that they are commenting
on.

Fixes #4131.
2016-10-04 08:51:38 -04:00
George Goldberg
de79343b9a Fix !channel linking in Slack import. (#4065)
Original version of the patch didn't take into account that, like with
@mentions, there's an "old" and a "new" format in the Slack export files
for channel mentions. This version imports both correctly.
2016-09-21 15:17:48 -03:00
George Goldberg
33eda94db3 PLT-1764 #channels => !channels on Slack import. (#4028) 2016-09-19 08:22:08 -04:00
Christopher Speller
adfcda4802 Some improvments to slack import (#4010) 2016-09-12 11:57:36 -04:00
George Goldberg
af0df81a97 Fix @channel, @here and @everyone Slack import. (#3946)
Does this by adding special case regexes to the @mention importing code
in the Slack importer for these three special mention types.

Fixes PLT-4053
2016-09-06 12:56:29 -04:00
George Goldberg
55342e8fe1 Convert @mentions on Slack import. (#3837)
Converts @mentions in Slack imports for regular messages, comments and
Slack upload messages.

Updates the description on the Team Settings Import tab to remove
mention of @mentions not importing.
2016-08-29 09:45:27 -04:00
Christopher Speller
f3fa435a1b Fixing slack import. (#2819) 2016-04-28 16:29:13 -04:00
Corey Hulen
2e5617c29b PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams
2016-04-21 22:37:01 -07:00
Christopher Speller
476822ca8d Fixing slack import. 2016-02-08 09:41:56 -05:00
Elias Nahum
6fd328ddaa Refactoring api to use translations (chunk 2)
- Add spanish translations
- Does not include tests
- Add func to get the translations for a user locale
2016-01-22 01:37:11 -03:00
Corey Hulen
aefbb541d0 Revert " PLT-7 adding loc for db calls" 2016-01-20 13:36:16 -06:00
=Corey Hulen
aac8d121a0 PLT-7 adding loc db calls for posts table 2016-01-20 10:34:31 -06:00
=Corey Hulen
11c035aef4 PLT-7 adding loc db calls for oauth table 2016-01-20 10:04:17 -06:00
=Corey Hulen
b1251b9393 Upgrade logging package 2016-01-11 09:12:51 -06:00
hmhealey
61da22ea32 Added Channel.Purpose on the server 2015-10-27 12:46:31 -04:00
hmhealey
09b38404fa Renamed Channel.Description to Channel.Header on the server 2015-10-27 12:46:30 -04:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
Christopher Speller
7b3c2d6d85 Allowing underscores in channel names. Added conversion of some slack channel names into valid mattermost names. 2015-09-14 12:18:38 -04:00
Christopher Speller
1ed6718dd9 Improvements to import UI 2015-08-26 15:24:17 -04:00
Christopher Speller
9222e191aa Requiring team admin to import and fixing a few style issues 2015-08-19 08:53:52 -04:00
Christopher Speller
d78ebab108 Implemention of slack import feature. 2015-08-19 08:52:49 -04:00