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
2,479 Commits 845 Branches 1,202 Tags
e6697a447ea95c47abcced13144d8d062afce0bb
Commit Graph

973 Commits

Author SHA1 Message Date
Christopher Speller
e6697a447e Hiding export from UI 2015-09-24 12:12:12 -04:00
Joram Wilander
6c0d094d13 Merge pull request #780 from hmhealey/plt258 
PLT-258 Added help text to notification settings to say which browsers support them
 2015-09-24 12:01:50 -04:00
Joram Wilander
ff03c53c46 Merge pull request #781 from hmhealey/plt332 
PLT-332 Improved date tooltips
 2015-09-24 12:01:22 -04:00
Corey Hulen
819ef528b8 Merge pull request #779 from mattermost/plt-294 
PLT-294 Converting preview image modal to use react-bootstrap.
 2015-09-24 08:59:00 -07:00
hmhealey
44e00a4f9c Changed format of date tooltips 2015-09-24 11:36:32 -04:00
hmhealey
32feec5b66 Removed timestamp tooltips from posts in the RHS 2015-09-24 11:25:36 -04:00
Christopher Speller
c5d78f828a Converting preview image modal to use react-bootstrap. Fixes issue where modal would appear behind background on iOS 2015-09-24 10:58:56 -04:00
hmhealey
a59f8def8c Added help text to notification settings to say which browsers support them 2015-09-24 10:58:49 -04:00
JoramWilander
21a1eaa189 Fixes backspace navigating back a page. 2015-09-24 10:13:14 -04:00
Harrison Healey
4f371254c6 Merge pull request #771 from rgarmsen2295/plt-143 
PLT-143 Support for text drag and drop
 2015-09-24 09:17:59 -04:00
Harrison Healey
90d1f4c6a1 Merge pull request #776 from mishimi/patch-5 
PLT-388 Added warning that @mentions from Slack are not imported
 2015-09-24 09:09:53 -04:00
mishimi
59afe8bdf8 PLT-388 
Warning users that  @mentions from Slack are currently not supported after import
 2015-09-24 04:07:49 -07:00
Reed Garmsen
ef8705ab6b Text cursor now focuses on the textbox after performing a drag and drop of some text 2015-09-23 15:41:26 -07:00
=Corey Hulen
985aebf861 Fixing state setting 2015-09-23 15:16:48 -07:00
Reed Garmsen
03eece597d Added support to drag and drop text into the main textbox or RHS textbox 2015-09-23 15:01:02 -07:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
=Corey Hulen
ccf2e6e4e7 Changing image settings to file settings 2015-09-23 13:47:10 -07:00
Reed Garmsen
ea0dcb4421 Small fix for react key warning 2015-09-23 13:36:41 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07:00
JoramWilander
e79e66c0a4 Fix theme images 404ing. 2015-09-23 15:29:39 -04:00
Harrison Healey
bff0956ba5 Merge pull request #761 from mattermost/plt-356 
PLT-356 Fix post not rendering properly in some cases.
 2015-09-23 15:04:45 -04:00
Harrison Healey
15f15de8ca Merge pull request #759 from mattermost/plt-242-3 
PLT-242 Implement custom UI theme colors.
 2015-09-23 15:04:22 -04:00
JoramWilander
845229d983 Fix post not rendering properly in some cases. 2015-09-23 12:25:01 -04:00
Chengwei Yang
f7a32fa38a PLT-126: Change 'Private Messages' to 'Direct Messages' 
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
 2015-09-23 22:43:14 +08:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
Joram Wilander
7eef5be359 Merge pull request #740 from asaadmahmoodspin/ui-improvements 
UI Modifications for multiple tickets
 2015-09-23 08:41:17 -04:00
Joram Wilander
f2c0db000c Merge pull request #756 from rgarmsen2295/plt-165 
PLT-165 Prevents users from signing up via a public link using a non-valid email address
 2015-09-23 08:40:11 -04:00
Joram Wilander
e637927a0b Merge pull request #757 from chengweiv5/PLT-168 
PLT-168: check email used to reset password strictly
 2015-09-23 08:39:31 -04:00
Christopher Speller
d3c09f209b Merge pull request #755 from rgarmsen2295/plt-164 
PLT-164 Post drafts containing only files are now recognized properly
 2015-09-23 08:30:42 -04:00
Christopher Speller
bdd0cfd227 Merge pull request #751 from hmhealey/plt344 
PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
 2015-09-23 08:27:12 -04:00
Christopher Speller
fc104242f4 Merge pull request #748 from hmhealey/plt233 
PLT-233 Removed click handler from RHS [...] menu
 2015-09-23 08:22:41 -04:00
Christopher Speller
772a4337c6 Merge pull request #739 from rgarmsen2295/plt-39 
PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
 2015-09-23 08:19:45 -04:00
Chengwei Yang
284b3bb64c PLT-168: check email used to reset password strictly 
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
 2015-09-23 17:53:51 +08:00
Reed Garmsen
3ab7d3e24d Adds a check for email validity client-side when joining a team using a public link 2015-09-22 16:38:46 -07:00
Reed Garmsen
2270a2bb45 Functionalized draft checking 2015-09-22 16:07:07 -07:00
Reed Garmsen
bb557b30d7 Post drafts are now displayed when they contain only files and no text 2015-09-22 15:37:37 -07:00
Reed Garmsen
f1700e765b Small change to remove react warning 2015-09-22 14:25:26 -07:00
=Corey Hulen
9e04909c0a Adding new EnableIncomingWebhooks property to service settings in the admin console. 2015-09-22 13:28:03 -07:00
=Corey Hulen
6e60768abe Fixing merge conflict 2015-09-22 13:18:42 -07:00
Joram Wilander
ac7918c554 Merge pull request #715 from mattermost/plt-27 
PLT-27 Implement incoming webhooks.
 2015-09-22 15:47:57 -04:00
=Corey Hulen
e22e7b8b7b Fixing bug in generating key length 2015-09-22 12:31:01 -07:00
=Corey Hulen
fc71869a96 Merge branch 'master' into PLT-11-email 2015-09-22 12:24:39 -07:00
=Corey Hulen
88e5a71e8c Adding service settings to admin console 2015-09-22 12:12:50 -07:00
hmhealey
ffe34aa154 Restored changes which remove emojify and switch to our own version 2015-09-22 13:53:43 -04:00
hmhealey
09e8874b8e Removed click handler from RHS [...] menu 2015-09-22 13:27:10 -04:00
Christopher Speller
e7d408585a Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify" 2015-09-22 13:21:58 -04:00
Asaad Mahmood
302372cfa0 Removing click event for channel description popover 2015-09-22 21:01:55 +05:00
Harrison Healey
f439c82d7c Merge pull request #737 from hmhealey/plt289 
PLT-289 Added parsing for named emojis to TextFormatting and removed emojify
 2015-09-22 09:32:25 -04:00
hmhealey
251d33ad23 Added parsing for named emojis to TextFormatting and removed dependency on emojify 2015-09-22 09:22:49 -04:00