IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,348 Commits 845 Branches 1,202 Tags
5ace856e72b23920d9448d4eb11e0bc4ccbf11f0
Commit Graph

6348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Lu
5ace856e72 Added /shortcuts (#3048) 
Added message and tests

Remember that lower vs uppercase matters

Accidentally removed \n

Added more

Formatted
 2016-05-19 07:35:12 -04:00
Thomas Balthazar
4f34730b3f Integrations: Enable <!channel> notifications in incoming webhooks (#3039) 2016-05-18 16:36:01 -04:00
Thomas Balthazar
55f6a0b21c Move away from the "andForget" style of function (#3046) 
This is the second and last part of the refactoring.
First part is documented here:
https://github.com/mattermost/platform/pull/3043
 2016-05-18 16:34:31 -04:00
Harrison Healey
02576f3d59 PLT-1909 Fixed error rendering pending posts (#3041) 
* Fixed error caused by checking if a post is a system message

* Fixed trying to edit system posts when using the up arrow hotkey
 2016-05-18 11:15:17 -04:00
Thomas Balthazar
d48be63513 Move away from the "andForget" style of function (#3043) 
As suggested by @crspeller here:
https://github.com/mattermost/platform/pull/3022#issuecomment-220004020
 2016-05-18 11:14:55 -04:00
Christopher Speller
880ef25ab1 Moving out javascript driver (#3040) 2016-05-18 10:42:25 -04:00
enahum
02f8691fa4 daily translations 20160517 (#3030) 2016-05-18 08:08:54 -04:00
Thomas Balthazar
99b8eef7e3 Send email notification when username changed (#3022) 2016-05-18 07:54:33 -04:00
jasonblais
9d5e7478f9 Update copyright year to 2015-2016 (#3034) 2016-05-18 07:54:06 -04:00
Christopher Speller
edd453c6cd Merge branch 'release-3.0' 2016-05-17 17:51:42 -04:00
=Corey Hulen
ac509b114d Fixing websocket connection v3.0.2 2016-05-17 13:55:51 -07:00
Corey Hulen
123bfad69c Fixing LDAP issue with Postgres (#3033) 2016-05-17 15:52:10 -04:00
Harrison Healey
d2b556aa77 Removed check of email signup from creating a team (#3029) 2016-05-17 15:52:03 -04:00
Harrison Healey
0fe75cb782 PLT-1909 Removed the ability to edit system posts (#3013) 
* Removed the ability to edit system posts

* Added increased timeout to SpinnerButton unit tests
 2016-05-17 12:27:03 -04:00
enahum
50454bc81e PLT-2972 Fix config Desanitaze (#3018) 2016-05-17 10:52:49 -04:00
Thomas Balthazar
5580c28e54 PLT-2188 Integrations: Support raw new lines in the text payload (#2993) 
* 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
 2016-05-17 08:56:38 -04:00
enahum
45527a9c1d Fix english html links in locs (#3019) 2016-05-17 07:57:10 -04:00
Harrison Healey
fd53e3b786 PLT-2257 Reorganized System Console (#3003) 
* 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
 2016-05-17 07:21:39 -04:00
lfbrock
5f5f813387 Create ISSUE_TEMPLATE.md (#3012) 2016-05-16 16:10:28 -07:00
Harrison Healey
f7a49e23cc Fixed search results to correctly update when search term changes (#3010) 2016-05-16 16:09:58 -07:00
enahum
0b53dd917d PLT-2020 Fix Clicking save without changing your email shows an error message (#3008) 2016-05-16 16:09:48 -07:00
Joram Wilander
34780f3aea Refresh login page if server version of client doesn't match browser version of client (#3004) 2016-05-16 16:09:37 -07:00
David Lu
2ccf5bbaa2 PLT-2784 Channel Navigation Shortcuts (#2979) 
* 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
 2016-05-16 16:08:59 -07:00
Harrison Healey
1b9deb4392 Changed named emoticons to not require surrounding whitespace and added unit tests (#3009) 2016-05-16 15:54:24 -04:00
Joram Wilander
1f609e9cf7 Check team member instead of session for team admin role when updating/deleting channels (#3007) 2016-05-16 12:55:22 -04:00
enahum
52694f676e PLT-2965 Fix config sanitation (#3005) v3.0.1 2016-05-16 11:15:31 -04:00
David Lu
c5f105787c Added CMD+UP for OSX (#2987) 2016-05-16 08:07:37 -04:00
Asaad Mahmood
0258fcfa5c Adding compact layout (#2991) 
* Adding compact layout

* Fixing ESLint error
 2016-05-16 08:06:26 -04:00
Ryo ONODERA
565b111234 Update Japanese translation to 2016-05-15 (#3002) 2016-05-16 08:03:39 -04:00
ArthurH
3564df106d Fix heavy regression on GitLab for version 3.0.0 (#3000) 
Fix regression on GitLab
 2016-05-16 08:00:44 -04:00
ArthurH
7fa7bee9fc Fix heavy regression on GitLab for version 3.0.0 (#3000) 
Fix regression on GitLab
 2016-05-16 08:00:04 -04:00
Christopher Speller
dcba917d60 Merge branch 'release-3.0' 2016-05-16 07:54:38 -04:00
David Lu
6363fc5b7f Added preventDefault to suppress browser-specific shortcuts (#2995) 2016-05-16 06:45:54 -04:00
lfbrock
5631a949ac Fix typo in updated email address notification (#2997) 2016-05-16 06:45:30 -04:00
lfbrock
13f6ef7791 Shorten test-emoticons1.md (#2996) 2016-05-16 06:45:07 -04:00
Christopher Speller
587ddde587 Cleaning up make test-client. Adding to build. (#2984) 2016-05-13 16:17:07 -04:00
Christopher Speller
39b520e38e Don't build the dependancies 2016-05-13 00:28:27 -04:00
Christopher Speller
38ee83e45b Moving to glide 2016-05-12 23:56:07 -04:00
Corey Hulen
9d94869cc6 Fixing issue with missing user (#2989) v3.0.0 2016-05-12 18:36:30 -07:00
Joram Wilander
e46c1b8d52 Inlcude team Id for fake context for incoming webhooks (#2988) 2016-05-12 18:36:15 -07:00
Harrison Healey
4f22cbc92b Stopped login code from falling back to LDAP when it's disabled (#2986) 2016-05-12 18:36:02 -07:00
Harrison Healey
94f8be51f9 Properly updated FilteredUserList when the provided user list is changed (#2983) 2016-05-12 18:35:55 -07:00
Christopher Speller
84d2482ddb Updating go depencancies. Switching to go1.6 vendoring (#2949) 2016-05-12 16:37:29 -04:00
Christopher Speller
d1efb66ad7 Merge branch 'release-3.0' 2016-05-12 12:11:02 -04:00
Harrison Healey
9a701b7e5b Stopped supressing LDAP user filtered error on clientside (#2981) 2016-05-12 12:06:36 -04:00
Harrison Healey
6631f28d92 Improved handling of edge case where an LDAP user shares a username with a non-LDAP user (#2980) 2016-05-12 12:06:26 -04:00
thoemy
04dfa2a9eb Improve incoming webhook slack compatibility (#2972) (#2973) 
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.
 2016-05-12 12:04:59 -04:00
thoemy
97450762db Fix parsing attachment field links into markdown (#2958) (#2959) 
Field contents are stored in 'value' not 'text'.
 2016-05-12 12:04:12 -04:00
Harrison Healey
d9f724f959 PLT-2927/PLT-2924 Fixing issues with integration lists (#2974) 
* Changed IntegrationStore to store integrations by team

* Fixed regenerating a command's token not causing the UI to update

* Re-added IntegrationStore.hasReceived methods
 2016-05-12 11:30:53 -04:00
Joram Wilander
82e6cf785c Fix incorrect password error with MFA enabled (#2977) 2016-05-12 09:49:40 -04:00