Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 2 | -4/+4 | |
| |\ | | | | | | | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | |||||
| | * | Added the ability to get more channel members from getChannelExtraInfo | hmhealey | 2016-01-06 | 2 | -4/+4 | |
| | | | ||||||
* | | | adding different commands | =Corey Hulen | 2016-01-09 | 1 | -0/+1 | |
| | | | ||||||
* | | | Adding web service methods | =Corey Hulen | 2016-01-08 | 3 | -2/+42 | |
| | | | ||||||
* | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 5 | -22/+111 | |
| | | | ||||||
* | | | PLT-1429 adding sql storage for slash commands | =Corey Hulen | 2016-01-06 | 2 | -29/+182 | |
|/ / | ||||||
* | | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 2 | -14/+31 | |
|\ \ | |/ |/| | PLT-1558 adding session length to config file | |||||
| * | Adding UI for session length settings | =Corey Hulen | 2016-01-05 | 1 | -8/+1 | |
| | | ||||||
| * | PLT-1558 adding session length to config file | =Corey Hulen | 2016-01-05 | 2 | -14/+38 | |
| | | ||||||
* | | PLT-1485 Adding last view channel sticky | =Corey Hulen | 2016-01-05 | 1 | -0/+3 | |
|/ | ||||||
* | Merge pull request #1745 from mattermost/plt-1118 | Christopher Speller | 2016-01-04 | 2 | -0/+25 | |
|\ | | | | | PLT-1118 Add ability to switch between SSO and email account | |||||
| * | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 2 | -0/+25 | |
| | | ||||||
* | | Merge pull request #1770 from mattermost/GIT-1766 | Christopher Speller | 2016-01-04 | 1 | -1/+1 | |
|\ \ | | | | | | | GIT-1766 fixing typo | |||||
| * | | GIT-1766 fixing typo | =Corey Hulen | 2015-12-23 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #1763 from benburkert/non-s3-region | Christopher Speller | 2016-01-04 | 1 | -15/+29 | |
|\ \ | | | | | | | support unofficial S3 regions | |||||
| * | | support unofficial S3 regions | Ben Burkert | 2015-12-21 | 1 | -15/+29 | |
| |/ | | | | | | | Adds support for S3 clones like Ceph. | |||||
* | | Fixed TestGetFile unit test | hmhealey | 2015-12-18 | 2 | -1/+13 | |
| | | ||||||
* | | Added additional information to getFileInfo api call | hmhealey | 2015-12-18 | 2 | -0/+136 | |
|/ | ||||||
* | Some refactoring | Christopher Speller | 2015-12-16 | 3 | -7/+71 | |
| | ||||||
* | Merge pull request #1710 from mattermost/plt-1498 | Christopher Speller | 2015-12-16 | 2 | -3/+27 | |
|\ | | | | | PLT-1498 Add hashtag testing and allow special german characters | |||||
| * | Add hashtag testing and allow special german characters | JoramWilander | 2015-12-11 | 2 | -3/+27 | |
| | | ||||||
* | | Adding error bar message when console error detected | =Corey Hulen | 2015-12-14 | 1 | -0/+6 | |
| | | ||||||
* | | Merge pull request #1720 from rgarmsen2295/plt-860 | Harrison Healey | 2015-12-14 | 3 | -6/+6 | |
|\ \ | | | | | | | PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+' | |||||
| * | | Fixing issues caused by changing test emails | Reed Garmsen | 2015-12-13 | 2 | -2/+2 | |
| | | | ||||||
| * | | Updated emails in unit tests to include '+' | Reed Garmsen | 2015-12-13 | 2 | -5/+5 | |
| |/ | ||||||
* | | Merge pull request #1588 from rgarmsen2295/plt-881 | Joram Wilander | 2015-12-12 | 1 | -0/+39 | |
|\ \ | |/ |/| | PLT-881 Adds Legal and Support Settings to the System Console | |||||
| * | Added legal and support settings to sys console and implemented support for ↵ | Reed Garmsen | 2015-12-10 | 1 | -0/+39 | |
| | | | | | | | | options in app | |||||
* | | Merge pull request #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 1 | -8/+9 | |
|\ \ | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists | |||||
| * | | Added preference_changed web socket event | hmhealey | 2015-12-07 | 1 | -8/+9 | |
| | | | ||||||
* | | | Fixed issue with Team Settings modal saving items instead of cancelling; ↵ | Reed Garmsen | 2015-12-10 | 5 | -5/+5 | |
| | | | | | | | | | | | | changed remaining copyrights | |||||
* | | | Merge pull request #1688 from mattermost/fix-salts | Christopher Speller | 2015-12-10 | 3 | -0/+38 | |
|\ \ \ | | | | | | | | | Generate salts when empty | |||||
| * | | | Fixing unit test | =Corey Hulen | 2015-12-09 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | Generate salts when empty | =Corey Hulen | 2015-12-09 | 3 | -0/+41 | |
| | | | | ||||||
* | | | | Updating version to 1.3.0 | Christopher Speller | 2015-12-09 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Fixing defaults | =Corey Hulen | 2015-12-08 | 1 | -2/+2 | |
| | | | ||||||
* | | | PLT-1302 fixing hiding email adddress | =Corey Hulen | 2015-12-07 | 1 | -0/+8 | |
|/ / | ||||||
* | | PLT-1380: Post system message when user updates channel header | Florian Orben | 2015-12-04 | 1 | -1/+2 | |
| | | ||||||
* | | PLT-1326: Enable channel posts of type join or leave not trigger unread ↵ | Florian Orben | 2015-12-04 | 2 | -3/+23 | |
| | | | | | | | | notifications | |||||
* | | Add limit to Props size in Post table | JoramWilander | 2015-12-03 | 1 | -0/+4 | |
| | | ||||||
* | | Merge pull request #1556 from npcode/sso-github-ent | Joram Wilander | 2015-12-02 | 1 | -1/+6 | |
|\ \ | |/ |/| | Make the Gitlab SSO Support compatible with Github Enterprise | |||||
| * | Make the Gitlab SSO Support compatible with Github Enterprise | Yi EungJun | 2015-12-02 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | See doc/integrations/Single-Sign-On/Github.md for the usage. Note: I thought it should work also with Github.com but it failed with "Bad token type" error. | |||||
* | | PLT-902 switching to push proxy server | =Corey Hulen | 2015-11-30 | 3 | -5/+77 | |
|/ | ||||||
* | add unit tests | Florian Orben | 2015-11-27 | 1 | -0/+1 | |
| | ||||||
* | upgrading libs | =Corey Hulen | 2015-11-23 | 2 | -2/+2 | |
| | ||||||
* | PLT-1087: return NewAppError instead of nil | Wim | 2015-11-19 | 1 | -1/+1 | |
| | ||||||
* | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-16 | 1 | -0/+1 | |
|\ | ||||||
| * | Updating version to 1.2.1 | Christopher Speller | 2015-11-16 | 1 | -0/+1 | |
| | | ||||||
* | | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵ | hmhealey | 2015-11-12 | 1 | -2/+3 | |
| | | | | | | | | we truncate the list of members to 20 | |||||
* | | Merge pull request #1396 from 42wim/useractivity | Joram Wilander | 2015-11-11 | 1 | -1/+0 | |
|\ \ | | | | | | | Do not clear LastActivityAt for GetProfiles | |||||
| * | | Do not clear LastActivityAt for GetProfiles | Wim | 2015-11-11 | 1 | -1/+0 | |
| | | |