mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
6 322 коммитов 3 Ветки 0 Теги
1f609e9cf799ddb6bedd5fe3c0eeb36b92ed243d
Граф коммитов

6322 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
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
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
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) 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
enahum
0fa51b764d Add missing locs (#2971) 2016-05-12 08:31:08 -04:00
thoemy
3f0325fd22 Fix parsing attachment field links into markdown (#2958) (#2959) 
Field contents are stored in 'value' not 'text'.
 2016-05-12 08:30:44 -04:00
Christopher Speller
4b260b761a Updating client dependancies and ESLint (#2954) 
* Updating client dependancies

* Fixing eslint errors with updates

* Updating eslint
 2016-05-12 07:50:53 -04:00
David Lu
a3cfdf0483 PLT-2786 Open Account Settings/Recent Mentions Shortcuts (#2957) 
* Account settings shortcut added

* Added constants

* Added recent mentions shortcut
 2016-05-12 07:50:25 -04:00
David Lu
1630892b4c PLT-2783 Reprint Last Message Entered Shortcut (#2966) 
* added preliminary code

* added comment code

* semicolons are important

* compatible with slash commands

* too many semicolons
 2016-05-12 07:48:29 -04:00
David Lu
a4a06aa102 PLT-2755 Shortcut to upload file (#2967) 
* wrong ref

* Changed back to CTRL+U

* Fixed scope of fileUpload

* Removed stray comma
 2016-05-12 07:46:12 -04:00
lfbrock
b6260e827e Remove old tests from syntax-highlighting.md (#2970) 2016-05-12 07:45:31 -04:00
thoemy
b4adf77693 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 07:44:44 -04:00
Harrison Healey
2b1db2974a Fixed loginByUsername unit test (#2975) 
* Fixed loginByUsername unit test

* Removed unused variable from WebClient login functions
 2016-05-12 07:44:06 -04:00
goofy-bz
d44067fb30 grammar fix (#2976) 
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
 2016-05-12 07:43:51 -04:00
Asaad Mahmood
04f7273461 Improving compliance stuff (#2963) 
* Improving compliance stuff

* Fixing padding on mobile
 2016-05-11 15:30:00 -04:00
it33
7babccfa51 Propose changing "Other teams" to "Outside this team" (#2969) 
* Update sidebar.jsx

* Added "Outside this team"
 2016-05-11 14:08:38 -04:00
Corey Hulen
3928535456 PLT-2905 fixing upgrade of SSO accounts (#2962) 
* PLT-2905 fixing upgrade of SSO accounts

* Fixing multiple Auths mapped to different emails
 2016-05-11 14:04:30 -04:00
Christopher Speller
e1388877ad Merge branch 'release-3.0' 2016-05-11 11:53:04 -04:00
Joram Wilander
a574397a72 Pull direct profiles when switching teams (#2965) 2016-05-11 11:44:45 -04:00
Corey Hulen
d7197943f0 Fixing compliance reporting (#2964) 2016-05-11 09:24:20 -03:00
Christopher Speller
a12e575877 Fixing email invite link handling (#2956) 2016-05-11 08:04:13 -04:00
Christopher Speller
720222f3a6 Removing export route (#2955) 2016-05-11 08:04:01 -04:00
David Lu
95cc21fb71 Fixed username restriction display errors (#2952) 2016-05-11 08:02:36 -04:00
Joram Wilander
2dbc1a50fa Fix compliance saving and reload page when enabling/disabling compliance (#2960) 2016-05-10 21:37:12 -03:00
Asaad Mahmood
338223d204 Fixing DM separator and margin on system console (#2944) 
Fixing margins on system console
 2016-05-10 14:47:57 -04:00
Corey Hulen
c8285185a9 PLT-2806 sending websocket when adding user to team (#2953) 
* PLT-2806 sending websocket when adding user to team

* Fixing config file
 2016-05-10 12:54:11 -04:00
Christopher Speller
ceaaf2243c Fixing configuration file (#2948) 2016-05-10 12:49:17 -04:00
enahum
45b22f312d PLT-2674 Private Group should not have Leave option when only one member remains (#2888) 2016-05-10 08:24:52 -04:00
David Lu
4f39b8b2e4 Added 'here' to list of reserved usernames (#2933) 2016-05-10 08:23:05 -04:00
lfbrock
5d74b9decd Update test-search.md to fix spelling error (#2939) 2016-05-10 08:22:31 -04:00