IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,984 Commits 845 Branches 1,202 Tags
18808faead1b7bcdf27dab06e2ffcda1f0680979
Commit Graph

6984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
enahum
18808faead PLT-3994 Fix OAuth2: Properly handle allowing an app fails (#3888) 
* PLT-3994 Fix OAuth2: Properly handle allowing an app fails

* Remove Content-Type from allowOAuth
 2016-08-30 13:40:30 -04:00
enahum
6c8746dbdc PLT-4026 Use client dir constant for OAuth Authorization page (#3895) 2016-08-30 09:00:50 -08:00
Yang Chen
77656aea7f Update en.json (#3907) 
Fixed grammar for e-mail notfication changing sign-in method
 2016-08-30 08:56:17 -08:00
Asaad Mahmood
b847ed1875 PLT-3973 - Fixing batched emails for mobile (#3896) 2016-08-30 08:49:19 -03:00
enahum
3731cc5b67 PLT-4008 go directly to the account creation page when 1 signup method enabled (#3894) 2016-08-30 07:48:00 -04:00
Asaad Mahmood
968df8c186 PLT-3916 - Fixing flag icon position in the RHS (#3898) 2016-08-30 07:47:41 -04:00
Asaad Mahmood
85f8b90aeb Minor UI improvements (#3904) 
* PLT-3917 - Adding cross icon to remove deleted post in the RHS.

* PLT-3997 - Improving the integration confirmation screen
 2016-08-30 07:42:51 -04:00
George Goldberg
f6c183e749 PLT-3980 sort custom emoji alphabetically by id. (#3893) 
This sorts the emoji based on their id in the custom emoji list.
 2016-08-29 11:03:11 -04:00
Joram Wilander
a76db5b84f PLT-2074 Refactor desktop notification settings UI and add setting for duration (#3883) 
* Refactor desktop notification settings UI and add setting for duration

* Update en.json

* Update desktop_notification_settings.jsx
 2016-08-29 09:52:59 -04:00
David Lu
d252e61c66 Revert/Fix PLT-2805 (#3873) 2016-08-29 09:51:29 -04:00
Harrison Healey
167dd22eef PLT-1752/PLT-3567/PLT-3998 Highlighting links in search, unit tests for autolinking (#3865) 
* Added highlighting to links when their URL includes the search term

* Decoupling UserStore from react-router to allow for unit tests involving it

* PLT-3998 Added SiteURL as an option to be passed into the text formatting code

* Removed reference to PreferenceStore and window from TextFormatting

* Refactored TextFormatting to remove remaining browser-only code

* Updated ChannelHeader and MessageWrapper to match the changes to TextFormatting

* Increased max listeners for Preference and Emoji stores

* PLT-3832 Added automated unit tests for autolinking

* PLT-3567 Rerender posts when mention keywords change

* Updated RHS and search to match the changes to TextFormatting

* Broke TextFormatting's dependency on the UserStore
 2016-08-29 09:50:00 -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
it33
00e12f25c6 Removing out-of-date trademark protection 2016-08-27 07:43:42 -07:00
Corey Hulen
11270262a4 Moving CheckBrowserCompatability to debug (#3889) 2016-08-26 18:24:56 -03:00
Asaad Mahmood
c2eac2b5dc PLT-4010 - Updating integration icons (#3885) 2016-08-26 12:33:37 -04:00
Ryan Wang
dfaccff44b Sorted teams by alphabetical order under System Console > Teams (#3868) 2016-08-25 10:45:24 -04:00
Corey Hulen
b49a019cec PLT-4004 fixing javascript error when switching teams (#3877) 2016-08-25 08:56:16 -04:00
Corey Hulen
839f1ad444 Fixing license (#3878) 
* Fixing sanitize license

* Fixing license

* Fixing unit tests
 2016-08-25 08:32:44 -04:00
Corey Hulen
c3ae3f20f5 PLT-3695 refactoring to use sql_upgrader (#3788) 
* PLT-3695 unitying upgrade support

* PLT-3695 refactoring to use sql_upgrader

* Fixing unit test

* Adding 3.3 to 3.4

* Fixing upgrading

* Seperating DB schema from version.go

* Fixing upgrade cmd

* Moving to const for exit codes

* remving old unused code
 2016-08-24 16:17:40 -08:00
Harrison Healey
8efa4dc9a5 Fixed number in title not appearing for direct messages (#3875) 2016-08-24 16:13:26 -08:00
enahum
7bd26b1927 Add missing directProfiles updates on real-time user updates (#3876) 2016-08-24 20:48:40 -03:00
enahum
e6d15f77e8 PLT-3942 Add real-time updates for center channel profile picture popover (#3871) 
* PLT-3942 Add real-time updates for center channel profile picture pop-over

* Send user data with the websocket event to prevent further requests

* Add helper for profile sanitation
 2016-08-24 18:10:49 -03:00
Sang Jun Lee
deb1361a0d Add channel name on email notification. (#3824) 2016-08-24 08:54:58 -08:00
Ryan Wang
ec44df1b48 Trimmed beginning slash from command trigger word (#3866) 2016-08-24 12:55:01 -03:00
Myeonghyeon-Lee
23815a696c fix for team.display_name instead of team.name (#3827) 2016-08-24 11:05:39 -04:00
Joram Wilander
03fd4bc4e6 Temporarily add response body logging for access token request to help debugging (#3872) 2016-08-24 10:16:57 -04:00
enahum
308ef81696 daily translations 20160823 (#3864) 2016-08-23 20:03:08 -03:00
lfbrock
44d2a19848 Update test-attachments.md (#3862) 2016-08-23 14:43:13 -08:00
enahum
9ab5a79962 PLT-3745 - Deauthorize OAuth Apps (#3852) 
* Deauthorize OAuth APIs

* Deautorize OAuth Apps Account Settings

* Fix typo in client method

* Fix issues found by PM

* Show help text only when there is at least one authorized app
 2016-08-23 18:06:17 -04:00
enahum
e406a92fbb Remove reference to config.json settings in strings (#3863) 2016-08-23 18:21:25 -03:00
Joram Wilander
065d01c121 Add notification settings to control what statuses allow push notifications (#3829) 2016-08-23 08:47:25 -04:00
David Lu
c93ce7af3f fixed signup (#3858) 2016-08-22 22:34:45 -08:00
enahum
4780724ead Fix load config panic errors to display message instead of id (#3855) 2016-08-22 16:39:39 -08:00
enahum
a8dcadb1f3 PLT-3597 Fix select team message when user leaves a team (#3854) 2016-08-22 16:39:17 -08:00
Corey Hulen
e1fdc63f28 PLT-3593 fixing issue of removing from team DM list (#3857) 2016-08-22 20:39:05 -04:00
David Lu
05f8d138f4 PLT-3897 Fixed ALT+UP/DOWN crashing browser (#3848) 
* Fixed ALT+UP/DOWN crashing browser

* changed order of return
 2016-08-22 16:36:23 -08:00
Joram Wilander
80d83ae77c Prevent flagging of deleted posts and don't show deleted posts in flagged post list (#3846) 2016-08-22 16:36:01 -08:00
Joram Wilander
c3c62ad2ad PLT-3982 Add statuses to profile pictures in the RHS and popover member list (#3845) 
* Added status indicator back to popover member list

* Updating positions of status indicator (#3844)

* Fixed squishy profile pictures and added statuses to RHS pics
 2016-08-22 16:35:28 -08:00
Harrison Healey
f0c672e3ad Changed /teams/all api to only return teams the current user is a member of if they're not an admin (#3853) 2016-08-22 21:08:09 -03:00
Harrison Healey
3c50442d04 PLT-3841/PLT-3883 Fixed detection of local storage, persist system console team list after logout (#3849) 
* PLT-3841 Fixed check to see if local/session storage is available

* PLT-3883 Saved selected teams in the admin console across a logout

* Clarified the code that checks if local storage is available
 2016-08-22 21:07:37 -03:00
David Lu
ca351b617f PLT-2951 Improved signup process (#3771) 2016-08-22 15:33:01 -04:00
Joram Wilander
391d685aa4 Reset context error for incoming webhooks after checking permission (#3847) 2016-08-22 15:19:39 -04:00
David Lu
ecb6fd8769 Split /shortcuts programmatically (#3850) 2016-08-22 15:19:29 -04:00
paranbaram
ffff24e625 Change en.json : PLT-3371 (#3825) 
* Change en.json : PLT-3371

* Change jsx files for UI text

* Change jsx files for UI text
 2016-08-22 14:16:38 -04:00
joonsun-baek
ec5f9d7889 PLT-3742 Changed emoticon pattern. (:D > grinning to smile) (#3817) 2016-08-22 14:14:43 -04:00
shieldsjared
b2a0fb066b PLT-3941 Updated the RHS menu logic for recent mentions to match the channel header, such that (at)all and (at)channel is removed from the search if the user has this included in their notification settings (#3842) 2016-08-22 13:11:37 -04:00
Ryan Wang
e8de443e17 Slash command in uppercase shows autocomplete (#3840) 2016-08-22 10:14:29 -04:00
Asaad Mahmood
06cf7c34a3 PLT-3981 - Fixing perfect scrollbar hover (#3839) 2016-08-22 10:10:34 -04:00
Corey Hulen
c7150c4c80 Fixing 404 errors (#3838) 2016-08-22 10:06:35 -04:00
Ryan Wang
efef3e8ee2 Ctrl+Enter sends messages in mobile view (#3833) 2016-08-19 12:52:48 -04:00