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

6307 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Christopher Speller
38ee83e45b Moving to glide 2016-05-12 23:56:07 -04: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
Harrison Healey
ff72a126d3 PLT-2862 Re-added LDAP login boxes as part of signup flow (#2937) 
* Added ldap_only parameter for login API

* Re-added LDAP login boxes as part of signup flow
 2016-05-09 15:56:50 -04:00
enahum
3eebd15bf0 Add spanish locs, sort by id en & es files (#2938) 2016-05-09 12:16:36 -07:00
enahum
18e83ece08 PLT-2842 Fix "Invite teammates" link not working in tutorial screen. (#2936) 2016-05-09 11:21:06 -07:00
Joram Wilander
07126101d3 Recent mention searches now OR terms instead of AND (#2931) 2016-05-09 09:00:08 -07:00
Jonny Buchanan
9e07f4b021 Add <meta> tag to force latest version of IE (#2837) 2016-05-09 08:58:59 -07:00
David Lu
23f6cdf3aa PLT-2814 Fixed JavaScript errors upon paste (#2932) 
* 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
 2016-05-09 08:58:00 -07:00
Asaad Mahmood
12cc9def7b Improvements to system console and DM modal (#2930) 
Fixing audit and compliance table

Changing prop

Minor improvement to the DM modal
 2016-05-09 08:57:51 -07:00
Asaad Mahmood
64b6d8cde5 DM and Modal changes (#2927) 
* DM and Modal changes

* Fixing image previews
 2016-05-09 08:14:43 -04:00
Joram Wilander
b4d28fe205 Minor fix to refresh profiles in user list of system console (#2915) 2016-05-09 00:17:42 -07:00
Harrison Healey
761f59645d PLT-2816 Fixed handling of Unicode 8 emojis (#2924) 
* 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
 2016-05-09 00:17:26 -07:00
MARUYAMA Takayuki
e8b3e0a7bc Update Japanese translation (#2919) 
* fix some mistranslation
* add latest translations
 2016-05-09 00:17:10 -07:00
Rodrigo
029f173676 Added missing pt locs (#2926) 2016-05-09 00:17:00 -07:00
it33
f39d74631c Adding additional libraries (#2922) 
* Adding additional libraries

* Adding rsc mention
 2016-05-09 00:15:46 -07:00
David Lu
b58ccf0604 PLT-2765 Limit username UI to 22 characters (#2918) 
* 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 {
 2016-05-09 00:15:25 -07:00
Corey Hulen
be16307c06 Fixing RHS issue (#2917) 2016-05-06 13:25:00 -07:00