summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* daily translations 20160518 (#3050)enahum2016-05-196-72/+152
|
* Multiple UI Improvements (#3038)Asaad Mahmood2016-05-1915-45/+84
|
* Updated our fork of marked and added more links to test-links.md (#3047)Harrison Healey2016-05-193-112/+89
|
* Added /shortcuts (#3048)David Lu2016-05-193-0/+70
| | | | | | | | | | | Added message and tests Remember that lower vs uppercase matters Accidentally removed \n Added more Formatted
* Integrations: Enable <!channel> notifications in incoming webhooks (#3039)Thomas Balthazar2016-05-182-0/+111
|
* Move away from the "andForget" style of function (#3046)Thomas Balthazar2016-05-188-426/+405
| | | | | This is the second and last part of the refactoring. First part is documented here: https://github.com/mattermost/platform/pull/3043
* PLT-1909 Fixed error rendering pending posts (#3041)Harrison Healey2016-05-184-5/+6
| | | | | | * Fixed error caused by checking if a post is a system message * Fixed trying to edit system posts when using the up arrow hotkey
* Move away from the "andForget" style of function (#3043)Thomas Balthazar2016-05-182-170/+144
| | | | As suggested by @crspeller here: https://github.com/mattermost/platform/pull/3022#issuecomment-220004020
* Moving out javascript driver (#3040)Christopher Speller2016-05-185-1500/+13
|
* daily translations 20160517 (#3030)enahum2016-05-189-80/+760
|
* Send email notification when username changed (#3022)Thomas Balthazar2016-05-185-9/+109
|
* Update copyright year to 2015-2016 (#3034)jasonblais2016-05-181-1/+1
|
* Merge branch 'release-3.0'Christopher Speller2016-05-1712-27/+37
|\
| * Fixing websocket connection=Corey Hulen2016-05-173-8/+8
| |
| * Fixing LDAP issue with Postgres (#3033)Corey Hulen2016-05-176-12/+27
| |
| * Removed check of email signup from creating a team (#3029)Harrison Healey2016-05-171-5/+0
| |
| * PLT-2972 Fix config Desanitaze (#3018)enahum2016-05-171-1/+1
| |
| * PLT-2965 Fix config sanitation (#3005)enahum2016-05-161-1/+1
| |
| * Fix heavy regression on GitLab for version 3.0.0 (#3000)ArthurH2016-05-161-1/+2
| | | | | | Fix regression on GitLab
* | PLT-1909 Removed the ability to edit system posts (#3013)Harrison Healey2016-05-177-3/+28
| | | | | | | | | | | | * 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 Balthazar2016-05-173-4/+161
| | | | | | | | | | | | | | | | | | | | * 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
* | Fix english html links in locs (#3019)enahum2016-05-171-2/+2
| |
* | PLT-2257 Reorganized System Console (#3003)Harrison Healey2016-05-1757-6560/+5683
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reorganized system console * Fixed the names of some components * Fixed timestamp for BrandImageSetting * Fixed merge issues * Updated push notification settings to match master branch * Removed top level setting pages and moved enable Gitlab/LDAP settings onto their respective pages * Re-added restrictDirectMessage setting to system console * Re-added email connection test and fixed some margins * Fixed ESLint errors * Renamed Authentication > Onboarding to Authentication > Email in the system console * Renamed Customization > Whitelabeling to Customization > Custom Branding in System Console * Re-added EnableOpenServer to system console
* | Create ISSUE_TEMPLATE.md (#3012)lfbrock2016-05-161-0/+19
| |
* | Fixed search results to correctly update when search term changes (#3010)Harrison Healey2016-05-161-2/+3
| |
* | PLT-2020 Fix Clicking save without changing your email shows an error ↵enahum2016-05-161-5/+5
| | | | | | | | message (#3008)
* | Refresh login page if server version of client doesn't match browser version ↵Joram Wilander2016-05-164-14/+28
| | | | | | | | of client (#3004)
* | PLT-2784 Channel Navigation Shortcuts (#2979)David Lu2016-05-163-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Completed shortcuts * Fixed up logic * Removed shortcut conflicts * Added code to limit channel navigation within group * Made code conform to user display, fixed minor logic * Completed shortcuts * Fixed up logic * Removed shortcut conflicts * Added code to limit channel navigation within group * Made code conform to user display, fixed minor logic
* | Changed named emoticons to not require surrounding whitespace and added unit ↵Harrison Healey2016-05-162-8/+54
| | | | | | | | tests (#3009)
* | Check team member instead of session for team admin role when ↵Joram Wilander2016-05-166-2/+84
| | | | | | | | updating/deleting channels (#3007)
* | Added CMD+UP for OSX (#2987)David Lu2016-05-162-4/+4
| |
* | Adding compact layout (#2991)Asaad Mahmood2016-05-1616-32/+409
| | | | | | | | | | | | * Adding compact layout * Fixing ESLint error
* | Update Japanese translation to 2016-05-15 (#3002)Ryo ONODERA2016-05-162-14/+65
| |
* | Fix heavy regression on GitLab for version 3.0.0 (#3000)ArthurH2016-05-161-1/+2
| | | | | | Fix regression on GitLab
* | Merge branch 'release-3.0'Christopher Speller2016-05-168-3/+64
|\|
| * Fixing issue with missing user (#2989)Corey Hulen2016-05-124-1/+51
| |
| * Inlcude team Id for fake context for incoming webhooks (#2988)Joram Wilander2016-05-121-0/+2
| |
| * Stopped login code from falling back to LDAP when it's disabled (#2986)Harrison Healey2016-05-122-2/+2
| |
| * Properly updated FilteredUserList when the provided user list is changed (#2983)Harrison Healey2016-05-121-0/+9
| |
* | Added preventDefault to suppress browser-specific shortcuts (#2995)David Lu2016-05-162-0/+2
| |
* | Fix typo in updated email address notification (#2997)lfbrock2016-05-161-1/+1
| |
* | Shorten test-emoticons1.md (#2996)lfbrock2016-05-161-1/+1
| |
* | Cleaning up make test-client. Adding to build. (#2984)Christopher Speller2016-05-137-157/+87
| |
* | Don't build the dependanciesChristopher Speller2016-05-131-3/+3
| |
* | Moving to glideChristopher Speller2016-05-121099-4019/+277713
| |
* | 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.