Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed double join messages (#3059) | David Lu | 2016-05-20 | 2 | -21/+2 |
| | |||||
* | PLT-2664 Split out push notifications from email notifications (#3049) | Joram Wilander | 2016-05-19 | 1 | -177/+206 |
| | | | | | | | | * Split out push and email notification logic, always send push notifications on mention * Add user setting to control push notifications * Minor changeto simplify code | ||||
* | Added /shortcuts (#3048) | David Lu | 2016-05-19 | 2 | -0/+58 |
| | | | | | | | | | | | Added message and tests Remember that lower vs uppercase matters Accidentally removed \n Added more Formatted | ||||
* | Move away from the "andForget" style of function (#3046) | Thomas Balthazar | 2016-05-18 | 7 | -351/+332 |
| | | | | | This is the second and last part of the refactoring. First part is documented here: https://github.com/mattermost/platform/pull/3043 | ||||
* | Move away from the "andForget" style of function (#3043) | Thomas Balthazar | 2016-05-18 | 2 | -170/+144 |
| | | | | As suggested by @crspeller here: https://github.com/mattermost/platform/pull/3022#issuecomment-220004020 | ||||
* | Send email notification when username changed (#3022) | Thomas Balthazar | 2016-05-18 | 1 | -9/+35 |
| | |||||
* | Merge branch 'release-3.0' | Christopher Speller | 2016-05-17 | 4 | -13/+8 |
|\ | |||||
| * | Fixing websocket connection | =Corey Hulen | 2016-05-17 | 3 | -8/+8 |
| | | |||||
| * | Removed check of email signup from creating a team (#3029) | Harrison Healey | 2016-05-17 | 1 | -5/+0 |
| | | |||||
* | | PLT-1909 Removed the ability to edit system posts (#3013) | Harrison Healey | 2016-05-17 | 2 | -0/+17 |
| | | | | | | | | | | | | * Removed the ability to edit system posts * Added increased timeout to SpinnerButton unit tests | ||||
* | | PLT-2188 Integrations: Support raw new lines in the text payload (#2993) | Thomas Balthazar | 2016-05-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | * Integrations: Support raw new lines in the text payload * Improve support for raw new lines in text payload The regexp used to escape control characters now also searches for additional fields: text|fallback|pretext|author_name|title|value | ||||
* | | Check team member instead of session for team admin role when ↵ | Joram Wilander | 2016-05-16 | 2 | -2/+27 |
| | | | | | | | | updating/deleting channels (#3007) | ||||
* | | Merge branch 'release-3.0' | Christopher Speller | 2016-05-16 | 4 | -2/+8 |
|\| | |||||
| * | Fixing issue with missing user (#2989) | Corey Hulen | 2016-05-12 | 1 | -0/+4 |
| | | |||||
| * | Inlcude team Id for fake context for incoming webhooks (#2988) | Joram Wilander | 2016-05-12 | 1 | -0/+2 |
| | | |||||
| * | Stopped login code from falling back to LDAP when it's disabled (#2986) | Harrison Healey | 2016-05-12 | 2 | -2/+2 |
| | | |||||
* | | Moving to glide | Christopher Speller | 2016-05-12 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'release-3.0' | Christopher Speller | 2016-05-12 | 5 | -17/+27 |
|\| | |||||
| * | Improved handling of edge case where an LDAP user shares a username with a ↵ | Harrison Healey | 2016-05-12 | 1 | -2/+5 |
| | | | | | | | | non-LDAP user (#2980) | ||||
| * | Improve incoming webhook slack compatibility (#2972) (#2973) | thoemy | 2016-05-12 | 1 | -3/+3 |
| | | | | | | | | By checking for form urlencoded content instead of JSON, requests without or with a wrong Content-Type header and a JSON body are correctly parsed. | ||||
| * | Fix parsing attachment field links into markdown (#2958) (#2959) | thoemy | 2016-05-12 | 1 | -4/+4 |
| | | | | | | Field contents are stored in 'value' not 'text'. | ||||
| * | PLT-2905 fixing upgrade of SSO accounts (#2962) | Corey Hulen | 2016-05-11 | 5 | -15/+22 |
| | | | | | | | | | | | | * PLT-2905 fixing upgrade of SSO accounts * Fixing multiple Auths mapped to different emails | ||||
* | | Fix parsing attachment field links into markdown (#2958) (#2959) | thoemy | 2016-05-12 | 1 | -4/+4 |
| | | | | | | Field contents are stored in 'value' not 'text'. | ||||
* | | Improve incoming webhook slack compatibility (#2972) (#2973) | thoemy | 2016-05-12 | 1 | -3/+3 |
| | | | | | | | | By checking for form urlencoded content instead of JSON, requests without or with a wrong Content-Type header and a JSON body are correctly parsed. | ||||
* | | Merge branch 'release-3.0' | Christopher Speller | 2016-05-11 | 2 | -21/+4 |
|\| | |||||
| * | Fixing compliance reporting (#2964) | Corey Hulen | 2016-05-11 | 1 | -1/+1 |
| | | |||||
| * | Removing export route (#2955) | Christopher Speller | 2016-05-11 | 1 | -20/+0 |
| | | |||||
| * | PLT-2806 sending websocket when adding user to team (#2953) | Corey Hulen | 2016-05-10 | 1 | -0/+3 |
| | | | | | | | | | | | | * PLT-2806 sending websocket when adding user to team * Fixing config file | ||||
* | | PLT-2674 Private Group should not have Leave option when only one member ↵ | enahum | 2016-05-10 | 2 | -2/+15 |
|/ | | | | remains (#2888) | ||||
* | PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937) | Harrison Healey | 2016-05-09 | 2 | -4/+22 |
| | | | | | | * Added ldap_only parameter for login API * Re-added LDAP login boxes as part of signup flow | ||||
* | Recent mention searches now OR terms instead of AND (#2931) | Joram Wilander | 2016-05-09 | 4 | -30/+43 |
| | |||||
* | PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON ↵ | Harrison Healey | 2016-05-06 | 1 | -1/+1 |
| | | | | | | | | string (#2914) * Removed unused channelId and userId parameters from web client getPublicLink method * Changed getPublicLink api call to return a proper JSON string | ||||
* | PLT-2697 Fixing team admins (#2900) | Corey Hulen | 2016-05-06 | 5 | -31/+208 |
| | | | | | | | | | | | | * PLT-2697 Fixing team admins * Fixing eslint error * Fixing loc issues * Fixing func * Fixing func | ||||
* | Add separator between DMs on your team and not (#2910) | Joram Wilander | 2016-05-06 | 1 | -0/+4 |
| | |||||
* | Fixing /logout command (#2908) | Christopher Speller | 2016-05-06 | 3 | -13/+14 |
| | |||||
* | Multiple cross-team functionality fixes (#2902) | Joram Wilander | 2016-05-06 | 2 | -3/+8 |
| | |||||
* | Allow system admins to switch user accounts to email/password (#2893) | Joram Wilander | 2016-05-05 | 2 | -5/+1 |
| | |||||
* | PLT-2600/PLT-2770 Added Get Public Link modal and added new API for public ↵ | Harrison Healey | 2016-05-05 | 5 | -226/+302 |
| | | | | | | | | file links (#2892) * Switched public file links to use a GetLinkModal * Separated getFile and the new getPublicFile api calls | ||||
* | PLT-2707 Adding option to show DM list from all of server (#2871) | Corey Hulen | 2016-05-04 | 3 | -4/+62 |
| | | | | | | * PLT-2707 Adding option to show DM list from all of server * Fixing loc | ||||
* | Sanitize sensitive data of out config file for the system console (#2849) | Joram Wilander | 2016-05-03 | 2 | -11/+40 |
| | |||||
* | PLT-2258 Unified login screen and related APIs (#2820) | Harrison Healey | 2016-05-03 | 10 | -236/+224 |
| | | | | | | | | | | | | | | | | | | | | * Unified login screen and related APIs * Refactored login API call to be less convoluted * Removed LDAP login prompt from invite process * Fixed existing LDAP users being able to log in if LDAP was configured, but disabled * Gofmt * Future proofed login API * Updated login APIs based on feedback * Added additional auditing to login API * Actually removed loginById | ||||
* | Fixed typo (#2862) | Arif Usman | 2016-05-03 | 1 | -3/+3 |
| | |||||
* | Added query escaping to emails (#2867) | David Lu | 2016-05-03 | 1 | -3/+3 |
| | |||||
* | Port HPNS from 2.2 to master (#2863) | Joram Wilander | 2016-05-03 | 1 | -43/+48 |
| | |||||
* | Fixing edit direct channel header (#2842) | Christopher Speller | 2016-05-02 | 3 | -13/+20 |
| | |||||
* | Fixing cookie | =Corey Hulen | 2016-04-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform | =Corey Hulen | 2016-04-28 | 5 | -12/+44 |
|\ | |||||
| * | Fixing slack import. (#2819) | Christopher Speller | 2016-04-28 | 3 | -8/+31 |
| | | |||||
| * | Don't return error if already part of channel being joined (#2814) | Joram Wilander | 2016-04-28 | 2 | -4/+13 |
| | | |||||
* | | Fixing cookie | =Corey Hulen | 2016-04-28 | 1 | -0/+6 |
|/ |