Commit Graph
1858 Commits
Author SHA1 Message Date
Christopher Speller a2679ebf91 Fixing bad merge 2015-11-12 15:25:41 -05:00
Christopher Speller c7fe8510ce Merge branch 'release-1.2' 2015-11-12 14:55:52 -05:00
JoramWilander 946ce3e244 Make import/export theme input box editable 2015-11-12 13:19:04 -05:00
Corey Hulen 931f4f764c Merge pull request #1412 from mattermost/plt-1089
PLT-1089 Fix profile not loading in RHS on refresh
2015-11-12 10:12:58 -08:00
Corey Hulen b6049721f9 Merge pull request #1409 from mattermost/plt-961
PLT-961 Rename areStatesEqual to areObjectsEqual and make it more comprehensive and accurate.
2015-11-12 10:12:34 -08:00
Corey Hulen 6f7b7169b2 Merge pull request #1407 from mattermost/plt-1041
PLT-1041 Fix multiple pending/errored posts
2015-11-12 10:12:14 -08:00
Christopher Speller cce0dc19e6 Merge pull request #1411 from hmhealey/plt876
PLT-876 Sorted channel list before rendering them in the sidebar
2015-11-12 12:36:41 -05:00
Christopher Speller c1ab5adb20 Merge pull request #1410 from hmhealey/plt906
PLT-906 Added ChannelExtra.MemberCount field
2015-11-12 12:35:47 -05:00
Christopher Speller 67b92f3248 Merge pull request #1408 from hmhealey/plt922
PLT-922 Added feedback to the Invite Members modal to indicate that emails are currently being sent
2015-11-12 12:33:43 -05:00
JoramWilander 83d34dcc6c Fix profile loading in RHS on refresh 2015-11-12 12:13:26 -05:00
hmhealey 3c40a683a1 Sorted channel list before rendering them in the sidebar 2015-11-12 11:38:56 -05:00
hmhealey be43522117 Added ChannelExtra.MemberCount field to reflect the actual member count when we truncate the list of members to 20 2015-11-12 11:25:46 -05:00
JoramWilander 50815f9be7 Rename areStatesEqual to areObjectsEqual and make it more comprehensive and accurate. 2015-11-12 11:19:59 -05:00
hmhealey fd9ef64b85 Added feedback to the Invite Members modal to indicate that emails are currently being sent 2015-11-12 10:43:49 -05:00
Asaad Mahmood dc1c589369 Updating profile image and textbox resizing 2015-11-12 18:51:49 +05:00
JoramWilander db861b03bd Fix multiple pending/errored posts 2015-11-12 08:44:18 -05:00
Asaad Mahmood 2f95210a29 UI Improvements for centre channel due to preview 2015-11-12 18:09:18 +05:00
Joram Wilander f8f0814a37 Merge pull request #1352 from florianorben/PLT-1049
PLT-1049: Vine URLs should not generate preview links
2015-11-11 13:56:13 -05:00
Christopher Speller 8920013266 Merge pull request #1389 from florianorben/preview-markdown
Preview markdown post
2015-11-11 13:55:33 -05:00
JoramWilander 72c7e06644 Remove unneed role 2015-11-11 12:56:04 -05:00
JoramWilander b42404dcba Remove unneed argument 2015-11-11 12:54:57 -05:00
JoramWilander 782709aa56 Fix channel invite button on channel intro message and fix empty channel invite modal. 2015-11-11 12:53:18 -05:00
Florian Orben 7ccc541054 move provider.json to components folder; fix indentation; add json files to eslintignore 2015-11-10 23:44:20 +01:00
Florian Orben c56762a4e9 PLT-1049: Vine URLs should not generate preview links 2015-11-10 23:44:20 +01:00
Florian Orben 96adf5238e add button to preview your current post 2015-11-10 23:03:49 +01:00
Florian Orben 5ed94c8f58 fix indentation to use tabs 2015-11-10 22:38:19 +01:00
Florian Orben 14cff7588f Add latex support
Adds latex highlighting support via https://www.npmjs.com/package/katex
as requested in
https://mattermost.uservoice.com/forums/306457-general/suggestions/10160757-add-latex-support
2015-11-10 22:38:19 +01:00
hmhealey f7b099ffdb Added text to the edit channel purpose menu option on mobile 2015-11-10 14:49:55 -05:00
Christopher Speller 0980859042 Merge pull request #1365 from hmhealey/eslintbabel
Switched eslint to use babel-eslint parser
2015-11-10 10:17:27 -05:00
Joram Wilander f95c6e9e81 Merge pull request #1377 from jdhoek/bug/spelling
Spelling: replace 'Ex' with 'E.g.' in placeholders
2015-11-10 10:02:55 -05:00
Jeroen Hoek f46313a06a Spelling: replace 'Ex' with 'E.g.' in placeholders
When abbreviating "For example" in English, "e.g." is used.

See also:
    https://english.stackexchange.com/questions/16197/whats-the-difference-between-e-g-and-ex
2015-11-10 09:57:20 +01:00
hmhealey 1808e8eafa Updated post components to re-render after first receiving user profiles 2015-11-09 16:13:02 -05:00
JoramWilander 55882e1b83 Add skip tutorial button to intro screens 2015-11-09 15:42:56 -05:00
Christopher Speller 66e8dc5fb9 Merge pull request #1350 from rgarmsen2295/plt-597
PLT-597 Moves the 'Email verified' toast to above the sign-in prompt on the login screen
2015-11-09 15:28:37 -05:00
Christopher Speller 79cc0be0b0 Merge pull request #1367 from asaadmahmoodspin/ui-improvements
Updating tutorial tip and adding div tags to webhook labels.
2015-11-09 14:13:36 -05:00
Christopher Speller 3ad252995a Merge pull request #1366 from mattermost/jump-to-new
Jumps up to new messages indicator when new messages present
2015-11-09 14:04:00 -05:00
Asaad Mahmood 16e877f99e Updating variable tipColor 2015-11-09 23:56:11 +05:00
Asaad Mahmood 577427e7fd Updating tutorial tip 2015-11-09 23:43:44 +05:00
JoramWilander 661b4a38b2 Add new line break 2015-11-09 13:19:47 -05:00
hmhealey 46754509e8 Switched eslint to use babel-eslint parser 2015-11-09 13:13:55 -05:00
Christopher Speller d56d9c2f12 Jumps up to new messages indicator when new messages present 2015-11-09 09:16:01 -05:00
Reed Garmsen ee9aaacf80 Moved 'Email verified' toast to above the sign-in prompt on the login screen 2015-11-06 15:41:20 -08:00
Christopher Speller 4795c7c003 Fixing jumping to bottom of channels when messages recieved in anouther channel 2015-11-06 14:20:54 -05:00
Christopher Speller 1610fe6ca5 Revert "Fixed loading forever on first page load"
This reverts commit d020db39cb.
2015-11-06 13:53:26 -05:00
Harrison Healey 32069345b5 Merge pull request #1345 from hmhealey/plt983
PLT-983 Fix _emphasizing_ markdown text when it's not the start of the post
2015-11-06 13:16:28 -05:00
hmhealey 0239239d29 Changed markdown text regex to not capture the final underscore on a word to better match the original behaviour 2015-11-06 12:55:14 -05:00
Joram Wilander e5b9fb6b95 Merge pull request #1342 from hmhealey/plt761
PLT-761 Removed required whitespace from before @mentions
2015-11-06 12:40:05 -05:00
Joram Wilander ed2537c4b5 Merge pull request #1341 from hmhealey/plt911
PLT-911 Fixed navigating search autocomplete with the keyboard
2015-11-06 12:39:56 -05:00
Joram Wilander 8d7f1c1705 Merge pull request #1340 from mattermost/markdown-image-fixes
Markdown image fixes.
2015-11-06 12:39:49 -05:00
Joram Wilander 190adae0c9 Merge pull request #1339 from mattermost/loading-forever-fix
Fixed loading forever on first page load
2015-11-06 12:10:38 -05:00