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
7,021 Commits 845 Branches 1,202 Tags
c201ef17754e66ce16bc12d243baf57fb1b6d8d4
Commit Graph

7021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joram Wilander
c201ef1775 Add statuses to profiles pictures and remove from header in DMs (#3940) 2016-09-06 09:56:46 -04:00
Jason Blais
a44a5aadf1 Change "Native Apps" to "Mattermost Apps" for consistency (#3957) 
Change "Native Apps" to "Mattermost Apps" for consistency
 2016-09-06 09:45:53 -03:00
Joram Wilander
dda0ea3552 PLT-3875 Update error page to use Markdown and add error for missing OAuth code (#3934) 
* Update error page to use Markdown and add error for missing OAuth code

* Add line breaks to error messages 

This is to make the error message easier to read.

* Update en.json
 2016-09-06 08:29:14 -04:00
CyberShambles
a3ea884419 PLT-4042 Moved {createSetHeaderButton(channel)} order (#3935) 
* Moved {createSetHeaderButton(channel)} order

* Update channel_intro_messages.jsx
 2016-09-06 08:27:38 -04:00
Eric Sethna
ec27e96a87 Reply notifications text (#3942) 
* Update user_settings_notifications.jsx

* Update en.json
 2016-09-06 08:23:39 -04:00
enahum
5ffe27de8d PLT-4027 "Added to the channel" system messages mark the channel as Unread (#3947) 2016-09-06 08:23:11 -04:00
enahum
6e0c3605fb PLT-4025 "CTRL+ENTER" option isn't honoured on the edit dialog after a refresh (#3948) 2016-09-06 08:22:47 -04:00
enahum
37068bfdc0 PLT-3880 Dynamic Password Min Length help text (#3949) 2016-09-06 08:21:45 -04:00
enahum
886ab34443 PLT-4005 Generates default Salts if empty in the config file (#3950) 2016-09-06 08:21:18 -04:00
enahum
4bd5935bd8 PLT-4041 Make SAML FirstName and LastName optional (#3951) 2016-09-06 08:19:58 -04:00
Joram Wilander
9d11dd437f Send hello event containing server version on WebSocket connect (#3936) 2016-09-04 20:45:34 -03:00
Girish Ramakrishnan
6c085594e4 mail: allow PLAIN auth over non-tls connections (#3900) 
This allows mattermost to use a non-tls connection with a SMTP server that
supports PLAIN auth (but not LOGIN). The go library explicitly allows PLAIN
auth over non-tls connections - https://golang.org/src/net/smtp/auth.go#L55

Fixes #2929
 2016-09-02 14:33:26 -04:00
Joram Wilander
f32eb525f3 Do not send push notifications for channels being actively viewed (#3931) 2016-09-02 12:50:15 -04:00
Christopher Speller
eb0111f6bb Fixing SanitizeProfile (#3930) 2016-09-02 08:24:20 -08:00
Eric Sethna
717e8197ff Label and help text change to icon and username override (#3932) 
* Update custom_integrations_settings.jsx

* Update en.json

* Update custom_integrations_settings.jsx
 2016-09-02 11:29:06 -04:00
enahum
7533062f6c PLT-3918 Turn off replies for System Messages (#3922) 2016-09-02 11:23:51 -04:00
enahum
385c644988 PLT-4035 Prevent request to getAuthorizedApps when OAuth provider is disabled (#3921) 2016-09-02 11:23:26 -04:00
enahum
438ff8f8bc PLT-4036 Fix disable button on LDAP sign up page (#3920) 2016-09-02 11:22:47 -04:00
Joram Wilander
effd084023 Show loading icon until first page of posts is loaded on channel switch (#3918) 2016-09-02 11:21:10 -04:00
enahum
ae46819b8e Update LastViewAt in create post API if not from a webhook (#3913) 2016-09-02 11:19:42 -04:00
Christopher Speller
5d7f239962 Adding LDAP test connection button. Reordering LDAP settings. (#3912) 2016-09-01 17:05:20 -04:00
Joram Wilander
949e57076a Fix status table upgrade (#3933) 2016-09-01 16:01:58 -04:00
Jason Blais
2b14e422aa Fixes incorrect help text on OAuth 2.0 confirmation dialog (#3926) 
* Update confirm_integration.jsx

* Update en.json
 2016-09-01 12:56:17 -04:00
Christopher Speller
276e0189b1 Making LDAP FirstName and LastName fields optional. (#3919) 2016-09-01 10:03:55 -04:00
Corey Hulen
e1e29a86d9 removing email from error (#3923) 
* removing email from error

* removing email from error
 2016-09-01 10:02:54 -04:00
lfbrock
fb39fe6f9a Update NOTICE.txt (#3927) 
* Update NOTICE.txt

* Update NOTICE.txt
 2016-09-01 10:02:44 -04:00
Eric Sethna
38b25a8784 Update Push and Email Notifications Text (#3924) 
* Update user_settings_notifications.jsx

* Update user_settings_notifications.jsx

* Update email_notification_setting.jsx

* Update en.json

* Update user_settings_notifications.jsx
 2016-09-01 10:02:35 -04:00
Joram Wilander
26f96b240d PLT-3462 Add the ability to clear push notifications after channel is viewed (#3834) 
* Add the ability to clear push notifications after channel is viewed

* Fix race condition between updating the mention count and reading it when sending push notifications
 2016-08-31 12:52:14 -04:00
Joram Wilander
b0b39ce71c Add debug logging when receiving an oauth redirect (#3916) 2016-08-31 10:56:31 -03:00
Dmitri Aizenberg
dc09b7781a PLT-1527 Add a slash command to set yourself away (#3752) 
* added handlers for slash commands

* added manual status persistance

* added tests

* removed extra debug output and comments

* rebase - fixing the PR

* making echo messages after slash commands ephemeral
 2016-08-31 09:24:14 -04:00
enahum
db660bdf9c PLT-4007 Fix OAuth: Javascript error when team admin accesses the OAuth 2.0 menu (#3887) 2016-08-30 22:05:23 -04:00
enahum
1326ab66a1 PLT-3984 Add the ability to regenerate OAuth Client Secret (#3899) 2016-08-30 21:15:40 -03:00
Eric Sethna
e9bc77a8f7 Update text in Account Settings > Notification (#3901) 
* Comment thread notification text

* Update user_settings_notifications.jsx

* Update user_settings_notifications.jsx

* Update en.json

* Update email_notification_setting.jsx

* Update en.json

* Update user_settings_notifications.jsx

* Update user_settings_notifications.jsx

* Update user_settings_notifications.jsx

* Update user_settings_notifications.jsx
 2016-08-30 19:41:37 -04:00
Joram Wilander
60a0db7f6a Disable PDFJS worker (#3910) 2016-08-30 19:56:02 -03:00
Joram Wilander
58242905d6 Fix scrollHeight console error when logging out of iOS app (#3909) 2016-08-30 19:55:29 -03:00
Joram Wilander
3e14e8b5ab Remove getPosts request after deleting a post (#3905) 2016-08-30 19:54:48 -03:00
lfbrock
391926e9a7 Update spelling (#3911) 
* Update login_controller.jsx

* Update en.json
 2016-08-30 14:14:43 -04:00
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