summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updating go depencancies. Switching to go1.6 vendoring (#2949)Christopher Speller2016-05-12694-10967/+109149
|
* Merge branch 'release-3.0'Christopher Speller2016-05-1228-274/+419
|\
| * Stopped supressing LDAP user filtered error on clientside (#2981)Harrison Healey2016-05-121-2/+1
| |
| * Improved handling of edge case where an LDAP user shares a username with a ↵Harrison Healey2016-05-121-2/+5
| | | | | | | | non-LDAP user (#2980)
| * Improve incoming webhook slack compatibility (#2972) (#2973)thoemy2016-05-121-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)thoemy2016-05-122-4/+9
| | | | | | Field contents are stored in 'value' not 'text'.
| * PLT-2927/PLT-2924 Fixing issues with integration lists (#2974)Harrison Healey2016-05-126-79/+116
| | | | | | | | | | | | | | | | * Changed IntegrationStore to store integrations by team * Fixed regenerating a command's token not causing the UI to update * Re-added IntegrationStore.hasReceived methods
| * Fix incorrect password error with MFA enabled (#2977)Joram Wilander2016-05-121-0/+1
| |
| * Add missing locs (#2971)enahum2016-05-122-2/+4
| |
| * Improving compliance stuff (#2963)Asaad Mahmood2016-05-117-130/+169
| | | | | | | | | | | | * Improving compliance stuff * Fixing padding on mobile
| * Propose changing "Other teams" to "Outside this team" (#2969)it332016-05-112-2/+2
| | | | | | | | | | | | * Update sidebar.jsx * Added "Outside this team"
| * PLT-2905 fixing upgrade of SSO accounts (#2962)Corey Hulen2016-05-1112-56/+122
| | | | | | | | | | | | * PLT-2905 fixing upgrade of SSO accounts * Fixing multiple Auths mapped to different emails
* | Fix parsing attachment field links into markdown (#2958) (#2959)thoemy2016-05-122-4/+9
| | | | | | Field contents are stored in 'value' not 'text'.
* | Updating client dependancies and ESLint (#2954)Christopher Speller2016-05-1269-791/+762
| | | | | | | | | | | | | | | | * Updating client dependancies * Fixing eslint errors with updates * Updating eslint
* | PLT-2786 Open Account Settings/Recent Mentions Shortcuts (#2957)David Lu2016-05-123-2/+19
| | | | | | | | | | | | | | | | * Account settings shortcut added * Added constants * Added recent mentions shortcut
* | PLT-2783 Reprint Last Message Entered Shortcut (#2966)David Lu2016-05-122-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | * added preliminary code * added comment code * semicolons are important * compatible with slash commands * too many semicolons
* | PLT-2755 Shortcut to upload file (#2967)David Lu2016-05-121-1/+4
| | | | | | | | | | | | | | | | | | | | * wrong ref * Changed back to CTRL+U * Fixed scope of fileUpload * Removed stray comma
* | Remove old tests from syntax-highlighting.md (#2970)lfbrock2016-05-121-51/+0
| |
* | Improve incoming webhook slack compatibility (#2972) (#2973)thoemy2016-05-121-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.
* | Fixed loginByUsername unit test (#2975)Harrison Healey2016-05-122-8/+7
| | | | | | | | | | | | * Fixed loginByUsername unit test * Removed unused variable from WebClient login functions
* | grammar fix (#2976)goofy-bz2016-05-121-1/+1
| | | | | | Note it is a very "visible" grammar error for the French user, and it is in the confirmation mail after team creation. Though it may seem a minor issue we wish it can be corrected asap because we just started our "Framateam" project based on mattermost https://framateam.org/ - TIA
* | Merge branch 'release-3.0'Christopher Speller2016-05-1112-37/+35
|\|
| * Pull direct profiles when switching teams (#2965)Joram Wilander2016-05-111-0/+7
| |
| * Fixing compliance reporting (#2964)Corey Hulen2016-05-112-2/+2
| |
| * Fixing email invite link handling (#2956)Christopher Speller2016-05-111-2/+8
| |
| * Removing export route (#2955)Christopher Speller2016-05-111-20/+0
| |
| * Fixed username restriction display errors (#2952)David Lu2016-05-113-7/+5
| |
| * Fix compliance saving and reload page when enabling/disabling compliance (#2960)Joram Wilander2016-05-101-2/+6
| |
| * Fixing DM separator and margin on system console (#2944)Asaad Mahmood2016-05-102-2/+3
| | | | | | Fixing margins on system console
| * PLT-2806 sending websocket when adding user to team (#2953)Corey Hulen2016-05-101-0/+3
| | | | | | | | | | | | * PLT-2806 sending websocket when adding user to team * Fixing config file
| * Fixing configuration file (#2948)Christopher Speller2016-05-101-2/+1
| |
* | PLT-2674 Private Group should not have Leave option when only one member ↵enahum2016-05-106-17/+42
| | | | | | | | remains (#2888)
* | Added 'here' to list of reserved usernames (#2933)David Lu2016-05-101-1/+2
| |
* | Update test-search.md to fix spelling error (#2939)lfbrock2016-05-101-1/+1
|/
* PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937)Harrison Healey2016-05-096-23/+234
| | | | | | * Added ldap_only parameter for login API * Re-added LDAP login boxes as part of signup flow
* Add spanish locs, sort by id en & es files (#2938)enahum2016-05-094-5/+16
|
* PLT-2842 Fix "Invite teammates" link not working in tutorial screen. (#2936)enahum2016-05-091-6/+4
|
* Recent mention searches now OR terms instead of AND (#2931)Joram Wilander2016-05-0912-43/+78
|
* Add <meta> tag to force latest version of IE (#2837)Jonny Buchanan2016-05-091-0/+1
|
* PLT-2814 Fixed JavaScript errors upon paste (#2932)David Lu2016-05-091-10/+9
| | | | | | | | | | | | * Fixed JavaScript errors on paste * Reverted keycode * Removed all mentions of self * Find and replace got a comment * Fixed file upload on drag and drop
* Improvements to system console and DM modal (#2930)Asaad Mahmood2016-05-097-26/+61
| | | | | | | Fixing audit and compliance table Changing prop Minor improvement to the DM modal
* DM and Modal changes (#2927)Asaad Mahmood2016-05-098-35/+69
| | | | | | * DM and Modal changes * Fixing image previews
* Minor fix to refresh profiles in user list of system console (#2915)Joram Wilander2016-05-091-18/+3
|
* PLT-2816 Fixed handling of Unicode 8 emojis (#2924)Harrison Healey2016-05-099-18/+57
| | | | | | | | | | | | * Updated twemoji to properly recognize Unicode 8.0 emojis * Updated unicode emoji parser to only render emojis we support as images * Corrected filename for South African flag emoji * Added Mattermost emoticons! * Added additional emoticons to test files
* Update Japanese translation (#2919)MARUYAMA Takayuki2016-05-092-36/+153
| | | | * fix some mistranslation * add latest translations
* Added missing pt locs (#2926)Rodrigo2016-05-092-4/+35
|
* Adding additional libraries (#2922)it332016-05-091-1/+2382
| | | | | | * Adding additional libraries * Adding rsc mention
* PLT-2765 Limit username UI to 22 characters (#2918)David Lu2016-05-097-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | * Shortened username length to 22 characters * Update user_settings_general.jsx * Added username requirements to account settings page * Switched to double quotes to escape ' in JSX, must use double quotes * Update en.json * Update user_settings_general.jsx * Update es.json * Update fr.json * Update ja.json * Update pt.json * Added missing {
* Fixing RHS issue (#2917)Corey Hulen2016-05-061-1/+1
|
* PLT-2600/PLT-2770 Changed getPublicLink api call to return a proper JSON ↵Harrison Healey2016-05-068-25/+28
| | | | | | | | string (#2914) * Removed unused channelId and userId parameters from web client getPublicLink method * Changed getPublicLink api call to return a proper JSON string