Commit Graph

7185 Commits

Author SHA1 Message Date
enahum
38568c2769 PLT-3968 Require user for getMe API (#4225) 2016-10-17 10:43:28 -04:00
Jason Blais
6cb0652c3d Specify which localization files need to be updated in PRs (#4234) 2016-10-17 10:43:04 -04:00
Harrison Healey
3660f78733 Re-enable console logging by default (#4210)
* Re-enable console logging by default

* Disable LogSettings.EnableConsole while packaging release

* Updated defaults in config.json to match the ones generated by the server

* Fixed make package and changed it to reduce the log level instead of disabling console logging entirely
2016-10-17 10:52:47 -03:00
Corey Hulen
219f4e36e5 Bumping up the defaults (#4229) 2016-10-17 10:50:41 -03:00
Alexander Smaga
e7b25f4cd8 GH-4187 Create direct channel during incoming webhook if not exists (#4206) 2016-10-17 08:12:56 -04:00
William Gathoye
b1e2b23b88 Be more explicit wrt. low level ports for newbies (#4158) 2016-10-17 08:11:24 -04:00
enahum
fbd1aa654c Fix a couple of strings in localization (#4228) 2016-10-17 08:06:39 -04:00
David Lu
e18e41d29d Fixing marking channels unread, again (#4215)
* Fixing marking channels unread, again

* Update channel_store.jsx
2016-10-14 10:17:25 -03:00
enahum
f555f104c1 Make tests pass without internet connection (#4211) 2016-10-13 14:04:46 -04:00
Joram Wilander
c902a0a773 Fix shortcut for selecting text with CMD/CTRL + SHIFT (#4213) 2016-10-13 12:29:10 -04:00
Alexander Smaga
69e90255aa GH-4087 added extra fields to Props in header update system message (#4209) 2016-10-13 11:13:12 -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
Alexander Smaga
3a369c9de8 GH-4187 Turn off dot menu for system messages (#4198) 2016-10-12 09:59:03 -04:00
Asaad Mahmood
39eee5e4ec Multiple UI Improvements (#4200)
* Multiple UI Improvements

* Adjusting return to call position on mobile
2016-10-12 09:58:09 -04:00
Stan Hu
d4268cf0d8 Trim trailing slashes to prevent OAuth2 URI mismatch errors (#4204)
Closes https://gitlab.com/gitlab-org/gitlab-mattermost/issues/84
2016-10-12 09:51:57 -04:00
enahum
d195eea07d translations PR 20161011 (#4199) 2016-10-12 09:49:17 -04:00
Yuya Ochiai
0a2146692c PLT-4261 Set silent parameter for Notification (#4192)
In the desktop app, there are two kinds of sound on notifications,
`Utils.ding()` and `new Notification()` on Windows and Mac.
This commit stops both if the account setting is set to off.
2016-10-12 09:36:06 -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
lfbrock
1b0c1eb3ae Update contributing.md (#4203)
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md
2016-10-11 16:13:53 -04:00
Pepijn
944bb1ba61 First commit for toggling mentions using shortcut and button (#4169)
Also did some refactoring and moved code to actions

Fixed coding style errors
2016-10-11 09:07:38 -04:00
David Lu
6e9e41ebb5 Improvements to Custom Branding (#4177) 2016-10-11 09:06:47 -04:00
David Lu
78a4b19fd7 PLT-3785 Re-enabled marking messages unread (#4179)
* Re-added ALT+Click to mark msgs unread, fixed mentions for DM

* Added string to /shortcuts
2016-10-11 09:06:12 -04:00
Jason Blais
ae79fabf4b Fix bad merge from #4130 (#4196) 2016-10-11 08:45:15 -04:00
Jason Blais
fe1503d9e7 Add text banner to SAML System Console settings (#4195)
* Update saml_settings.jsx

* Update en.json

* Text tweak

* Fix build error

* Use classnames in saml_settings.jsx to fix build errors
2016-10-11 08:44:46 -04:00
Harrison Healey
7fb818d4ce PLT-3105 Fixed bugs with FileInfos migration, including duplicate FileInfos being saved (#4134)
* Added a limit to GetByPath for the rare cases when two old files had the same path

* Fixed files still being displayed for deleted posts

* Added a lock to prevent migrateFilenamesToFileInfos from migrating multiple posts at once
2016-10-06 17:44:41 -03:00
Brendan Bowidas
c9793a566a PLT-3252 Bring up profile popover after clicking on a profile picture… (#4144)
* PLT-3252 Bring up profile popover after clicking on a profile picture in a channel

* PLT-3252 Bring up profile popover after clicking on a profile picture in a channel

remove important

* fixed 'Cannot read property first_name of undefined' bug

* fix status indicator position

* refactoring per request
2016-10-06 17:43:53 -03:00
William Gathoye
6e5d65d336 Fix en text for file message undefined (#4160) 2016-10-06 17:42:37 -03:00
Asaad Mahmood
d67b2b4832 Minor bug fixes (#4172) 2016-10-06 17:42:08 -03:00
lfbrock
ba3c6d909a Text change to About dialog (#4166)
* Update about_build_modal.jsx

* Update en.json
2016-10-05 18:45:22 -07:00
William Gathoye
968d890a76 Fix usage of example (e.g. vs Ex) abbreviations (#4136) 2016-10-05 18:43:04 -07:00
Jason Blais
db56771344 Fix incorrect id + typos in en.json (#4157) 2016-10-05 10:25:36 -04:00
Yusuke Nemoto
26099d89e9 PLT-3487 Preview uploaded txt file (#4145)
* fix filename

* Add 'txt' to hilighted language
2016-10-05 10:34:03 -03: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
Harrison Healey
816a738d28 PLT-4343 Fixes for mobile main menu (#4148)
* Fixed mobile app link in the main menu to be displayed on mobile browsers

* Fixed doubled up dividers in mobile menu

* Added scrolling to mobile main menu
2016-10-04 14:38:19 -04:00
enahum
b9dc759449 translations PR 20160929 (#4123) 2016-10-04 14:37:05 -04:00
Harrison Healey
f92cf34307 PLT-3907 Added a javascript library to prevent the <body> from scrolling on iOS (#4147)
* Added a javascript library to prevent the <body> from scrolling on iOS

* Added iNoBounce to NOTICE.txt
2016-10-04 14:36:47 -04:00
Jared Shields
3bac3a0061 Updated make files/scripts to accomodate execution/building in windows in addition to linux/mac (#4135) 2016-10-04 08:56:01 -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
David Lu
38c34017a3 PLT-4200/3708 Fixed outside team DM switching, allowed switching to uncreated DMs (#4111)
* Fixed outside team DM switching, allowed switching to uncreated DMs

* Update channel_switch_modal.jsx
2016-10-04 08:49:57 -04:00
David Lu
2dd666cb8a PLT-4234 Sorted channels in LHS numerically, alphabetically, and based on locale (#4110)
* Sorted channels in LHS numerically, alphabetically, and based on locale

* Choose case based on locale
2016-10-04 08:48:42 -04:00
Christopher Speller
8f91c77755 Adding ability to serve TLS directly from Mattermost server (#4119) 2016-10-03 16:03:15 -04:00
Jason Blais
5f8e5c401b Change "Max Burst" to "Maximum Burst Size" (#4130)
* Update en.json

* Update rate_settings.jsx

* Update en.json
2016-10-03 09:04:38 -04:00
Harrison Healey
8a0e649f98 PLT-3105 Files table migration (#4068)
* Implemented initial changes for files table

* Removed *_benchmark_test.go files

* Re-implemented GetPublicFile and added support for old path

* Localization for files table

* Moved file system code into utils package

* Finished server-side changes and added initial upgrade script

* Added getPostFiles api

* Re-add Extension and HasPreviewImage fields to FileInfo

* Removed unused translation

* Fixed merge conflicts left over after permissions changes

* Forced FileInfo.extension to be lower case

* Changed FileUploadResponse to contain the FileInfos instead of FileIds

* Fixed permissions on getFile* calls

* Fixed notifications for file uploads

* Added initial version of client code for files changes

* Permanently added FileIds field to Post object and removed Post.HasFiles

* Updated PostStore.Update to be usable in more circumstances

* Re-added Filenames field and switched file migration to be entirely lazy-loaded

* Increased max listener count for FileStore

* Removed unused fileInfoCache

* Moved file system code back into api

* Removed duplicate test case

* Fixed unit test running on ports other than 8065

* Renamed HasPermissionToPostContext to HasPermissionToChannelByPostContext

* Refactored handleImages to make it more easily understandable

* Renamed getPostFiles to getFileInfosForPost

* Re-added pre-FileIds posts to analytics

* Changed files to be saved as their ids as opposed to id/filename.ext

* Renamed FileInfo.UserId to FileInfo.CreatorId

* Fixed detection of language in CodePreview

* Fixed switching between threads in the RHS not loading new files

* Add serverside protection against a rare bug where the client sends the same file twice for a single post

* Refactored the important parts of uploadFile api call into a function that can be called without a web context
2016-09-30 11:06:30 -04:00
Harrison Healey
a2deeed597 Fixed the YouTube link regex referencing removed capture groups (#4129) 2016-09-30 10:59:41 -04:00
George Goldberg
29a3706ec3 PLT-4307 - fix !channel link hrefs. (#4122)
* PLT-4307 - fix !channel link hrefs.

* Fix style.
2016-09-30 10:19:00 -03:00
Christopher Speller
49c6b42d38 Fixing manage members dialog not opening (#4128) 2016-09-30 10:18:10 -03:00
lfbrock
a2516743f3 Update LDAP help text (#4124)
* Update ldap_settings.jsx

* Update en.json
2016-09-30 09:15:07 -04:00
Harrison Healey
13bd14d626 Added spinner icon to select_team listing after clicking on a team to load (#4120) 2016-09-30 07:26:52 -04:00
Asaad Mahmood
d42eb46133 Multiple UI Improvements (#4117) 2016-09-29 12:58:14 -04:00