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

343 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
463fd8c20b Add the ability to switch from email to ldap and back 2016-03-23 15:59:58 -04:00
Joram Wilander
2cf2c36d1e Merge pull request #2493 from mattermost/plt-1840
PLT-1840 Better build system.
2016-03-21 12:40:21 -04:00
Christopher Speller
a0a102d26b Redo of makefile. Build files no longer need to be modified for enterprise builds. 2016-03-21 09:31:47 -04:00
Christopher Speller
35320efe1a Revert "PLT-2183 Slash command auto-complete" 2016-03-18 13:16:51 -04: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
5273559ca1 Fixing merge 2016-03-17 09:51:45 -07:00
Elias Nahum
1f5c8c4e4e Option to enable full snippets in push notifications 2016-03-17 13:20:17 -03:00
Christopher Speller
a6a9dd7691 Merge pull request #2462 from mattermost/plt-2340
PLT-2340 Webpack optimizations and fixes
2016-03-17 12:04:51 -04:00
Christopher Speller
fdc3207724 Webpack optimizations and fixes 2016-03-17 11:32:06 -04:00
=Corey Hulen
b9d5b4e5dc merging files 2016-03-16 18:13:16 -07:00
Nicolas Clerc
7cb817d5a7 fix TestListCommands 2016-03-17 01:45:37 +01:00
Nicolas Clerc
5e2596598f add external slashcommands management 2016-03-17 01:45:37 +01:00
Joram Wilander
809779a87f Merge pull request #2451 from mattermost/PLT-2344
PLT-2344 support 3 versions back
2016-03-16 18:25:13 -04:00
Christopher Speller
12896bd23e Converting to Webpack. Stage 1. 2016-03-16 18:02:55 -04:00
=Corey Hulen
64f9b7ec08 PLT-2344 support 3 versions back 2016-03-16 09:38:35 -07:00
=Corey Hulen
36b17bf99d PLT-2115 Adding compliance 2016-03-15 18:27:45 -07:00
=Corey Hulen
ea3f25924e Merge branch 'master' into PLT-2115 2016-03-14 10:23:51 -07:00
Christopher Speller
bf7ae07117 Merge branch 'release-2.1' 2016-03-14 07:17:31 -04:00
Christopher Speller
d7cdcf082f Convering client to react-router. 2016-03-14 00:38:25 -04:00
=Corey Hulen
6fa6ea0af5 PLT-2115 adding compliance interfaces 2016-03-11 16:53:32 -08:00
=Corey Hulen
6d21a339dc PLT-2115 adding compliance feature to enterprise 2016-03-10 09:39:05 -08:00
Mattermost Build
b305e03ab5 Bumping version to: 2.1.0-rc1 2016-03-09 20:31:44 +00:00
Harrison Healey
cd4172bfd8 Stopped removing *s from the end of search phrases 2016-03-04 10:05:11 -05:00
Elias Nahum
81f97ebc88 Add default value to AllowCorsFrom setting 2016-03-01 14:17:29 -03:00
Elias Nahum
ba6a38a7f6 Allow CORS 2016-03-01 13:00:54 -03:00
JoramWilander
6e9bc1ef8f Make sure the GitLab user has the required fields 2016-02-12 23:44:29 -05:00
Christopher Speller
ab63eca6e8 Fixing version unit test 2016-02-09 16:22:52 -05:00
Christopher Speller
c5b92d9e85 Updating version.go for 2.0 2016-02-09 15:59:38 -05:00
JoramWilander
9f5f18a93a Make insecure TLS connections configurable 2016-02-05 12:40:32 -05:00
Corey Hulen
af6ade3380 Merge pull request #2073 from mattermost/ee-updates
Some general updates to EE
2016-02-04 13:01:14 -08:00
Christopher Speller
ec51c31c32 Merge pull request #2064 from hmhealey/plt882
PLT-882 Ephemeral Messages and Out-Of-Channel mentions
2016-02-04 14:50:30 -05:00
JoramWilander
e45282deaa Move license storage to database 2016-02-04 13:35:44 -05:00
hmhealey
70c3715b96 Changed how posts are marked ephemeral 2016-02-04 11:38:58 -05:00
hmhealey
fcb92fa1b5 Added ephemeral messages sent when a user mentions someone not in the channel 2016-02-04 11:38:56 -05:00
=Corey Hulen
dffc5323ec PLT-1429 Fixing code review comments 2016-02-04 08:03:42 -08:00
=Corey Hulen
4da7b0ccbd Fixing based on feedback 2016-02-03 12:16:37 -08:00
=Corey Hulen
bdfa4715d6 Merge branch 'master' into PLT-1429 2016-02-03 10:45:58 -08:00
Christopher Speller
75f412c4be Merge pull request #2049 from mattermost/plt-1856
PLT-1856 Add basic server audit tab to system console for EE
2016-02-03 08:52:18 -05:00
=Corey Hulen
581785f504 Fixing version 2016-02-02 16:24:03 -08:00
JoramWilander
d153d661db Add basic server audit tab to system console for EE 2016-02-02 16:49:27 -05:00
Reed Garmsen
b013f02209 Added ability to sign in via username; separated email sign in and sign up config settings 2016-02-02 12:07:42 -08:00
=Corey Hulen
27586a320a Adding loc to new command backend 2016-02-01 18:52:43 -08:00
=Corey Hulen
b4ec690051 Fixing merge 2016-02-01 14:44:17 -08:00
=Corey Hulen
2138b46f6c PLT-1765 allowing support of 2 previous versions 2016-01-28 11:39:48 -05:00
=Corey Hulen
c50b8661ec Fixing build 2016-01-27 11:05:46 -05:00
=Corey Hulen
dc4b71bba2 PLT-7 Removing AppError ctor 2016-01-27 10:56:15 -05:00
Christopher Speller
f0e6e7de93 Merge pull request #1993 from mattermost/PLT-1586
PLT-1586 adding LDAP/OAuth to iOS
2016-01-27 09:22:27 -05:00
=Corey Hulen
0dec26bb9f Fixing version 2016-01-26 21:11:39 -05:00
=Corey Hulen
c2bc9454ce PLT-1586 adding attach device id method 2016-01-26 20:32:24 -05:00
hmhealey
97ede2a428 Updated serverside hashtag regex to ignore more punctuation around words 2016-01-26 10:20:36 -05:00