Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fixing build | =Corey Hulen | 2016-01-27 | 1 | -1/+1 | |
| | | ||||||
| * | PLT-7 Removing AppError ctor | =Corey Hulen | 2016-01-27 | 1 | -10/+0 | |
| | | ||||||
| * | Merge pull request #1993 from mattermost/PLT-1586 | Christopher Speller | 2016-01-27 | 1 | -0/+11 | |
| |\ | | | | | | | PLT-1586 adding LDAP/OAuth to iOS | |||||
| | * | Fixing version | =Corey Hulen | 2016-01-26 | 1 | -1/+1 | |
| | | | ||||||
| | * | PLT-1586 adding attach device id method | =Corey Hulen | 2016-01-26 | 2 | -1/+12 | |
| | | | ||||||
| * | | Updated serverside hashtag regex to ignore more punctuation around words | hmhealey | 2016-01-26 | 4 | -25/+54 | |
| |/ | ||||||
* | | merging | =Corey Hulen | 2016-01-25 | 16 | -138/+163 | |
|\| | ||||||
| * | Fixed serverside errors occurring when getting files with no extension | hmhealey | 2016-01-25 | 2 | -5/+24 | |
| | | ||||||
| * | PLT-7: Refactoring models to use translations (chunk 6) | Elias Nahum | 2016-01-25 | 15 | -127/+129 | |
| | | | | | | | | - Add spanish translations | |||||
| * | Merge pull request #1956 from mattermost/plt-1779 | Corey Hulen | 2016-01-22 | 2 | -2/+10 | |
| |\ | | | | | | | PLT-1779 Add system-wide statistics page | |||||
| | * | Added unit test and fixed errors | JoramWilander | 2016-01-22 | 1 | -1/+10 | |
| | | | ||||||
| | * | Add create_at back to profile fields to fix analytics | JoramWilander | 2016-01-22 | 1 | -1/+0 | |
| | | | ||||||
* | | | merging | =Corey Hulen | 2016-01-22 | 3 | -9/+54 | |
|\| | | ||||||
| * | | Merge pull request #1924 from loafoe/master | Christopher Speller | 2016-01-21 | 1 | -0/+10 | |
| |\ \ | | |/ | |/| | [#1923] Make Websocket ports configurable | |||||
| | * | Optionally specify ws:// and wss:// port in config | Andy Lo-A-Foe | 2016-01-19 | 1 | -0/+10 | |
| | | | ||||||
| * | | tweaking | =Corey Hulen | 2016-01-20 | 1 | -6/+5 | |
| | | | ||||||
| * | | tweak | =Corey Hulen | 2016-01-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | PLT-7-server-db | =Corey Hulen | 2016-01-20 | 2 | -8/+33 | |
| | | | ||||||
| * | | Fxing version | =Corey Hulen | 2016-01-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | PLT-7 Adding translation function to context | =Corey Hulen | 2016-01-19 | 2 | -2/+11 | |
| |/ | ||||||
* | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 5 | -5/+125 | |
|\| | ||||||
| * | Final updates | JoramWilander | 2016-01-14 | 1 | -3/+20 | |
| | | ||||||
| * | Add some unit tests | JoramWilander | 2016-01-14 | 2 | -1/+35 | |
| | | ||||||
| * | Added license validation and settings | JoramWilander | 2016-01-14 | 1 | -0/+68 | |
| | | ||||||
| * | Merge pull request #1852 from mattermost/PLT-1608 | Joram Wilander | 2016-01-12 | 1 | -1/+1 | |
| |\ | | | | | | | PLT-1608 Upgrading logging package | |||||
| | * | Upgrade logging package | =Corey Hulen | 2016-01-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Release 1.4 rc1 | =Corey Hulen | 2016-01-11 | 1 | -0/+1 | |
| |/ | ||||||
| * | 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 '+' |