Граф коммитов

6030 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
763bfc780a Merge pull request #2616 from mattermost/revert-2608-ui-improvements
Revert "PLT-2027- Improvements to about dialog"
2016-04-01 12:02:19 -04:00
Christopher Speller
7ecd23bb6c Revert "PLT-2027- Improvements to about dialog" 2016-04-01 12:02:14 -04:00
Joram Wilander
3245ed253a Merge pull request #2608 from asaadmahmoodspin/ui-improvements
PLT-2027- Improvements to about dialog
2016-04-01 11:58:04 -04:00
Harrison Healey
5e307532d8 Merge pull request #2600 from mattermost/new-messages-fix
PLT-2473 Fixing new messages jump
2016-04-01 10:23:50 -04:00
Harrison Healey
d4442b002e Merge pull request #2601 from mattermost/permalink-view-fix
PLT-2382 Fixing reply from permalinks
2016-04-01 10:20:56 -04:00
Asaad Mahmood
c51484332c PLT-2027- Improvements to about dialog 2016-04-01 17:57:21 +05:00
Joram Wilander
3aa240d74f Merge pull request #2599 from ZBoxApp/locs
Add missing en locs and translations to es
2016-04-01 08:46:03 -04:00
Joram Wilander
da5de9eed3 Merge pull request #2603 from rodrigocorsi2/pt-translations
MFA translations
2016-04-01 08:24:40 -04:00
Rodrigo Corsi
1aba2cb7ec MFA translations 2016-03-31 20:15:06 -03:00
Christopher Speller
3ccc0f814a Fixing reply from permalinks 2016-03-31 15:37:50 -04:00
Elias Nahum
271876f3b5 Add missing en locs and translations to es 2016-03-31 16:33:08 -03:00
Christopher Speller
1788070f87 Fixing new messages jump 2016-03-31 15:16:57 -04:00
Harrison Healey
36f611fac4 Merge pull request #2594 from mattermost/plt-2476
PLT-2476 Fixing username display in center channel
2016-03-31 13:01:05 -04:00
Joram Wilander
720947e17e Merge pull request #2595 from hmhealey/plt2480
PLT-2480 Fixed errors when joining a channel that doesn't exist yet
2016-03-31 12:47:04 -04:00
Harrison Healey
7dee877c19 Merge pull request #2598 from mattermost/plt-2474
PLT-2474 Fixing typing message on channel switch.
2016-03-31 12:25:15 -04:00
Harrison Healey
6c8116a0b8 Merge pull request #2597 from mattermost/plt-2011
PLT-2011 Fixing sidebar jump warning
2016-03-31 12:24:41 -04:00
Joram Wilander
fa330c8e69 Merge pull request #2592 from ZBoxApp/editorconfig
Update .editorconfig
2016-03-31 12:22:16 -04:00
Harrison Healey
a0a747b2b3 Merge pull request #2590 from mattermost/plt-2287
PLT-2287 Disable previously created public links with the config setting
2016-03-31 12:21:40 -04:00
Harrison Healey
8050a9b958 Merge pull request #2589 from mattermost/plt-1812
PLT-1812 Update webhook posts to never show in collapsed view
2016-03-31 12:21:20 -04:00
Harrison Healey
098873e667 Changed ChannelHeader to pass channel to PopoverListMembers directly 2016-03-31 12:18:51 -04:00
Christopher Speller
8abd74b892 Merge pull request #2588 from hmhealey/plt2490
PLT-2491/PLT-2492 Fixed saving changes in ServiceSettings when MFA isn't available
2016-03-31 12:15:35 -04:00
Christopher Speller
4285729550 Fixing typing message on channel switch 2016-03-31 12:11:29 -04:00
Christopher Speller
b382844b79 Fixing sidebar jump warning 2016-03-31 11:28:28 -04:00
Harrison Healey
307c16df5f Fixed errors when joining a channel that doesn't exist yet 2016-03-31 11:10:57 -04:00
Christopher Speller
54a064de98 Fixing username display in center channel 2016-03-31 10:58:12 -04:00
Elias Nahum
325ddb0204 Update .editorconfig 2016-03-31 11:49:55 -03:00
Harrison Healey
803b58c2d4 Fixed PostsView not unregistering it's PreferenceStore listener when unmounting 2016-03-31 10:33:00 -04:00
JoramWilander
c27f700670 Disable previously created public links with the config setting 2016-03-31 10:08:20 -04:00
Joram Wilander
5feda35591 Merge pull request #2587 from asaadmahmoodspin/ui-improvements
Improvements to preview textarea and about modal
2016-03-31 10:05:05 -04:00
JoramWilander
980419b37c Update webhook posts to never show in collapsed view 2016-03-31 09:54:46 -04:00
Harrison Healey
68bc42824a Fixed saving changes in ServiceSettings when MFA isn't available 2016-03-31 09:42:55 -04:00
Harrison Healey
dd6f577647 Fixed prop type warning in system console 2016-03-31 09:42:35 -04:00
Christopher Speller
c8b2af6246 Fix login 2016-03-31 08:59:08 -04:00
Asaad Mahmood
c67bcba3ae Improvements to preview textarea and about modal 2016-03-31 17:55:26 +05:00
Joram Wilander
43aa7e4c79 Merge pull request #2585 from mattermost/fix-ldap-email
Fix for ldap ability to change email
2016-03-31 08:21:33 -04:00
Christopher Speller
dd20f2c697 Merge pull request #2578 from mattermost/plt-2463
PLT-2463, PLT-2465 Fixing session and logout errors
2016-03-30 21:40:59 -04:00
Christopher Speller
bf90d98136 Fixing session and logout errors 2016-03-30 15:29:21 -04:00
Christopher Speller
9a82d5d3c5 Fix for ldap ability to change email 2016-03-30 15:12:53 -04:00
Christopher Speller
8283c18cb0 Merge pull request #2582 from hmhealey/emoji
Added a few missing emojis
2016-03-30 14:53:00 -04:00
Christopher Speller
74d2c5b6ce Merge pull request #2518 from mattermost/plt-2187
PLT-2187 Add MFA functionality
2016-03-30 14:33:32 -04:00
Harrison Healey
39675178e9 Added South Africa emoji 2016-03-30 13:45:44 -04:00
Harrison Healey
bee8daf094 Added slight smiling, slighting frowning, upside-down smiling, Canada, and Pakistan emojis 2016-03-30 13:34:12 -04:00
Corey Hulen
6cad40ecf4 Merge pull request #2580 from hmhealey/plt2482
PLT-2482 Fixed function binding in FileStore
2016-03-30 10:08:34 -07:00
JoramWilander
f9a3a4b394 Add MFA functionality 2016-03-30 12:49:29 -04:00
Harrison Healey
32962299e1 Fixed function binding in FileStore 2016-03-30 11:56:52 -04:00
Christopher Speller
2aa0d9b8fc Merge pull request #2577 from mattermost/plt-2349
PLT-2349 Update email/password settings text depending on sign-in method
2016-03-30 11:40:22 -04:00
Christopher Speller
6580b94377 Merge pull request #2576 from hmhealey/plt2450
PLT-2450 Updated out of channel notification message
2016-03-30 11:39:15 -04:00
Harrison Healey
8956e7de9e Merge pull request #2579 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2016-03-30 11:34:54 -04:00
Joram Wilander
52074b70a4 Merge pull request #2575 from hmhealey/plt2480
PLT-2478/PLT-2480 Fixing direct channels in sidebar
2016-03-30 11:16:49 -04:00
Joram Wilander
d2ddddc4aa Merge pull request #2573 from mattermost/plt-2453
PLT-2453 Resetting theme upon logout.
2016-03-30 11:16:33 -04:00