Commit Graph

397 Commits

Author SHA1 Message Date
Florian Orben
bced07a7f4 add helper method to initiate a direct channel chat 2015-10-26 23:30:00 +01:00
Joram Wilander
b826d09480 Merge pull request #1189 from mattermost/plt-762
PLT-762 Fix error message on leaving channel
2015-10-26 15:01:18 -04:00
Florian Orben
46042d995b PLT-703: Support multiple users being shown as typing underneath input boxes. 2015-10-26 17:46:56 +01:00
JoramWilander
fda62fbbf5 Fix error message on leaving channel 2015-10-26 12:05:09 -04:00
Harrison Healey
b46c01b290 Merge pull request #1171 from trashcan/github-1130-handle-trailing-characters-after-user
Handle trailing characters after user
2015-10-26 09:57:29 -04:00
Harrison Healey
fa2c9878d2 Merge pull request #1170 from florianorben/PLT-395
PLT-395: Add syntax highlighting to Markdown code blocks
2015-10-26 09:50:40 -04:00
Harrison Healey
9b6f695042 Merge pull request #1183 from girishso/strip-extra-s
strip extra hyphens from urls
2015-10-26 09:27:28 -04:00
Girish S
5d25e55254 strips extra hiphens from channel url 2015-10-26 14:48:00 +05:30
Girish S
e9812655f6 made eslint happy 2015-10-26 13:00:26 +05:30
Girish S
4cfde35256 append * to search query if not present and highlight partial matches 2015-10-26 12:25:14 +05:30
Pat Lathem
3a588fbc18 Fix highlighting of trailing punctuation for own username 2015-10-25 14:09:09 -05:00
Pat Lathem
80e0a8db1d Fix off by one error 2015-10-24 18:54:01 -05:00
Pat Lathem
0c04535599 Remove trailing punctuation when parsing @username references 2015-10-24 18:32:45 -05:00
Florian Orben
51032ae11d Add java and ini language
Forgot to add those altough they are quite common
2015-10-24 21:55:44 +02:00
Florian Orben
9fd9fb1722 fix markup if code is of unknown language 2015-10-24 21:55:44 +02:00
Florian Orben
0f62befef0 code style theme chooser 2015-10-24 21:55:44 +02:00
Florian Orben
113741243b highlight code in markdown blocks 2015-10-24 21:55:44 +02:00
Corey Hulen
03140752e6 Merge pull request #1133 from hmhealey/plt718
PLT-718 Add an autocomplete when searching with in:, channel:, or from:
2015-10-23 14:59:25 -07:00
hmhealey
a5a2826700 Added keyboard selection to search autocomplete 2015-10-23 13:05:38 -04:00
Asaad Mahmood
e82e09c743 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-23 21:33:15 +05:00
Asaad Mahmood
fb05a16b0c Updating nav active bg and Send invitation button 2015-10-23 20:34:21 +05:00
JoramWilander
fe82c43eeb Force updating last viewed at for new posts 2015-10-23 11:22:08 -04:00
Asaad Mahmood
fbc1f35191 Updating bot styling 2015-10-23 20:08:46 +05:00
Asaad Mahmood
db4273d357 Multiple UI Improvements 2015-10-23 19:59:32 +05:00
Asaad Mahmood
cc904a7ec7 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-23 10:53:57 +05:00
Corey Hulen
304f99b3e3 Merge pull request #1150 from hmhealey/plt689
PLT-689 Fixed handling of whitespace surrounding emoticons
2015-10-22 21:39:40 -07:00
hmhealey
50579f71bc Fixed handling of whitespace surrounding emoticons 2015-10-22 15:28:55 -04:00
=Corey Hulen
ab18616725 Fixing group code review issues 2015-10-22 10:17:25 -07:00
Asaad Mahmood
24ed1e2932 Updating mattermost logo 2015-10-22 21:58:11 +05:00
=Corey Hulen
54894e90ac Fixing merge conflict 2015-10-22 09:19:18 -07:00
Asaad Mahmood
5c09060f53 Multiple UI Improvements
- Changing the UI for the active item in the nav
- Updating the UI for drag and drop
- Fixing z-index for date selector
2015-10-22 20:18:31 +05:00
hmhealey
25e018ece0 Changed markdown renderer to only parse emoticons twice 2015-10-22 09:47:28 -04:00
hmhealey
74402df462 Fixed improperly quoted html attributes for emoticons 2015-10-22 09:47:04 -04:00
Harrison Healey
14e24650c5 Merge pull request #1135 from trashcan/PLT-521
PLT-521: Fix emoji with underscores
2015-10-22 09:39:47 -04:00
Pat Lathem
fba89915ac Pass eslint tests 2015-10-21 15:02:23 -05:00
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