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

79 Коммитов

Автор SHA1 Сообщение Дата
Joram Wilander
2322a7c74e Merge pull request #793 from hmhealey/plt367
PLT-367 Added a json response to the uploadProfileImage api call
2015-09-25 10:22:27 -04:00
JoramWilander
84763e9bde Added welcome email back in. 2015-09-25 08:19:05 -04:00
hmhealey
7bb384b92d Added a json response to the uploadProfileImage api call 2015-09-24 16:47:34 -04:00
=Corey Hulen
00112cae51 Assiging first user system_admin role 2015-09-23 15:52:59 -07:00
=Corey Hulen
985aebf861 Fixing state setting 2015-09-23 15:16:48 -07:00
=Corey Hulen
7f3bfdbe0c Fixing merge 2015-09-23 14:38:34 -07:00
=Corey Hulen
ccf2e6e4e7 Changing image settings to file settings 2015-09-23 13:47:10 -07:00
=Corey Hulen
2b5b8f95ed Merge branch 'master' into PLT-11-email 2015-09-23 12:55:58 -07:00
=Corey Hulen
1626a6de6f PLT-349 adding team mgt to admin console 2015-09-23 12:49:28 -07: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
=Corey Hulen
08a3acbb44 Adding team settings to admin console 2015-09-22 01:15:41 -07:00
=Corey Hulen
afcff9b301 Fixing unit tests 2015-09-21 20:38:31 -07:00
=Corey Hulen
0529a494ae Adding image properties 2015-09-21 17:34:13 -07:00
=Corey Hulen
ed9a2da83b Adding email to admin console 2015-09-21 15:11:56 -07:00
hmhealey
4005d8bfd0 Updated godep workspace and freetype library so that godep save and restore work again 2015-09-17 11:10:06 -04:00
JoramWilander
47e6a33a45 Implement OAuth2 service provider functionality. 2015-09-16 15:49:12 -04:00
=Corey Hulen
b2a679c25d PLT-93 cleaing up client side configs 2015-09-15 18:59:14 -07:00
=Corey Hulen
e5e88d1604 Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN 2015-09-11 09:39:28 -07:00
=Corey Hulen
83b04181da merging 2015-09-10 15:15:04 -07:00
=Corey Hulen
8bf35081c8 PLT-12 UI framework for admin console 2015-09-10 14:56:37 -07:00
hmhealey
7a9e709bd2 Removed pointless attempt to verify a new user's username 2015-09-09 18:42:28 -04:00
=Corey Hulen
e54d0da392 Adding unit tests for cmd line 2015-09-04 16:56:18 -07:00
=Corey Hulen
58d0d9afd2 Adding cmd line options 2015-09-04 11:59:10 -07:00
=Corey Hulen
7de7de6ad0 MM-2056 fixes problem with creating team 2015-08-31 13:33:22 -07: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
Christopher Speller
d78ebab108 Implemention of slack import feature. 2015-08-19 08:52:49 -04:00
Christopher Speller
390cb47ec3 Merge pull request #385 from mattermost/mm-1623
MM-1623 when user roles are updated, the relevant session roles are updated as well
2015-08-18 08:51:57 -04:00
JoramWilander
b068cc1058 when user roles are updated, the relevant session roles are updated as well 2015-08-17 09:28:20 -04:00
JoramWilander
b704e9489b added google sign-in functionality to the client, with minor model modifications 2015-08-14 12:38:16 -04:00
JoramWilander
e27db2ed63 initial server implementation for using google as a single-sign-on oauth service 2015-08-14 12:37:08 -04:00
Corey Hulen
4d1562c5de Merge pull request #273 from mattermost/mm-1355
Fixes mm-1355 adds rate limiting apis
2015-08-02 09:17:37 -08:00
Corey Hulen
faa9bbdf97 Merge pull request #305 from nickago/MM-1681
MM-1681 Fixed regression of static images not displaying in emails
2015-08-02 09:00:30 -08:00
Christopher Speller
ec6d408e29 Merge pull request #303 from nickago/MM-1642
MM-1642 Updated the password error
2015-07-31 11:39:00 -04:00
nickago
bc48281f7a Changed all templates to use site url instead of team url for finding the 'static' directory 2015-07-31 07:57:22 -07:00
Christopher Speller
b7869cdb3c Merge pull request #283 from mattermost/mm-1787
MM-1787 Fixing links for signup from team invite link.
2015-07-31 08:56:24 -04:00
nickago
a41c42c4d4 Updated error message for an incorrect password 2015-07-30 13:54:00 -07:00
Christopher Speller
9cc369b6b6 Removing nickname parameter from FireAndForgetVerifyEmail 2015-07-30 13:42:27 -04: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
=Corey Hulen
b4877c5d36 Fixing code review feedback 2015-07-30 00:46:17 -08:00
Reed Garmsen
f0a60181fe Made font type a field in the config file 2015-07-29 14:06:15 -07:00
Reed Garmsen
876a9f642a Changed text initial size and positioning to better handle different image sizes and removed dead code 2015-07-29 13:47:37 -07:00
Reed Garmsen
965833a737 Added godeps and the source for the go freetype library 2015-07-29 11:58:51 -07:00
=Corey Hulen
9677a9f717 Fixes mm-1355 adds rate limiting apis 2015-07-29 01:26:10 -08:00
Reed Garmsen
376ce3c4b0 Added back username initials being included in default profile picture 2015-07-28 16:55:13 -07:00
Reed Garmsen
3c1eefe984 Initial changes to putting initials on default profile pics 2015-07-28 11:36:50 -07:00
JoramWilander
d42d0e3467 added store unit test for user.GetByAuth and added password length checking in api.login 2015-07-23 08:19:51 -04:00
JoramWilander
dd970604d1 add check on server to prevent password updating for users who log in through oauth 2015-07-22 15:36:58 -04:00
JoramWilander
41bbbbf446 add changes from team review 2015-07-22 15:05:20 -04:00
JoramWilander
44cfa364fd added error case for login and removed authdata + authservice unique constraint in users table 2015-07-22 12:42:03 -04:00