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

78 Коммитов

Автор SHA1 Сообщение Дата
=Corey Hulen
a9c4f5efd0 fixing segment bug 2015-09-23 14:35:05 -07:00
=Corey Hulen
2f72d4702b fixing segment bug 2015-09-23 14:32:44 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
Harrison Healey
15f15de8ca Merge pull request #759 from mattermost/plt-242-3
PLT-242 Implement custom UI theme colors.
2015-09-23 15:04:22 -04:00
JoramWilander
e4a15076f4 Implement UI theme colors. 2015-09-23 10:12:40 -04:00
=Corey Hulen
88e5a71e8c Adding service settings to admin console 2015-09-22 12:12:50 -07:00
hmhealey
ffe34aa154 Restored changes which remove emojify and switch to our own version 2015-09-22 13:53:43 -04:00
Christopher Speller
6beadc0319 Revert "PLT-289 Properly removed lingering references to emojify" 2015-09-22 13:33:11 -04:00
hmhealey
a948935def Properly removed lingering references to emojify 2015-09-22 10:54:52 -04:00
=Corey Hulen
99d0db136c Fixing css 2015-09-16 23:27:25 -07:00
=Corey Hulen
8e848f38d5 PLT-40 adding experimental support for emojis 2015-09-16 23:22:15 -07:00
JoramWilander
47e6a33a45 Implement OAuth2 service provider functionality. 2015-09-16 15:49:12 -04:00
=Corey Hulen
84c0b96e0b Merge branch 'master' into PLT-93 2015-09-16 09:29:50 -07:00
Joram Wilander
9f2cd77dc8 Merge pull request #686 from hmhealey/plt172
PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar
2015-09-16 07:44:45 -04:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00
=Corey Hulen
788fc4373b removing loggly 2015-09-15 14:20:25 -07:00
hmhealey
49df7c0314 PLT-172 Updated perfect-scrollbar to 0.6.5 2015-09-15 12:52:52 -04:00
Corey Hulen
bfebb41bc0 Merge pull request #678 from mattermost/mm-1589
PLT-171 MM-1589 New add channel modal using react-bootstrap.
2015-09-14 16:57:54 -07:00
Christopher Speller
0ea0233c50 New add channel modal using react-bootstrap. 2015-09-14 13:56:58 -04:00
=Corey Hulen
714f47e015 Merge branch 'master' into PLT-12 2015-09-11 09:59:32 -07:00
Asaad Mahmood
ae8e9c3dfd Updating UI for modals and notification bar 2015-09-11 11:41:16 +05:00
=Corey Hulen
41439eb801 Cleaning up html 2015-09-10 15:44:14 -07:00
=Corey Hulen
8bf35081c8 PLT-12 UI framework for admin console 2015-09-10 14:56:37 -07:00
=Corey Hulen
48ca3a4007 Adding initial admin console html pages 2015-09-03 13:38:22 -07:00
Christopher Speller
f79eea1854 Moving config.js to /web/react/utils/ Including in every file needed 2015-09-02 16:49:32 -04:00
Christopher Speller
4ff1e95676 Merge pull request #494 from rgarmsen2295/mm-1628
MM-1628 The navbar is no longer completely obscured by the status bar in full screen safari on iOS
2015-08-31 09:03:56 -04:00
Corey Hulen
a26b486ba2 Merge pull request #512 from mattermost/mm-1870
MM-1870 Creating local version of fonts retrieved from Google with compatibility with all browsers.
2015-08-28 07:32:01 -07:00
Christopher Speller
75af5d4536 Merge pull request #496 from mattermost/mm-2015
MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
2015-08-28 09:14:37 -04:00
Christopher Speller
53ee786a8b Creating local version of fonts retrieved from Google with compatibility
with all browsers.
2015-08-28 08:44:29 -04:00
JoramWilander
f5fec3a157 Added the ability to create a team with SSO services and added the ability to turn off email sign up. 2015-08-28 08:37:55 -04:00
Corey Hulen
c64ad4970a Revert "MM-1870 Creating local version of fonts retrieved from Google" 2015-08-27 16:08:43 -07:00
Reed Garmsen
192c82772b When viewing the site on iOS from the home screen, the top of the screen is no longer obscured by the phone's status bar 2015-08-27 09:32:30 -07:00
Christopher Speller
187ce1487e Creating local version of fonts retrieved from Google 2015-08-27 09:45:42 -04:00
=Corey Hulen
291c3b8b3d Fixes mm-1991 Allow ability to white label 2015-08-24 12:12:25 -07:00
nickago
aaa0bb9d4d Added help text to profile picture screen 2015-08-21 08:09:02 -07:00
Christopher Speller
a7e935af9c Cosmetic refactoring for ESLint 2015-08-19 08:53:52 -04:00
Reed Garmsen
912ca8e8dd Changed location of file upload overlay 2015-08-13 12:07:32 -07:00
Reed Garmsen
9f9d93e613 Switched to using the jquery-dragster library to implement more consistent drag and drop support, rather than using the inconsistent html5 implementation 2015-08-12 12:29:57 -07:00
Christopher Speller
48df0037a2 Merge pull request #329 from asaadmahmoodspin/ui-changes
UI Improvements
2015-08-06 10:23:04 -04:00
Asaad Mahmood
77f52da255 UI Improvements 2015-08-04 19:12:20 +05:00
Reed Garmsen
5ca628dfc3 Fixed typo on landing page for sign-up 2015-08-03 12:04:19 -07:00
Christopher Speller
6222d2cb30 Fixing links for signup from team invite link. Enter now advances signup_user_complete screen. Signin now link now redirects properly. 2015-07-30 08:53:20 -04:00
JoramWilander
ff362b7792 updates to sign-up flow, remove company name and marketing checkbox 2015-07-28 11:36:33 -04:00
Asaad Mahmood
120ca01662 Signup Ui changes 2015-07-28 11:31:15 -04:00
Christopher Speller
ec2e61bc55 Merge pull request #253 from nickago/MM-1654
MM-1654 Anti-clickjacking measures
2015-07-28 10:03:10 -04:00
nickago
ed70db1861 When user is removed, a modal appears, which on closing redirects the
user to town square.
2015-07-27 14:07:23 -07:00
nickago
c0d225c6d8 Removed ability to place MM in an iframe 2015-07-24 13:50:56 -07:00
Corey Hulen
a9d48ff994 Merge pull request #237 from mattermost/mm-1570
fixes mm-1570 adds support for using mattermost as an OAuth client
2015-07-23 09:21:14 -08:00
JoramWilander
56a0a7d1e1 only show gitlab signup/login links if gitlab oauth is turned on 2015-07-22 15:32:39 -04:00
Reed Garmsen
b3b0133930 Adding back Access History and Active Devices 2015-07-22 20:11:40 +05:00