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

7129 Коммитов

Автор SHA1 Сообщение Дата
enahum
caeadde2f2 PLT-4155 Show correct login method in system console (#4102)
* PLT-4155 Show correct login method in system console

* Remove checking for system admin privileges in getProfiles
2016-09-28 08:49:54 -04:00
enahum
45ca052482 PLT-4298 Remove "Return to ongoing call" (#4101) 2016-09-28 08:48:19 -04:00
Joram Wilander
5288255ca3 Fix missing confirm password error on LDAP claim page (#4099) 2016-09-28 08:47:27 -04:00
Joram Wilander
e5cf22bc98 Show create account link for office365, ldap and saml (#4098) 2016-09-28 08:46:59 -04:00
Joram Wilander
b640114edd Check if user logged in before making setActiveChannel request (#4097) 2016-09-28 08:43:22 -04:00
enahum
60347559c7 PLT-3734 Cleaning up shouldSendEvent function (#4024)
* PLT-3734 Cleaning up shouldSendEvent function

* Fix LHS unread highlight and jewel mentions
2016-09-27 10:19:50 -04:00
Corey Hulen
bfca752940 Fixing the console level debug statements (#4092) 2016-09-27 11:07:32 -03:00
Christopher Speller
667db6e10c Cleaning up some old code from the permissions system change (#4090) 2016-09-26 13:41:50 -04:00
Christopher Speller
7fcc004beb Modifications to rate limiting settings. (#4091) 2016-09-26 09:56:12 -07:00
Asaad Mahmood
dff985a924 Multiple UI Improvements (#4069)
Minor contast fix for file uploading text.

Updating icon markup

Fixing icon for mentions

Removing irrelevant characters

Updating closing tag for mentions icon
2016-09-26 11:21:37 -04:00
David Lu
b39d903f63 changed user diagnostic naming (#4086) 2016-09-26 10:55:29 -04:00
Ryan Wang
1479c4a2ca Message is displayed when user joins Off_Topic (#4067) 2016-09-26 07:47:17 -04:00
Arif Usman
6a59913609 Removed duplicate code (#4082) 2016-09-26 07:45:46 -04:00
Christopher Speller
93f2b6a833 Updating ESLint (#4085) 2016-09-23 12:29:54 -04:00
Christopher Speller
214f9c13a2 Updating client dependancies (#4083) 2016-09-23 10:22:35 -04:00
George Goldberg
90f113dcda Add Slack Import functionality to CLI. (#4080)
* Add Slack Import functionality to CLI.

* Remove pointless line.
2016-09-23 10:22:28 -04:00
Christopher Speller
2ca0e8f9a0 Updating golang dependancies (#4075) 2016-09-23 10:17:51 -04:00
Christopher Speller
6d62d65b2d Fixing build failure caused by dependancies updating (#4076) 2016-09-22 17:26:28 -04:00
Joram Wilander
353761b917 Fix TestSetActiveChannel unit test (#4071) 2016-09-22 16:59:33 -04:00
Christopher Speller
efdb0dfa0b Fixing update roles API (#4060) 2016-09-22 08:31: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
Corey Hulen
185387e277 Fixing build break (#4063) 2016-09-21 10:36:38 -07:00
Corey Hulen
1b7e12caa5 Fixing make file so you can build linx on mac easily (#4058) 2016-09-21 07:59:11 -04:00
David Lu
f7297d5a31 Fixed ALT+SHIFT+UP breaking ALT+UP (#4042) 2016-09-21 07:18:28 -04:00
Corey Hulen
fc5df5c435 Fix issue when saving session has an error (#4053)
* Fix issue is saving session has an error

* Fixing break break
2016-09-21 07:17:58 -04:00
Christopher Speller
3ecbfd9716 Adding removal of all sessions to upgrade. Commented out untill release. (#4047) 2016-09-21 07:16:49 -04:00
Harrison Healey
1c1f06def9 Moved ThemeProps migration to correctly take place in 3.2 -> 3.3 migration (#4054) 2016-09-21 07:16:40 -04:00
enahum
33e20b874e PLT-4202 fix javascript error manage OAuth2 apps (#4039)
* PLT-4202 fix javascript error manage OAuth2 apps

* Fix unit tests
2016-09-20 12:02:08 -04:00
enahum
4e3d465210 PLT-4179 send push notifications with override_username (#4040) 2016-09-20 12:01:12 -04:00
enahum
f8108efe35 PLT-3338 Show username on Direct message search result (#4041) 2016-09-20 12:00:21 -04:00
Harrison Healey
e455bee39f PLT-4096 Fixed highlighting of hashtags in search (#4043)
* PLT-4096 Fixed highlighting of hashtags in search

* Added unit tests for hashtag rendering on the client
2016-09-20 11:59:42 -04:00
enahum
b072fdb23f PLT-4239 fixes getUserMedia (#4038) 2016-09-20 11:58:39 -04:00
Jason Blais
0157e613bd Add a link to OAuth 2 docs in help texts (#4034)
* Update installed_oauth_apps.jsx

* Update custom_integrations_settings.jsx

* Update confirm_integration.jsx

* Update installed_oauth_apps.jsx

* Update en.json

* Change FormattedMessage to FormattedHTMLMessage

* Fix proper coding of links in en.json

* Update en.json
2016-09-19 21:00:07 -07:00
Yi EungJun
bb69e98631 PLT-4182 Fix incorrect listing for at-mention in comment (#4031)
* Add missing eol

* PLT-4182 Fix incorrect listing for at-mention in comment

Suggestion box for at-mention listed users for the center channel even
if the current textbox is for reply for a post which belongs to a
different channel.
2016-09-19 17:41:19 -04:00
Asaad Mahmood
80b2ce9c3f Minor UI Improvements (#4033) 2016-09-19 09:40:38 -03:00
Kyo Nguyen
2ca751febf Fix leaking goroutines in store calls (#3993). (#4021) 2016-09-19 08:30:41 -04:00
George Goldberg
33eda94db3 PLT-1764 #channels => !channels on Slack import. (#4028) 2016-09-19 08:22:08 -04:00
George Goldberg
8443ca5828 PLT-1759 - Auto-complete for !channels when posting messages. (#3890)
* Auto-complete for !channels when posting messages.

This is part 1 of the fix for PLT-1759 to make channels linkable.

Still to do:
- Make the !channels clickable when they appear in messages. This is
  blocked until PR #3865 is resolved as it looks like that refactors
  some of the code that would be touched by making this change.

- Unit tests. Again, I think the above referenced PR should be merged
  before tackling this.

* Fix style problems.

* Highlighting of !channel-names in messages.

This only identifies the !channel-name (not the display name). The
implementation of the auto-complete on channel names now needs to be
modified to convert to the channel handle before sending the message.

* Display !channel-name as !Display Name.

When we encounter !channel-name in a message, display it as a link using
the channel's actual name rather than it's handle (name).

* Match on names and display name, and use name.

* Autocomplete channels matching on both the name and the the display
  name.
* Use the name as the text we fill in instead of the display name. It's
  potentially a bit ugly, but it minimises complexity for now as
  otherwise we'd have to do complicated things to the message box.

* Fix style issues.

* Load more channels everywhere.

Whenever we load the list of channels, we should also load the list of
more channels. This is to enable auto-completing and auto-linking of all
channels whether or not the user is in them currently.

* Include more channels in the map for linking.

* Listen for channel list updates for autolinking.

* Remove accidental console.log.

* Autocomplete on more channels too.

* i18n for channel autocomplete.

* Link directly to channels in !channel mentions.

This currently does not work if you aren't a member of that channel.
Need to decide what the correct behaviour is in that case.

* Fix style issues.

* Show channel name and handle in suggestion.

* Match channels only at start or after space.

* Better matching in text-formatting.

Only match channels after a space-type character or at the start in the
posts list too.

* Move the route construction to make tests work.

Moves route-construction out of text_formatting.jsx and into utils.jsx
so that the unit tests work once again.
2016-09-19 08:21:22 -04:00
enahum
781ff323db Webrtc client side (#4026)
* WebRTC Server side

* WebRTC client side

* Bug fixes and improvements

* Pushing UI improvements for webrtc (#3728)

* Pushing UI improvements for webrtc

* Updating webrtc css

* PLT-3943 WebRTC P1: bug fixes and improvements

* Video resolution set to std, reduce volume of ringtone and flip video horizontally

* Fix calling a user B while WebRTC RHS is still opened

* Leave RHS opened when call ends, Fix isBusy on popover and channel_header

* Fix pre-release feature, RHS & System Console

* PLT-3945 - Updating UI for webrtc (#3908)

* PLT-3943 Webrtc p1

* Add ongoing call indicator when RHS is opened

* UI updates to to webrtc notifcation (#3959)
2016-09-16 15:35:13 -03:00
William Gathoye
df2d61d941 Switch to right-hand sidebar statement instead of the acronym RHS nobody knows about (#4008) 2016-09-16 09:18:56 -03:00
William Gathoye
62c7eac16a Remove unneeded additional space detected by Pootle (#4007) 2016-09-16 09:18:24 -03:00
Yusuke Nemoto
ff65e5ede5 Fix messages id & Add necessary messages to en.json (#4027) 2016-09-16 07:53:42 -04:00
enahum
9d40538106 PLT-4157 CLI to make a user active or inactive (#4025) 2016-09-15 11:33:16 -04:00
enahum
2659d19d05 PLT-3455 More channels filter (#4022) 2016-09-15 08:53:21 -04:00
enahum
b180bb46e3 PLT-3412 WebRTC Server side & System Console (#3706)
* WebRTC Server side

* WebRTC System Console

* Consistency on variable names

* Add turn and stun uri validation
2016-09-15 08:35:44 -04:00
TzeKei Lee
3b4c9d7588 Fix 'use slash command' instead of 'user slash command' (#4023) 2016-09-14 14:16:51 -07:00
enahum
ecd433d697 PLT-1238 on permalink not visible back button points to last channel or town-square (#4019) 2016-09-14 12:16:29 -03:00
Elias Nahum
6c678f5407 Merge branch 'release-3.4' 2016-09-14 11:06:59 -03:00
Joram Wilander
837808eba3 Update getUser API and add it to the JS driver (#4020) 2016-09-14 09:57:33 -03:00
enahum
abe6e8e471 PLT-4125 Prevent typing on settings that use the regenerate button (#4016) 2016-09-14 08:28:50 -04:00