hmhealey
|
ffe34aa154
|
Restored changes which remove emojify and switch to our own version
|
2015-09-22 13:53:43 -04:00 |
|
Christopher Speller
|
e9a2c223f2
|
Merge pull request #747 from mattermost/revert-742-plt289
Revert "PLT-289 Properly removed lingering references to emojify"
|
2015-09-22 13:33:18 -04:00 |
|
Christopher Speller
|
6beadc0319
|
Revert "PLT-289 Properly removed lingering references to emojify"
|
2015-09-22 13:33:11 -04:00 |
|
Christopher Speller
|
7c0388856d
|
Merge pull request #746 from mattermost/revert-737-plt289
Revert "PLT-289 Added parsing for named emojis to TextFormatting and …
|
2015-09-22 13:22:04 -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 |
|
Christopher Speller
|
130e73ca02
|
Merge pull request #742 from hmhealey/plt289
PLT-289 Properly removed lingering references to emojify
|
2015-09-22 11:25:15 -04:00 |
|
hmhealey
|
a948935def
|
Properly removed lingering references to emojify
|
2015-09-22 10:54:52 -04: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 |
|
Corey Hulen
|
87e67e825c
|
Merge pull request #725 from mattermost/it33-patch-3
Adjust CLA request template
|
2015-09-22 00:43:11 -07:00 |
|
Corey Hulen
|
df2d668d59
|
Merge pull request #730 from mattermost/shorten-description-help-text
Shorten description help text
|
2015-09-22 00:42:44 -07:00 |
|
it33
|
00f7fdbfc6
|
Correcting typo
|
2015-09-21 15:27:32 -07:00 |
|
it33
|
80488dec22
|
Adjusting sentence
|
2015-09-21 15:26:44 -07:00 |
|
Christopher Speller
|
ee5a77ec56
|
Merge pull request #734 from mattermost/plt-206
PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.
|
2015-09-21 12:19:57 -04:00 |
|
Joram Wilander
|
977ab87d4a
|
Merge pull request #736 from hmhealey/plt312
PLT-312 Added theme class to markdown links
|
2015-09-21 12:13:44 -04:00 |
|
hmhealey
|
a2e3446e37
|
Added theme class to markdown links
|
2015-09-21 11:46:29 -04:00 |
|
JoramWilander
|
3e868a6042
|
Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.
|
2015-09-21 11:30:08 -04:00 |
|
Joram Wilander
|
a35fa9c974
|
Merge pull request #732 from mattermost/plt-243
PLT-243 Adding new create channel modal to the more menu
|
2015-09-21 11:18:24 -04:00 |
|
Joram Wilander
|
eaaa30f6a2
|
Merge pull request #733 from hmhealey/plt310
PLT-310 Wrapped comment messages in divs like posts in the center pane
|
2015-09-21 11:17:48 -04:00 |
|
Christopher Speller
|
8b5cfa4594
|
Merge pull request #708 from hmhealey/plt173
PLT-173 Rotate images with a non-standard orientation before generating a thumbnail and preview
|
2015-09-21 10:47:09 -04:00 |
|
hmhealey
|
d1101e3c91
|
Wrapped comment messages in divs like posts in the center pane
|
2015-09-21 10:03:47 -04:00 |
|
Christopher Speller
|
05b4a14d1e
|
Adding new create channel modal to the more menu
|
2015-09-21 09:40:45 -04:00 |
|
hmhealey
|
4b177a6ed5
|
Added constants for EXIF orientations
|
2015-09-21 09:17:23 -04:00 |
|
Joram Wilander
|
7255209b72
|
Merge pull request #722 from hmhealey/timestamp
Added a tooltip to post timestamps displaying the actual time the post was created
|
2015-09-21 08:38:27 -04:00 |
|
Joram Wilander
|
f399b08db3
|
Merge pull request #729 from mattermost/rename-handle
Renaming "Handle" to "Channel URL" or "URL"
|
2015-09-21 08:37:53 -04:00 |
|
Christopher Speller
|
4578138d57
|
Merge pull request #731 from asaadmahmoodspin/new-channel
Updating new channel UI
|
2015-09-21 08:25:41 -04:00 |
|
Christopher Speller
|
f75777ac6f
|
Merge pull request #723 from hmhealey/plt17
PLT-17 Added Markdown support to the text formatter
|
2015-09-21 08:19:34 -04:00 |
|
Asaad Mahmood
|
5dbdc0ff76
|
Updating new channel UI
|
2015-09-21 11:09:23 +05:00 |
|
it33
|
814e467435
|
Shorten description help text
Currently it word wraps, this prevents word-wrapping
|
2015-09-20 21:24:27 -07:00 |
|
it33
|
e989b839d5
|
Renaming "Handle" to "Channel URL" or "URL"
|
2015-09-20 21:17:58 -07:00 |
|
it33
|
4a13d37367
|
Renaming "Handle" to "Channel URL" or "URL"
|
2015-09-20 21:17:20 -07:00 |
|
it33
|
aca720eb94
|
Adjust CLA request template
|
2015-09-19 21:40:44 -07:00 |
|
it33
|
86429c7bd5
|
Adjusting CLA request template
|
2015-09-19 21:27:13 -07:00 |
|
it33
|
7310153236
|
Added note on build version info improvement
|
2015-09-19 21:20:12 -07:00 |
|
Corey Hulen
|
96b0ce880f
|
Merge pull request #724 from mattermost/GIT-721
GIT-721 Removing sql ping log message
|
2015-09-19 19:53:57 -07:00 |
|
=Corey Hulen
|
b8b3ba864d
|
GIT-721 Removing sql ping log
|
2015-09-19 19:42:54 -07:00 |
|
hmhealey
|
144a277a44
|
Cleaned up markdown formatting code and removed debug statements
|
2015-09-19 11:18:37 -04:00 |
|
hmhealey
|
5f18c71d07
|
Deferred to marked.js's html sanitization when markdown is enabled
|
2015-09-19 11:18:32 -04:00 |
|
hmhealey
|
2eb320f48a
|
Changed markdown link parsing to automatically add an explicit protocol to urls
|
2015-09-19 10:39:55 -04:00 |
|
hmhealey
|
efb3462a68
|
Prevented our url autolinking from breaking markdown links
|
2015-09-19 10:39:51 -04:00 |
|
hmhealey
|
bb330b662a
|
Added marked library to text_formatting.jsx
|
2015-09-19 10:08:59 -04:00 |
|
hmhealey
|
ae5a1e3ea8
|
Removed underscores surrounding formatting tokens since they won't work with markdown
|
2015-09-19 10:08:59 -04:00 |
|
hmhealey
|
208bf914b8
|
Removed unnecessary conversion of newlines to html line breaks
|
2015-09-19 10:08:59 -04:00 |
|
hmhealey
|
cfc919d111
|
Added a tooltip to post timestamps displaying the actual time the post was created
|
2015-09-19 09:18:27 -04:00 |
|
Corey Hulen
|
06f8b8bfb4
|
Merge pull request #720 from mattermost/it33-patch-4
Adjusting description of emoji codes feature
|
2015-09-18 15:11:49 -07:00 |
|
Harrison Healey
|
679e20aa4b
|
Merge pull request #709 from mattermost/PLT-11
PLT-11 adding config for logs to UI
|
2015-09-18 18:11:01 -04:00 |
|
Corey Hulen
|
676f2a6399
|
Merge pull request #718 from mattermost/it33-patch-3
Adding build status indicator to README.md
|
2015-09-18 14:47:57 -07:00 |
|
it33
|
120bbb82cc
|
Adjusting description of emoji codes feature
|
2015-09-18 14:34:52 -07:00 |
|
it33
|
b02b93a060
|
Merge pull request #719 from lfbrock/patch-8
Updated changlog to include new contributors and features
|
2015-09-18 14:32:58 -07:00 |
|
lfbrock
|
881089a82b
|
Updated changlog to include new contributors and features
|
2015-09-18 17:02:52 -04:00 |
|