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 |
|
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 |
|
hmhealey
|
f7b099ffdb
|
Added text to the edit channel purpose menu option on mobile
|
2015-11-10 14:49:55 -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 |
|
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 |
|
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
|
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 |
|
Joram Wilander
|
8022f99da5
|
Merge pull request #1338 from asaadmahmoodspin/ui-improvements
Updating UI for search autocomplete
|
2015-11-06 11:56:34 -05:00 |
|
hmhealey
|
6ba996a9e2
|
Sorted channel suggestions be type before sorting by name
|
2015-11-06 11:51:10 -05:00 |
|
Christopher Speller
|
d020db39cb
|
Fixed loading forever on first page load
|
2015-11-06 11:20:23 -05:00 |
|
Asaad Mahmood
|
186ab11c57
|
Updating UI for search autocomplete
|
2015-11-06 21:17:47 +05:00 |
|
Florian Orben
|
84a561207f
|
display slack attachments in RHS comment section
|
2015-11-06 17:11:38 +01:00 |
|
Joram Wilander
|
0d1fe806a0
|
Merge pull request #1335 from mattermost/triple-dot-fix
Fix user profile never updating properly
|
2015-11-06 10:36:46 -05:00 |
|
Christopher Speller
|
029b795e47
|
Merge pull request #1318 from mattermost/plt-1025
PLT-1025 Make dots in tutorial intro clickable and always at the same spot
|
2015-11-06 10:22:55 -05:00 |
|
Christopher Speller
|
51da1b1ca1
|
Merge pull request #1332 from mattermost/plt-560
PLT-560 Prevent SSO users from changing their email
|
2015-11-06 10:17:04 -05:00 |
|
JoramWilander
|
0f4f1f90e7
|
Fix user profile never updating properly
|
2015-11-06 10:13:51 -05:00 |
|
Joram Wilander
|
1ecad4301e
|
Merge pull request #1327 from florianorben/PLT-857-2
PLT-857: Support `attachments` for Incoming Webhooks
|
2015-11-06 09:05:32 -05:00 |
|
JoramWilander
|
7eca077877
|
Prevent SSO users from changing their email
|
2015-11-06 08:56:13 -05:00 |
|