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
3,455 Commits 845 Branches 1,202 Tags
429e25864b86b7b5976348860a302c2843687ef4
Commit Graph

412 Commits

Author SHA1 Message Date
Pat Lathem
8eb2c0266c Missing semicolon 2015-10-21 14:52:19 -05:00
Pat Lathem
9dd7a5e01e Remove stray emoticons.jsx import 2015-10-21 14:44:22 -05:00
Pat Lathem
7e24890bd3 Add a call to doFormatText inside of the markdown paragraph handler 2015-10-21 14:39:33 -05:00
Florian Orben
cd5df514c7 Add stop button to stop animated gifs 2015-10-21 18:13:59 +02:00
Florian Orben
d167e18f00 PLT-616: Enable playing of animated GIF in thumbnails and preview 2015-10-21 18:13:59 +02:00
=Corey Hulen
e1f9459029 Merge branch 'master' into PLT-44 2015-10-20 14:50:03 -07:00
=Corey Hulen
1fc12dd8ba Multi-session login 2015-10-20 14:49:42 -07:00
Joram Wilander
4ed9a9ebca Merge pull request #1100 from girishso/wink_emoji 
PLT-699: translate ;) to wink emoji
 2015-10-20 12:37:51 -04:00
=Corey Hulen
fa3a0df2b6 Adding multi-session cookie 2015-10-20 04:37:51 -07:00
Antti Ahti
d3f99e8217 Handle window resize events in React way 
Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling.

See http://facebook.github.io/react/tips/dom-event-listeners.html
 2015-10-20 10:07:45 +03:00
Joram Wilander
b5b233f3f0 Merge pull request #1114 from asaadmahmoodspin/ui-improvements 
Ui improvements
 2015-10-19 15:35:07 -04:00
=Corey Hulen
36658c13a4 Fixing merge conflicts 2015-10-19 11:42:40 -07:00
Harrison Healey
d139c9e825 Merge pull request #1108 from mattermost/plt-235 
PLT-235 Implement outgoing webhooks.
 2015-10-19 14:24:02 -04:00
Asaad Mahmood
5135986a3b Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-19 22:59:01 +05:00
Asaad Mahmood
2d42aefeaf Multiple UI Improvements 2015-10-19 22:58:47 +05:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
Corey Hulen
ea1b312968 Merge pull request #1072 from mattermost/plt-554 
PLT-554 Small refactor of websocket code on client and server
 2015-10-19 09:56:34 -07:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
Girish S
43b5f060c9 translate ;) to wink emoji 2015-10-18 09:33:47 +05:30
Joel Vasallo
6e350cb9b9 Updated Email Check Regex to RFC5322 Standard 2015-10-16 11:36:07 -05:00
=Corey Hulen
8b2d7f391a Fixing merge 2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3 Inital support for multi-tab loging 2015-10-16 09:10:54 -07:00
JoramWilander
20723437aa Fix typing socket constant 2015-10-16 11:48:55 -04:00
JoramWilander
2b5ec4a3c0 Small refactor of websocket code on client and server 2015-10-16 11:48:55 -04:00
Christopher Speller
89716cb046 Merge pull request #1054 from stasvovk/PLT-637 
PLT-638: added display tab under account settings. added 24h time option
 2015-10-16 08:22:37 -04:00
Christopher Speller
099d853877 Merge pull request #1079 from hmhealey/initprefs 
Added an initial call to get all user preferences on page load
 2015-10-16 08:16:40 -04:00
Stas Vovk
79fcb98084 Merge remote-tracking branch 'upstream/master' into PLT-637 
Conflicts:
	web/react/utils/constants.jsx
 2015-10-16 14:21:51 +03:00
Florian Orben
551b07960e PLT-74: Enable Up Arrow keyboard shortcut to edit your last message 2015-10-15 21:25:31 +02:00
hmhealey
327b0b5a21 Added an initial call to get all user preferences on page load 2015-10-15 15:17:07 -04:00
Asaad Mahmood
95aaa0a080 Multiple UI Improvements 2015-10-15 22:54:15 +05:00
Christopher Speller
f09685a373 Merge pull request #1057 from hmhealey/plt520 
PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
 2015-10-15 13:34:42 -04:00
Stas Vovk
440faabc60 fixed style guide error 2015-10-15 00:06:51 +03:00
hmhealey
ae0d4dce7b Updated More Direct Channels modal and converted it to ReactBootstrap 2015-10-14 16:57:08 -04:00
Florian Orben
b8c80c6d95 Don't auto-add http:// to mailto: and ftp: markdown links 2015-10-14 21:44:09 +02:00
Stas Vovk
76e278a13d added display tab under account settings. added 24h time option 2015-10-14 20:36:12 +03:00
Asaad Mahmood
99f243b444 Multiple UI Improvements 2015-10-14 17:04:13 +05:00
Harrison Healey
56b02f2eba Merge pull request #968 from hmhealey/plt322 
PLT-322 Updated Direct Messages menu
 2015-10-13 18:23:53 -04:00
hmhealey
17d37816d4 Revert "Modified markdown lexer to not break up words written in snake_case" 
This reverts commit 787d2ef7bc.
 2015-10-13 14:36:58 -04:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
Joram Wilander
f641f83ff9 Merge pull request #1026 from asaadmahmoodspin/master 
Fixing code block markdown
 2015-10-13 10:11:03 -04:00
hmhealey
097d236f43 Fixed edge cases with leaving a direct channel while viewing that channel 2015-10-13 09:42:26 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
ed31538893 Changed direct messages channels so users can show/hide them 2015-10-13 09:42:24 -04:00
hmhealey
7d03c24b44 Changed direct channels in the sidebar to be displayed based on user preferences 2015-10-13 09:42:24 -04:00
Joram Wilander
e67043f4f4 Merge pull request #987 from hmhealey/plt521 
PLT-521 Modified markdown lexer to not break up words written in snake_case
 2015-10-13 08:43:57 -04:00
Asaad Mahmood
527e99f8d2 Fixing code block markdown 2015-10-13 14:33:37 +05:00
Asaad Mahmood
fd4bfee6ea Multiple UI Improvements 2015-10-12 19:22:05 +05:00
hmhealey
787d2ef7bc Modified markdown lexer to not break up words written in snake_case 2015-10-09 16:30:57 -04:00
hmhealey
3c489518e6 Fixed html used for autolinking 2015-10-08 15:59:21 -04:00
Harrison Healey
7dde0211c5 Merge pull request #982 from hmhealey/plt547 
PLT-547 Changed emoticons so that they must be surrounded by whitespace
 2015-10-08 13:19:39 -04:00