Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating fork #1

Merged
merged 119 commits into from
Sep 14, 2020
Merged

Updating fork #1

merged 119 commits into from
Sep 14, 2020

Conversation

MikeworX
Copy link
Owner

No description provided.

nickmisasi and others added 30 commits August 30, 2020 19:19
…er (#6252)

* HTML and styling complete - now to hook 'r up

* Some tweaks

* Everything working but redirect

* Cleanup files not needed

* Add localization

* Adding test cases, wrapping the component in injectintl

* Wrap component in fragment to fix type returns

* Fix some pipeline steps

* Don't always show upgrade modal

* Update snaps to match the code

* Fix i18n pipelime

* fix package-lock.json

* Remove a change from invitation_modal because it's not needed

* undo change to index.js

* Revert invitation_modal to master

* Add User Limit Modal component for prompting system admin's to upgrade cloud tier

* revert index.js

* revert invitation_modal.jsx

* Final fixes

* remove injectIntl to pass type checks

* Fix tests

* Add missing state variables to mapStateToProps

* Flip a less than to a greater than

* CSS Changes for design review

* Fix tests, fix hover background colour of 'Not right now' button

* Fix hover active and focus on not right now button

* Fix vertical alignment and hover state of confirm button

* Fix weird styles in different themes

* fixes for theming, and hopefully fixing pipeline

* Fix hover state on upgrade mattermost cloud button

* Fix text colour of not right now button

* missing semi-colon

* 2 UX changes

* One more ux change

* Fix hover

* Add a semi colon
* Add empty translation string check.

* Add to circleci

* Adding new command to pipeline and to npm script.
* WIP

* Picture selector issue

* Fixed all SVGs to be themeable

* Type and test fixes
* Convert email notification setting to ts

* Convert 'components/user_settings/notifications/email_notification_setting' module and associated tests to TypeScript

* Update enableEmailBatching type

* Update snapshots testing failure

* Minor update

* Update test cases, savePreferences' parameter type

* Minor update

* Remove unused variable

* Fix cannot change notification status(update enableEmail's type)

Co-authored-by: mattermod <[email protected]>
… trial dialogue in system console (#6239)

* make coours default instead of user set colours

* use variable for white

* REVERT THIS WHEN READY TO MERGE!

Co-authored-by: Mattermod <[email protected]>
* revert cypress to 8.4.0

* Update e2e/package.json

Co-authored-by: Saturnino Abril <[email protected]>

Co-authored-by: Saturnino Abril <[email protected]>
* [MM-26468][MM-26483] Progress Bar Common Component/Sidebar Next Steps Component (#5865)

* [MM-26483] Progress bar common component and PoC in the sidebar

* Styling for the sidebar element and some tests

* Added translations

* Snapshot update

* Style changes

* Use same border design as channels

* [MM-26465] Background and general layout for cloud onboarding (#5823)

* WIP

* WIP

* [MM-26465] Background and general layout for cloud onboarding

* Mobile view, lint and type fixes, added a test file for later use

* More test fixes

* UX feedback

* Replaced dumb comment with useful one

* Turn off graphic at 1020px

* Lint fix

* Update copy

* PR feedback

Co-authored-by: Mattermod <[email protected]>

* [MM-26480] Card/Accordion Common Component (#5861)

* WIP

* WIP

* [MM-26465] Background and general layout for cloud onboarding

* Mobile view, lint and type fixes, added a test file for later use

* More test fixes

* UX feedback

* Replaced dumb comment with useful one

* Turn off graphic at 1020px

* WIP

* Initial card style

* Collapse functionality (no animation)

* WIP

* Rest of accordion common component and some animation

* Lint, type and test fixes

* Updated snapshot

* Reduce nesting

* Merge'd

* PR feedback

* Fix box-shadow on collapsed state

* [MM-26470] Base Next Step Wizard Controller and Styling (#5893)

* WIP

* WIP

* [MM-26465] Background and general layout for cloud onboarding

* Mobile view, lint and type fixes, added a test file for later use

* More test fixes

* UX feedback

* Replaced dumb comment with useful one

* Turn off graphic at 1020px

* WIP

* Initial card style

* Collapse functionality (no animation)

* WIP

* Rest of accordion common component and some animation

* Lint, type and test fixes

* Updated snapshot

* Reduce nesting

* WIP - Wiring for step wizard

* Skip getting started link, hook for final page

* Moved steps into its own constants file, type and test fixes

* Shifted around the screen changing and added final screen placeholder

* Translations and wizard navigation button styling

* Pick starting step based on which are finished, button styling fixes

* Allow for getting out of next steps view by switching channels

* PR feedback

* PR feedback

* blank

* Change style of complete card header to be more like the regular one

* Fixed background on complete step

* Merge'd

* PR feedback

* PR feedback

* Removed translation

* Fixed box shadow transition on card

* Removed duplicate logic

* PR feedback

* PR feedback

* Fixed hover state on completed cards

* re-add margin on complete state

* [MM-26466] Close Next Steps Modal and functionality (#5995)

* Hooked up the sidebar next steps bar and some fixes

* Integration of state into app for next steps view, close next steps view modal preliminary

* Styling and help arrow for modal

* Missed a translation

* PR feedback

* Center the next steps modal

* PR feedback

* Translation fix

* Screen transitions for loading screen and final screen

* Transition screen

* Fixed APNG issue

* Style for desktop and mobile

* Fixed styling

* More fixes

* Functionality and test fixes

* Dev PR feedback

* UX PR feedback

* [MM-27164] Picture Selector Common Component (#5973)

* WIP

* WIP

* [MM-26465] Background and general layout for cloud onboarding

* Mobile view, lint and type fixes, added a test file for later use

* More test fixes

* UX feedback

* Replaced dumb comment with useful one

* Turn off graphic at 1020px

* WIP

* Initial card style

* Collapse functionality (no animation)

* WIP

* Rest of accordion common component and some animation

* Lint, type and test fixes

* Updated snapshot

* Reduce nesting

* WIP - Wiring for step wizard

* Skip getting started link, hook for final page

* Moved steps into its own constants file, type and test fixes

* Shifted around the screen changing and added final screen placeholder

* Translations and wizard navigation button styling

* Pick starting step based on which are finished, button styling fixes

* Allow for getting out of next steps view by switching channels

* PR feedback

* PR feedback

* blank

* Change style of complete card header to be more like the regular one

* Fixed background on complete step

* Merge'd

* PR feedback

* PR feedback

* Removed translation

* Fixed box shadow transition on card

* Removed duplicate logic

* WIP

* Functional component that works

* Styling and a couple tweaks

* A few tests

* Snapshots

* Type and i18n fixes

* PR feedback and test fixes

* Added button hover states

* PR feedback

* Blur select button on select image

* Blur on click, not on select image

* Update components/picture_selector.tsx

Co-authored-by: Nev Angelova <[email protected]>

Co-authored-by: Nev Angelova <[email protected]>

* [MM-26482] Textbox Common Component for Cloud Onboarding (#5904)

* WIP

* WIP

* [MM-26465] Background and general layout for cloud onboarding

* Mobile view, lint and type fixes, added a test file for later use

* More test fixes

* UX feedback

* Replaced dumb comment with useful one

* Turn off graphic at 1020px

* WIP

* Initial card style

* Collapse functionality (no animation)

* WIP

* Rest of accordion common component and some animation

* Lint, type and test fixes

* Updated snapshot

* Reduce nesting

* WIP - Wiring for step wizard

* Skip getting started link, hook for final page

* Moved steps into its own constants file, type and test fixes

* Shifted around the screen changing and added final screen placeholder

* Translations and wizard navigation button styling

* Pick starting step based on which are finished, button styling fixes

* Allow for getting out of next steps view by switching channels

* PR feedback

* WIP

* [MM-26472] Textbox Common Component for Cloud Onboarding

* Specific styling for the Cloud Onboarding components

* Added info component and some other styling

* Fixed the error styling

* Fixed most of the shifting in the textbox

* Lint fix

* PR feedback

* blank

* PR feedback

* Change style of complete card header to be more like the regular one

* Fixed background on complete step

* Merge'd

* PR feedback

* PR feedback

* Removed translation

* PR feedback

* Use box shadow instead of border for changing text input

* Improved CSS from Asaad

* Removed inner border when focused/error state

* Removed unnecessary commented code

* Merge'd

* Switch to proper BEM

* Adding a card for opening and setting preferences

* Adding files

* [MM-26469] Complete Profile Step (#6077)

* [MM-26469] Complete Profile Step

* Lint fix

* [MM-26473] Tips and Next Steps screen (#6020)

* Screen transitions for loading screen and final screen

* Transition screen

* Fixed APNG issue

* Style for desktop and mobile

* Fixed styling

* More fixes

* Functionality and test fixes

* Dev PR feedback

* UX PR feedback

* UX feedback

* Merge'd

Co-authored-by: Mattermod <[email protected]>

* [MM-26471] Team Profile Setup step (#6083)

* [MM-26471] Team Profile Setup step

* Translation fix

* PR feedback

* Fixed an issue with an older version of the styles

* Removed commented code

* [MM-26472] Invite Members step (#6143)

* WIP

* WIP

* [MM-26742] Functionality for Invite Members step, and most of styling

* Beginning of common component, currently for use only in the Invite Members step

* Cleanup

* Couple small style fixes

* Fixed the invite link at the bottom

* Lint and test fixes

* PR feedback

* Fixed button width for copy link and fixed test

* [MM-27908] Updated Cloud Logo (#6190)

* [MM-27908] Updated Cloud Logo

* Remove extra prop

* Type fix

* [MM-27907] Fixed input focus colour and fixed placeholder focus on multi_input (#6182)

* [MM-27907] Fixed input focus colour and fixed placeholder focus on multi_input

* PR feedback

* [MM-27159] Button States for Cloud Onboarding (#6189)

* [MM-27159] Button States

* PR feedback

* [MM-27305] Card Component Refactor for smoothness  (#6172)

* Refactor Card component to be more responsive and robust

* Cleanup and a couple other bug fixes

* [MM-27974] Unit Tests for Cloud Onboarding (#6208)

* [MM-27974] Unit Tests for Cloud Onboarding

* Translation fix

* [MM-27923] Turn on Cloud Onboarding for Cloud-only instances (#6225)

* Flow working, pre cleanup, pre merge of Devin's work

* Code clean up

* Adding tests for my added components

* Put package-lock back to master

* Fix bug that always redirects you to the next steps page

* Change function name to avoid confusion

* Code clean up, and this dang package-lock

* Fix one of the test issues

* Fix other tests

* fix alignment of body text in text_card_with_action component

* Fix a few issues in PR review

* pushing to get help

* Fixes and updating tests

* Fix package-lock

* Fix package-lock

* Remove package-lock changes

* Increase transition time from 1 second to 3 seconds

* Some fixes for UX

* add 2 tests to be sure that step filter logic is working based on user roles

* Fix tests

* Fix test

Co-authored-by: Devin Binnie <[email protected]>
Co-authored-by: Mattermod <[email protected]>
Co-authored-by: Devin Binnie <[email protected]>
Co-authored-by: Nev Angelova <[email protected]>
* MM-T661 /invite extra white space before @ in DM or GM

* Automate MM-T661

* Fix lint issue and add wait for #postListContnet

* Add wait to prevent intermittent failures

* /invite message should be in GM not in channel

* Fix typos

* Fix lint error :p

* Ensure loading is done instead of waiting one second.
* Initial commit for MM-T1749

* Finish e2e test for MM-T1749
* Initial commit for MM-T506

* Add checks for email permalink to post and for post message verification from permalink

* Fix eslint error

* Update e2e/cypress/integration/notifications/channel_links_show_as_links_spec.js

Co-authored-by: Saturnino Abril <[email protected]>
* MM-T625 Incoming webhook is image only

* Update e2e/cypress/integration/integrations/incoming_webhook/incoming_webhook_is_image_only_spec.js

Co-authored-by: Joseph Baylon <[email protected]>

Co-authored-by: Jeremy Shih <[email protected]>
Co-authored-by: Joseph Baylon <[email protected]>
* [MM-28200] Cloud Billing - Admin Console sections and layout

* Nit

* Test fixes
… new channel sidebar (#6097)

* fix group num alignment/styling

* make square, realign

* add padding to badge; refactor margin-auto basis

* use flex-grow

Co-authored-by: Mattermod <[email protected]>
* Initial commit for MM-T402

* Complete e2e test functionality for MM-T402

* Refactor MM-T402 to use imported generateRandomUser function

* Disable LDAP in MM-T402

* Destructure user properties directly from generateRandomUser function

Co-authored-by: Joseph Baylon <[email protected]>
Co-authored-by: Mattermod <[email protected]>
* [MM-27813] better test file name

* refactor to use common support functions

* cypress test case for MM-T552

* fix regression
* MM-T673 Prompting to set status to online

* Include return type for apiGetStatus

* Update e2e/cypress/integration/integrations/outgoing_webhook/prompt_set_status_spec.js

Co-authored-by: Joseph Baylon <[email protected]>

* Update e2e/cypress/integration/integrations/outgoing_webhook/prompt_set_status_spec.js

Co-authored-by: Saturnino Abril <[email protected]>

* Address code review comments

Co-authored-by: Joseph Baylon <[email protected]>
Co-authored-by: Saturnino Abril <[email protected]>
* MM-T660 /invite tests when used in DMs and GMs

* Replace wait command with ensuring loading is done.

* Log in as userA in the first place.

* Update e2e/cypress/integration/integrations/builtin_commands/common_commands_spec.js

Co-authored-by: Saturnino Abril <[email protected]>

* Update e2e/cypress/integration/integrations/builtin_commands/common_commands_spec.js

Co-authored-by: Saturnino Abril <[email protected]>

* Address code review comments

* Put back accidentally removed test :p

Co-authored-by: Saturnino Abril <[email protected]>
Co-authored-by: Mattermod <[email protected]>
#6355)

* Add defaultProps to user_settings_modal

* Fix pipeline
saturninoabril and others added 29 commits September 9, 2020 10:41
* add TM4J IDs

* Apply suggestions from code review

per comments

Co-authored-by: Prapti <[email protected]>

Co-authored-by: Prapti <[email protected]>
#6403)

* MM-28207 Preview post does not have a channel so get all group mention keys in that case

* Fix bad arrow func

* Make map state to props

* Fix lint

* Make channelId a required prop

* Make channelId required on textbox

* update snaps

* Remove unused import
… a channel (#6328)

* Initial commit for MM-T564

* Add check for reply message in channel

* Add more thorough check for new message in MM-T564

Co-authored-by: Mattermod <[email protected]>
…anguage. Add general translation updates. (#6349)

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

* Translated using Weblate (German)

Currently translated at 95.3% (3894 of 4084 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

Added translation using Weblate (Bulgarian)

Translated using Weblate (Ukrainian)

Currently translated at 77.1% (3148 of 4080 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/

Translated using Weblate (Polish)

Currently translated at 90.9% (3711 of 4080 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/pl/

Translated using Weblate (French)

Currently translated at 93.5% (3816 of 4080 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/

Translated using Weblate (Ukrainian)

Currently translated at 84.2% (3438 of 4080 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/

Translated using Weblate (Ukrainian)

Currently translated at 86.3% (3524 of 4080 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/

Translated using Weblate (Ukrainian)

Currently translated at 91.9% (3690 of 4011 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/uk/

Translated using Weblate (French)

Currently translated at 97.6% (3917 of 4011 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/fr/

Translated using Weblate (German)

Currently translated at 97.0% (3894 of 4011 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/de/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (4003 of 4011 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ja/

* Translated using Weblate (Bulgarian)

Currently translated at 0.0% (0 of 4084 strings)

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

* Remove empty/unchanged translation strings. Add Bulgarian language.

* Reorder language order.

* Update snapshot.

* Change to uppercase.

* Update snapshot

* Add rudder keys to node env prod.

Co-authored-by: Hosted Weblate <[email protected]>
Co-authored-by: Elisabeth Kulzer <[email protected]>
Co-authored-by: Anonymous <[email protected]>
Co-authored-by: Nikolai Zahariev <[email protected]>
Co-authored-by: Mattermod <[email protected]>
* [MM-28140] e2e/system_console/customization: add T1026

* Save configuration and check that the saved value is right

* Fix test ID and location
* [MM-28140] e2e/system_console/customization: add T1025

* Moved test to destination file and manage login before running
* MM-27497 Patch localForage to fix logging out on old Edge

* Fix incorrect patch

* Actually fix patch

* Downgrade localforage to 1.7.3
* MM-27165 - Updating post menu css

* Updating bot post thread view

* Removing fromBot parameter

* Updating bot post profile pic and header

* Removing debugging code

* Removing console
…6378)

* Catch errors when asking for notification permission so the step can be completed

* Stashing

* Changes based on discussion with Matt and Maria

* Fix tests

* change title of tile

* Fix lint
* WIP

* WIP

* [MM-27864][MM-27865] Telemetry for Cloud Onboarding

* Test fixes and a slight refactor

* Type fixes

* Type fix
…6398)

* update all tests references from flag to save

* Update e2e/cypress/integration/messaging/post_header_spec.js

Co-authored-by: Jelena Gilliam <[email protected]>

Co-authored-by: Joseph Baylon <[email protected]>
Co-authored-by: Jelena Gilliam <[email protected]>
…of common file types should open in a new tab (#6321)

* MM-T338 Image Attachment Upload in Mobile View

* test 2

* changes

* types

* return type

* lint

* changes in prev file

* changes

* Update e2e/cypress/integration/files_and_attachments/upload_files_spec.js

Co-authored-by: Saturnino Abril <[email protected]>

* image name change

* lint

Co-authored-by: Saturnino Abril <[email protected]>
* MM-20664 Add client side ping pong

  * Make ping event after every 10secs
  * clear timer to not create ping events on new message
  * close conn if server does not respond with a pong in due time

* lint fix

* Update client/websocket_client.test.jsx

Co-authored-by: Guillermo Vayá <[email protected]>

* Clear ping and pong  on close

* Fix constant

* Fix clear of pingpong

* Change to use conn.onClose when closing connection

Co-authored-by: Guillermo Vayá <[email protected]>
Co-authored-by: Mattermod <[email protected]>
* [MM-28140] e2e/system_console/customization: add T1028

* Fix bad target

* Fix test ID, location and wrapped response
* WIP

* [MM-28061] Cloud Telemetry for Invite Members modal
…s must be agreed to (#6394)

* MM-27827 - Repeated terms of service edits must be agreed to

* Fix these terms of service E2E tests by doing creation of terms through UI instead of API

* Remove terms of service api commands

* Fix lint
* no more than 20 members allowed to be invited

* fix linting

* fix i18n

* simplify

* update constant to 256
* [MM-28140] e2e/system_console/customization: add T1027

* Fix bad comment

* Fix test ID, location and wrapped response

* Removing delete brand image method from system after merge

Co-authored-by: Mattermod <[email protected]>
* [MM-28140] e2e/system_console/customization: add T1029

* Make each test ensure the admin is logged in and remove unnecessary reload

* Fix linter

* Remove beforeEach method that got duplicated after merge

* Update test to add a check for a default emoji
…ciated tests to TypeScript (#6420)

* Transplant the changes from MM-13470 branch

* Remove jsx.snap

Co-authored-by: Mattermod <[email protected]>
@MikeworX MikeworX merged commit cabf407 into MikeworX:master Sep 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet