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

5993 Коммитов

Автор 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
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
Asaad Mahmood
18c29e9ab2 Multiple UI Improvements 2016-03-30 20:16:10 +05:00
JoramWilander
91c83e6ab4 Update email/password settings text depending on sign-in method 2016-03-30 10:39:13 -04:00
Harrison Healey
ac3a91842b Updated out of channel notification message 2016-03-30 10:33:39 -04:00
Harrison Healey
b6d6153afb Fixed leaving a direct channel so that it doesn't open the channel you just left 2016-03-30 10:14:34 -04:00
Harrison Healey
4cc7b29c92 Merge pull request #2574 from asaadmahmoodspin/ui-improvements
PLT-2296 - Adding back button to main create team page
2016-03-30 10:10:44 -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
Christopher Speller
fcc80818a8 Merge pull request #2566 from mattermost/plt-2350
PLT-2350 Added LDAP to signup page
2016-03-30 10:02:07 -04:00
Asaad Mahmood
696a2c7697 Fixing link 2016-03-30 19:00:04 +05:00
Harrison Healey
55f3ae576d Fixed adding direct channels to the sidebar 2016-03-30 09:55:32 -04:00
Asaad Mahmood
dac77f2440 Fixing eslint error 2016-03-30 18:51:27 +05:00
Harrison Healey
2e9f5c7cf0 Merge pull request #2567 from mattermost/css-webpack-improvments
Moving from scss vendors folder to NPM.
2016-03-30 09:35:00 -04:00
Harrison Healey
52cef6bc41 Merge pull request #2568 from mattermost/fix-sidebar-link
Fixing some warnings.
2016-03-30 09:34:35 -04:00
Harrison Healey
22b24798af Merge pull request #2569 from mattermost/run-fullmap
Adding make target for building with a full source map
2016-03-30 09:34:07 -04:00
Harrison Healey
7ed87b0a85 Merge pull request #2570 from mattermost/plt-1944
PLT-1944 Fixing react warnings on permalink return.
2016-03-30 09:33:45 -04:00
Asaad Mahmood
4ee417db3d Adding back button to main create team page 2016-03-30 18:32:24 +05: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
Harrison Healey
6a101292c7 Removed changes introduced by a merge that somehow didn't break anything 2016-03-30 09:19:13 -04:00
Christopher Speller
e7ea080fd3 Fixing react warnings on permalink return 2016-03-29 19:24:53 -04:00
Christopher Speller
ecdbbd7c54 Adding make target for building with a full source map 2016-03-29 18:32:15 -04:00
Joram Wilander
a6a0f18166 Merge pull request #2565 from ZBoxApp/missing-locs
Add missing es locs and sort by id
2016-03-29 18:09:41 -04:00
Christopher Speller
51ebd65aec Fixing warning with drafts. 2016-03-29 18:09:31 -04:00
Christopher Speller
97deda72f0 Fixing Link warning 2016-03-29 18:09:26 -04:00
Christopher Speller
29f4548fea Merge pull request #2564 from hmhealey/actions
Added RECEIVED_ANALYTICS action
2016-03-29 16:49:42 -04:00
Christopher Speller
55ce37be4e Moving from scss vendors folder to NPM. 2016-03-29 16:41:11 -04:00
JoramWilander
6541cfbb0b Added LDAP to signup page 2016-03-29 16:35:52 -04:00
Elias Nahum
c26a650f0b Add missing es locs and sort by id 2016-03-29 16:56:43 -03:00
Harrison Healey
132d4cdf8f Moved backstage integrations pages to /settings/integrations 2016-03-29 15:19:04 -04:00
Harrison Healey
46020c7722 Updated AddIntegrations help text 2016-03-29 15:18:48 -04:00
Harrison Healey
355b0d61ae Removed expand widget from the backstage sidebar and changed how the sections highlight 2016-03-29 15:18:48 -04:00
Harrison Healey
4029db3905 Fixed hardcoded team name in InstalledIntegrations 2016-03-29 15:18:48 -04:00
Harrison Healey
17f10b1aba Added english localization for Backstage and additional cleanup 2016-03-29 15:18:48 -04:00
Harrison Healey
9de236ca9c Removed incoming and outgoing webhooks from user settings 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
fcd8f2e2ba Added menu option to go to new integrations 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
3634b5bab5 Fixed adding outgoing webhooks with only a trigger word or a channel 2016-03-29 15:18:48 -04:00
Harrison Healey
f9deb399a9 Removed Team Settings from backstage 2016-03-29 15:18:48 -04:00