IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-27 05:37:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,750 Commits 1,692 Branches 1,583 Tags
f600b1dc2b39ff7b2b3d8450cba43ebb643adddd
Commit Graph
327 Commits
Author SHA1 Message Date
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
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
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
=Corey Hulen ea71731f83 merging 2016-01-25 11:23:55 -05:00
hmhealey 1cd25cf380 Fixed serverside errors occurring when getting files with no extension 2016-01-25 09:51:17 -05:00
Elias Nahum f33cff21cf PLT-7: Refactoring models to use translations (chunk 6) 
- Add spanish translations
 2016-01-25 10:22:12 -03:00
Corey Hulen 1a0b12313b Merge pull request #1956 from mattermost/plt-1779 
PLT-1779 Add system-wide statistics page
 2016-01-22 17:00:09 -06:00
=Corey Hulen c2d98c2c1f merging 2016-01-22 16:31:58 -06:00
JoramWilander 0d239a1a9e Added unit test and fixed errors 2016-01-22 10:19:02 -05:00
JoramWilander bbcf00f02e Add create_at back to profile fields to fix analytics 2016-01-22 09:53:17 -05:00
Christopher Speller c7faefbedc Merge pull request #1924 from loafoe/master 
[#1923] Make Websocket ports configurable
 2016-01-21 10:01:15 -05:00
=Corey Hulen d74e2f3e11 tweaking 2016-01-20 14:53:12 -06:00
=Corey Hulen e70428c1bd tweak 2016-01-20 14:38:17 -06:00
=Corey Hulen 984fa7f1ca PLT-7-server-db 2016-01-20 14:36:34 -06:00
=Corey Hulen 96f8394bf4 Fxing version 2016-01-19 22:03:53 -06:00
=Corey Hulen 8e404c1dcf PLT-7 Adding translation function to context 2016-01-19 22:00:01 -06:00
Andy Lo-A-Foe 6faabe34e8 Optionally specify ws:// and wss:// port in config 2016-01-19 19:41:39 +01:00
=Corey Hulen 6d6cada097 Merge branch 'master' into PLT-1429 2016-01-14 09:08:13 -06:00
JoramWilander c26edcf678 Final updates 2016-01-14 08:24:09 -05:00