58 Коммитов

Автор	SHA1	Сообщение	Дата
JoramWilander	de2f7f4e52	Fix oauth routes and link issues	2016-03-24 19:32:25 -04: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	d6a6668a39	Modifying login not to display until it has finished checking. Caused admin console to redirect to town-square. Will be changed after user model flip.	2016-03-24 11:27:05 -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
Asaad Mahmood	d64c75ae4a	Multiple UI Improvements	2016-03-24 18:12:57 +05: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	13b967b2b5	Merge pull request #2520 from hmhealey/prefs ... Fixed tutorial step preferences to be saved as strings	2016-03-23 16:31:12 -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
Christopher Speller	6285ec44bb	Merge pull request #2494 from hmhealey/plt2190 ... PLT-2190 Switched Textbox to use a TextareaAutosize and removed custom resizing code	2016-03-23 16:21:27 -04:00
Joram Wilander	826529f048	Merge pull request #2517 from mattermost/plt-2379 ... PLT-2379, PLT-2432 Fixing browser store issue.	2016-03-23 16:06:53 -04:00
Joram Wilander	6ccef5caf5	Merge pull request #2509 from asaadmahmoodspin/ui-improvements ... Multiple UI improvements	2016-03-23 16:02:36 -04:00
Harrison Healey	c6e14fc380	Fixed tutorial step preferences to be saved as strings	2016-03-23 16:01:49 -04:00
JoramWilander	934c7c7a7c	Fix imports and change ldap function name	2016-03-23 15:59:58 -04:00
JoramWilander	463fd8c20b	Add the ability to switch from email to ldap and back	2016-03-23 15:59:58 -04:00
Christopher Speller	c3aa84a883	Fixing browser store issue.	2016-03-23 15:35:38 -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	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
Harrison Healey	4e3eb2bb18	Added SpinnerButton component to handle buttons that are also spinners	2016-03-22 10:03:17 -04:00
Harrison Healey	8376ff6233	Adding loading indicator after clicking invite channel member button	2016-03-22 09:29:02 -04:00
Joram Wilander	1b6b70c805	Merge pull request #2495 from hmhealey/plt2317a ... PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props	2016-03-22 08:09:29 -04:00
Harrison Healey	4bac6fc7ec	Re-added ChannelMembersModal on mobile	2016-03-21 15:36:26 -04:00
Harrison Healey	21bbd6bae5	Changed RhsComment to receive the current user through props	2016-03-21 13:11:03 -04:00
Harrison Healey	bb16a71d6e	Passed currentUser into RhsRootPost	2016-03-21 10:30:17 -04:00
Christopher Speller	a3872e5f5e	Merge release branch commits	2016-03-21 10:20:35 -04:00
Harrison Healey	f134df04b0	Switched Textbox to use a TextareaAutosize and removed custom resizing code	2016-03-21 09:49:29 -04:00
Christopher Speller	6f747b8b18	Merge pull request #2481 from khoa-le/PLT-2018 ... PLT-2018 After clicking "Use a different address" hitting enter should submit …	2016-03-21 07:30:25 -04:00
Khoa, Le Ngoc	5ed7c3baa5	System Console > Legal and Support Settings: If a link does not include http or https, it does not open properly	2016-03-19 20:11:48 +07:00
Khoa, Le Ngoc	51ef060a36	After clicking "Use a different address" hitting enter should submit the "Use this instead" button	2016-03-19 19:57:57 +07:00
Christopher Speller	35320efe1a	Revert "PLT-2183 Slash command auto-complete"	2016-03-18 13:16:51 -04:00
Elias Nahum	5a4945c4d5	PLT-2368: Fix for Date of last profile picture update is showing [object][object]	2016-03-18 12:18:45 -03:00
Corey Hulen	53d7718e57	Merge pull request #2442 from mattermost/PLT-2115 ... PLT-2115 adding compliance feature	2016-03-17 13:16:10 -07:00
=Corey Hulen	2e5cc29738	Fixing localization stuff	2016-03-17 11:23:27 -07:00
=Corey Hulen	3ca32ee1e5	Fixing localization stuff	2016-03-17 11:21:08 -07: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
Elias Nahum	919fb8274b	Fix ESLint for code_preview.jsx	2016-03-17 13:40:03 -03:00
Elias Nahum	1f5c8c4e4e	Option to enable full snippets in push notifications	2016-03-17 13:20:17 -03:00
Christopher Speller	d383ed2f8d	Merge pull request #2380 from rodrigocorsi2/code_preview ... Created component CodePreview	2016-03-17 12:09:04 -04:00
Christopher Speller	2cd006474e	Merge pull request #2461 from hmhealey/teamdefault ... Changed 'show username' display text to be more accurate	2016-03-17 12:05:17 -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	93101331bf	Changed 'show username' display text to be more accurate	2016-03-17 10:43:08 -04:00
Christopher Speller	be07d63464	Merge pull request #2448 from asaadmahmoodspin/ui-improvements ... Updating sass lint stuff with other scss improvements	2016-03-17 08:36:53 -04:00
=Corey Hulen	074f15f761	Fixing webpack	2016-03-16 18:52:46 -07:00
=Corey Hulen	5982bd490b	Fixing merge	2016-03-16 18:35:53 -07:00
=Corey Hulen	b9d5b4e5dc	merging files	2016-03-16 18:13:16 -07:00