Commit Graph

7202 Commits

Author SHA1 Message Date
Harrison Healey
484dd60dc9 Adding strings to en.json for mattermost-mobile (#4267) 2016-10-20 08:34:34 -07:00
Harrison Healey
b775b545fc Changed ConsoleLogLevel back to DEBUG during development (#4278) 2016-10-20 12:32:38 -03:00
Joram Wilander
4aa96c76b4 Fix autocomplete for old mechanisms and add partial fix for channel switcher (#4279) 2016-10-20 12:32:20 -03:00
Harrison Healey
4688d4981a Explicitly set Content-Type field when getting file attachments (#4280) 2016-10-20 12:31:15 -03:00
Joram Wilander
0a75b277dc Fix the multiple column full text search index for Postgres (#4282) 2016-10-20 12:30:44 -03:00
enahum
162282d42c PLT-4358 Exclude Channels from query when not necessary (#4269) 2016-10-20 10:28:19 -04:00
Joram Wilander
2e34d8843e PLT-4138 Fix /join command for non-admin accounts (#4265)
* Fix /join command for non-admin accounts

* Implement found check in join command unit test properly
2016-10-20 10:27:18 -04:00
Harrison Healey
6517b0f9e1 Fixed handleImages to properly capture loop variables (#4275) 2016-10-20 09:13:33 -04:00
Joram Wilander
86aa979310 Fix autocomplete not clearing suggestions properly (#4276) 2016-10-20 09:13:09 -04:00
enahum
530b5f5011 Fix HA User Typing bug (#4273) 2016-10-20 08:36:17 -04:00
Joram Wilander
365b8b465e Merging performance branch into master (#4268)
* improve performance on sendNotifications

* Fix SQL queries

* Remove get direct profiles, not needed anymore

* Add raw data to error details if AppError fails to decode

* men

* Fix decode (#4052)

* Fixing json decode

* Adding unit test

* Initial work for client scaling (#4051)

* Begin adding paging to profiles API

* Added more paging functionality

* Finish hooking up admin console user lists

* Add API for searching users and add searching to all user lists

* Add lazy loading of profiles

* Revert config.json

* Fix unit tests and some style issues

* Add GetProfilesFromList to Go driver and fix web unit test

* Update etag for GetProfiles

* Updating ui for filters and pagination (#4044)

* Updating UI for pagination

* Adjusting margins for filter row

* Adjusting margin for specific modals

* Adding relative padding to system console

* Adjusting responsive view

* Update client user tests

* Minor fixes for direct messages modal (#4056)

* Remove some unneeded initial load calls (#4057)

* UX updates to user lists, added smart counts and bug fixes (#4059)

* Improved getExplicitMentions and unit tests (#4064)

* Refactor getting posts to lazy load profiles correctly (#4062)

* Comment out SetActiveChannel test (#4066)

* Profiler cpu, block, and memory profiler. (#4081)

* Fix TestSetActiveChannel unit test (#4071)

* Fixing build failure caused by dependancies updating (#4076)

* Adding profiler

* Fix admin_team_member_dropdown eslint errors

* Bumping session cache size (#4077)

* Bumping session cache size

* Bumping status cache

* Refactor how the client handles channel members to be large team friendly (#4106)

* Refactor how the client handles channel members to be large team friendly

* Change Id to ChannelId in ChannelStats model

* Updated getChannelMember and getProfilesByIds routes to match proposal

* Performance improvements (#4100)

* Performance improvements

* Fixing re-connect issue

* Fixing error message

* Some other minor perf tweaks

* Some other minor perf tweaks

* Fixing config file

* Fixing buffer size

* Fixing web socket send message

* adding some error logging

* fix getMe to be user required

* Fix websocket event for new user

* Fixing shutting down

* Reverting web socket changes

* Fixing logging lvl

* Adding caching to GetMember

* Adding some logging

* Fixing caching

* Fixing caching invalidate

* Fixing direct message caching

* Fixing caching

* Fixing caching

* Remove GetDirectProfiles from initial load

* Adding logging and fixing websocket client

* Adding back caching from bad merge.

* Explicitly close go driver requests (#4162)

* Refactored how the client handles team members to be more large team friendly (#4159)

* Refactor getProfilesForDirectMessageList API into getAllProfiles API

* Refactored how the client handles team members to be more large team friendly

* Fix js error when receiving a notification

* Fix JS error caused by current user being overwritten with sanitized version (#4165)

* Adding error message to status failure (#4167)

* Fix a few bugs caused by client scaling refactoring (#4170)

* When there is no read replica, don't open a second set of connections to the master database (#4173)

* Adding connection tacking to stats (#4174)

* Reduce DB writes for statuses and other status related changes (#4175)

* Fix bug preventing opening of DM channels from more modal (#4181)

* 	Fixing socket timing error (#4183)

* Fixing ping/pong handler

* Fixing socket timing error

* Commenting out status broadcasting

* Removing user status changes

* Removing user status changes

* Removing user status changes

* Removing user status changes

* Adding DoPreComputeJson()

* Performance improvements (#4194)

* * Fix System Console Analytics queries
* Add db.SetConnMaxLifetime to 15 minutes
* Add "net/http/pprof" for profiling
* Add FreeOSMemory() to manually release memory on reload config

* Add flag to enable http profiler

* Fix memory leak (#4197)

* Fix memory leak

* removed unneeded nil assignment

* Fixing go routine leak (#4208)

* Merge fixes

* Merge fix

* Refactored statuses to be queried by the client rather than broadcast by the server (#4212)

* Refactored server code to reduce status broadcasts and to allow getting statuses by IDs

* Refactor client code to periodically fetch statuses

* Add store unit test for getting statuses by ids

* Fix status unit test

* Add getStatusesByIds REST API and move the client over to use that instead of the WebSocket

* Adding multiple threads to websocket hub (#4230)

* Adding multiple threads to websocket hub

* Fixing unit tests

* Fixing so websocket connections from the same user end up in the same… (#4240)

* Fixing so websocket connections from the same user end up in the same list

* Removing old comment

* Refactor user autocomplete to query the server (#4239)

* Add API for autocompleting users

* Converted at mention autocomplete to query server

* Converted user search autocomplete to query server

* Switch autocomplete API naming to use term instead of username

* Split autocomplete API into two, one for channels and for teams

* Fix copy/paste error

* Some final client scaling fixes (#4246)

* Add lazy loading of profiles to integration pages

* Add lazy loading of profiles to emoji page

* Fix JS error when receiving post in select team menu and also clean up channel store
2016-10-19 14:49:25 -04:00
Joram Wilander
0512bd26ee Fix date on license expiry messages (#4258) 2016-10-19 02:23:48 -07:00
Yang Chen
11bf05813a Changed “Apply New Theme to All Teams” to “Apply new theme to all my teams” (#4260) 2016-10-18 20:55:17 -03:00
Harrison Healey
821f1f9a03 Added -e to sed command in Makefile to make it work on all platforms (#4256) 2016-10-18 12:37:27 -04:00
Asaad Mahmood
d14a44cf98 Multiple UI Improvements (#4253)
Reverting config

Reverting config.json
2016-10-18 08:55:59 -07:00
Nick Frazier
06e5c097b3 fixed incorrect error display when trying a team URL with one character (#4223) 2016-10-17 11:49:59 -03:00
Huli
eac472b44f PLT-4387 Update browser tab when switching to System Console (#4221) 2016-10-17 10:44:42 -04:00
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