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

51 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
bf90d98136 Fixing session and logout errors 2016-03-30 15:29:21 -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
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
JoramWilander
f9a3a4b394 Add MFA functionality 2016-03-30 12:49:29 -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
Christopher Speller
2ab4581d5e Merge pull request #2561 from hmhealey/plt1736
PLT-1736 Initial Backstage Work
2016-03-30 10:05:26 -04:00
Harrison Healey
55f3ae576d Fixed adding direct channels to the sidebar 2016-03-30 09:55:32 -04:00
Christopher Speller
29cc5e16bc Resetting theme upon logout. Displaying loading page when logging in so user does not see their theme switch. 2016-03-30 09:30:33 -04:00
Christopher Speller
e7ea080fd3 Fixing react warnings on permalink return 2016-03-29 19:24:53 -04:00
Christopher Speller
29f4548fea Merge pull request #2564 from hmhealey/actions
Added RECEIVED_ANALYTICS action
2016-03-29 16:49:42 -04:00
Harrison Healey
17f10b1aba Added english localization for Backstage and additional cleanup 2016-03-29 15:18:48 -04:00
Harrison Healey
149c72cf8c Added ability to regenerate outgoing webhook tokens on InstalledIntegrations page 2016-03-29 15:18:48 -04:00
Harrison Healey
bb13476326 Added delete buttons to InstalledIntegrations 2016-03-29 15:18:48 -04:00
Harrison Healey
aa684f0b8b Added ChannelSelect component 2016-03-29 15:18:26 -04:00
Harrison Healey
3246d97d5e Added basic screen to add incoming webhooks 2016-03-29 15:18:26 -04:00
Harrison Healey
c417fdc152 Added initial backstage components and InstalledIntegrations page 2016-03-29 15:18:26 -04:00
Harrison Healey
9c36210edd Merge pull request #2556 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
2016-03-29 12:09:22 -04:00
Harrison Healey
517cd301d3 Added RECEIVED_ANALYTICS action 2016-03-29 12:08:11 -04:00
Christopher Speller
5ce1a4368b Refactoring center panel away. Moving tutorial to a route. Fixing a
bunch of bugs.
2016-03-29 09:54:55 -04:00
Asaad Mahmood
501eef0385 Additional UI improvements 2016-03-29 17:55:30 +05:00
Harrison Healey
c64b12e27a Merge pull request #2529 from mattermost/plt-2383
PLT-2383 Fixed system console login page flash.
2016-03-24 12:45:12 -04:00
Christopher Speller
b62e29ba9c Moving all links and redirects to react-router 2016-03-24 11:05:13 -04:00
Joram Wilander
e5c2915e87 Merge pull request #2523 from hmhealey/plt2351
PLT-2351 Switch to Apple emoji set
2016-03-24 10:36:42 -04:00
Harrison Healey
5cfae469a5 Fixed ESLint errors 2016-03-24 09:22:58 -04:00
Harrison Healey
016c179f01 Change emoticon rendering code to use image files with unicode names 2016-03-23 17:49:15 -04:00
Harrison Healey
c24a5c5a9a Fixed unicode emoji not having a consistent size 2016-03-23 17:49:14 -04:00
Christopher Speller
07bf7c498d Merge pull request #2465 from mattermost/plt-2260
PLT-2260 Add the ability to switch from email to ldap and back
2016-03-23 16:26:37 -04:00
Joram Wilander
6ccef5caf5 Merge pull request #2509 from asaadmahmoodspin/ui-improvements
Multiple UI improvements
2016-03-23 16:02:36 -04:00
JoramWilander
463fd8c20b Add the ability to switch from email to ldap and back 2016-03-23 15:59:58 -04:00
Joram Wilander
7af2e6f87a Merge pull request #2516 from hmhealey/disableautolinker
Disabled autolinker
2016-03-23 14:22:54 -04:00
Joram Wilander
6275ad2ae4 Merge pull request #2515 from hmhealey/prefs
Changed PreferenceStore to store data in memory
2016-03-23 14:22:30 -04:00
Harrison Healey
c16fcbbfaf Disabled autolinker 2016-03-23 13:13:15 -04:00
Harrison Healey
1f46cca65c Changed PreferenceStore to store data in memory 2016-03-23 13:03:12 -04:00
Christopher Speller
9239a7353a Fixing websocket connection issue. Refactoring websockets into an action creator. 2016-03-23 10:38:35 -04:00
Asaad Mahmood
e60f6f3b13 Multiple UI improvements 2016-03-23 18:16:41 +05:00
Christopher Speller
a3872e5f5e Merge release branch commits 2016-03-21 10:20:35 -04:00
Christopher Speller
35320efe1a Revert "PLT-2183 Slash command auto-complete" 2016-03-18 13:16:51 -04:00
Elias Nahum
f5a8703b38 PLT-2392: Fix for Notification sound broken 2016-03-18 12:29:04 -03:00
=Corey Hulen
5273559ca1 Fixing merge 2016-03-17 09:51:45 -07:00
Christopher Speller
128204b47a Fixing style issue caused by build changes 2016-03-17 12:42:03 -04:00
Rodrigo Corsi
529513606b Created component CodePreview 2016-03-17 12:47:07 -03:00
Christopher Speller
6b9d895224 Merge pull request #2169 from kernicPanel/external-slashcommands-management
PLT-2183 Slash command auto-complete
2016-03-17 11:45:42 -04:00
Harrison Healey
f8ac97fb22 Changed mention parser to ignore empty string mentions 2016-03-17 10:33:06 -04:00
=Corey Hulen
b9d5b4e5dc merging files 2016-03-16 18:13:16 -07:00
Nicolas Clerc
81366cd5e5 use pre-released features 2016-03-17 01:58:16 +01:00
Nicolas Clerc
55a054ab0a fix eslint errors 2016-03-17 01:45:37 +01:00
Nicolas Clerc
5e2596598f add external slashcommands management 2016-03-17 01:45:37 +01:00
Asaad Mahmood
f600b1dc2b Updating asss lint stuff with other scss improvements 2016-03-17 05:42:38 +05:00