summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Moved ThemeProps migration to correctly take place in 3.2 -> 3.3 migration ↵Harrison Healey2016-09-211-16/+15
| | | | (#4054)
* PLT-4202 fix javascript error manage OAuth2 apps (#4039)enahum2016-09-204-9/+16
| | | | | | * PLT-4202 fix javascript error manage OAuth2 apps * Fix unit tests
* PLT-4179 send push notifications with override_username (#4040)enahum2016-09-201-1/+5
|
* PLT-3338 Show username on Direct message search result (#4041)enahum2016-09-202-2/+5
|
* PLT-4096 Fixed highlighting of hashtags in search (#4043)Harrison Healey2016-09-202-2/+165
| | | | | | * PLT-4096 Fixed highlighting of hashtags in search * Added unit tests for hashtag rendering on the client
* PLT-4239 fixes getUserMedia (#4038)enahum2016-09-203-8/+8
|
* Add a link to OAuth 2 docs in help texts (#4034)Jason Blais2016-09-194-8/+23
| | | | | | | | | | | | | | | | | | * 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
* PLT-4182 Fix incorrect listing for at-mention in comment (#4031)Yi EungJun2016-09-193-9/+32
| | | | | | | | | | * 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.
* Minor UI Improvements (#4033)Asaad Mahmood2016-09-192-3/+28
|
* Fix leaking goroutines in store calls (#3993). (#4021)Kyo Nguyen2016-09-1916-188/+191
|
* PLT-1764 #channels => !channels on Slack import. (#4028)George Goldberg2016-09-191-0/+19
|
* PLT-1759 - Auto-complete for !channels when posting messages. (#3890)George Goldberg2016-09-1911-9/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* Webrtc client side (#4026)enahum2016-09-1645-90/+4902
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
* Switch to right-hand sidebar statement instead of the acronym RHS nobody ↵William Gathoye2016-09-161-1/+1
| | | | knows about (#4008)
* Remove unneeded additional space detected by Pootle (#4007)William Gathoye2016-09-162-3/+3
|
* Fix messages id & Add necessary messages to en.json (#4027)Yusuke Nemoto2016-09-162-3/+5
|
* PLT-4157 CLI to make a user active or inactive (#4025)enahum2016-09-152-1/+66
|
* PLT-3455 More channels filter (#4022)enahum2016-09-155-68/+229
|
* PLT-3412 WebRTC Server side & System Console (#3706)enahum2016-09-1520-3/+592
| | | | | | | | | | * WebRTC Server side * WebRTC System Console * Consistency on variable names * Add turn and stun uri validation
* Fix 'use slash command' instead of 'user slash command' (#4023)TzeKei Lee2016-09-141-2/+2
|
* PLT-1238 on permalink not visible back button points to last channel or ↵enahum2016-09-142-4/+19
| | | | town-square (#4019)
* Merge branch 'release-3.4'Elias Nahum2016-09-141-1/+1
|\
| * Correcting doc on email address (#4013)it332016-09-121-1/+1
| |
* | Update getUser API and add it to the JS driver (#4020)Joram Wilander2016-09-144-9/+74
| |
* | PLT-4125 Prevent typing on settings that use the regenerate button (#4016)enahum2016-09-141-7/+1
| |
* | Modifying permissions system. (#3897)Christopher Speller2016-09-1345-602/+1099
| |
* | Highlight comment bar for comments considered mentions (#3938)Joram Wilander2016-09-137-36/+40
| |
* | PLT-3801 Fix toggle dropdown Main menu (#4014)enahum2016-09-132-16/+11
| |
* | PLT-4086 Mobile: ENTER creates a new line even with CTRL+ENTER off (#4015)enahum2016-09-131-1/+2
| |
* | PLT-4131 Dynamic update the Password requirements error message sample (#4017)enahum2016-09-131-4/+10
| |
* | Accept nil values for incoming webhook attachments (#4011)Joram Wilander2016-09-131-6/+3
| |
* | Add noscript message to root.html (fixes #3953) (#3968)Pierre Rudloff2016-09-121-0/+3
| |
* | Unescape HTML entities in e-mail titles (fixes #3906) (#3969)Pierre Rudloff2016-09-121-1/+2
| |
* | Some improvments to slack import (#4010)Christopher Speller2016-09-124-14/+63
| |
* | code block should be Code block as used in a menu IIRC (#4006)William Gathoye2016-09-121-1/+1
| | | | | | All translators have translated this string item using an uppercase letter.
* | Made search autocomplete for channels and users case insensitive (#3965)Harrison Healey2016-09-122-2/+2
| |
* | Team names in system console are sorted alphabetically regardless of case ↵Ryan Wang2016-09-121-2/+5
| | | | | | | | (#3958)
* | Let's be consistent with keyboard shortcuts. (#4005)William Gathoye2016-09-122-2/+2
| | | | | | | | | | | | * Let's be consistent with keyboard shortcuts. * Update en.json
* | Merge branch 'release-3.4' RC5Elias Nahum2016-09-0922-3722/+3763
|\|
| * Translations for RC5 (#4004)enahum2016-09-0917-3698/+3746
| |
| * Increasing channel limits (#4003)Corey Hulen2016-09-092-16/+1
| | | | | | | | | | | | * Increasing channel limits * Fixing unit test
| * PLT-4141 Validating SAML attributes (#4002)enahum2016-09-091-0/+4
| |
| * Correctly passed invite ID through to LDAP signup page (#4001)Harrison Healey2016-09-091-1/+1
| |
| * Fix team invite links when the invite ID is invalid (#3998)Joram Wilander2016-09-091-4/+12
| |
| * Fix weird typing behaviour on LDAP signup page on IE11 (#3996)Harrison Healey2016-09-091-4/+0
| |
* | Correctly passed invite ID through to LDAP signup page (#3997)Harrison Healey2016-09-091-1/+1
| |
* | Fixing OpenLDAP version in Makefile (#3999)Christopher Speller2016-09-081-1/+1
| |
* | Merge branch 'release-3.4' RC4Elias Nahum2016-09-0836-4111/+4349
|\|
| * daily translations 20160908 (#3994)enahum2016-09-0820-4056/+4278
| |
| * Stopped automatically focusing user list search box on mobile (#3992)Harrison Healey2016-09-081-1/+5
| |