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

Bringing fork up to date #1

Merged
merged 21 commits into from
Mar 25, 2019
Merged

Bringing fork up to date #1

merged 21 commits into from
Mar 25, 2019

Conversation

reflog
Copy link
Owner

@reflog reflog commented Mar 25, 2019

Please make sure you've read the pull request section of our code contribution guidelines.

When filling in a section please remove the help text and the above text.

Summary

[A brief description of what this pull request does.]

Ticket Link

[Please link the GitHub issue or Jira ticket this PR addresses.]

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • Ran make check-style to check for style errors (required for all pull requests)
  • Ran make test to ensure unit and component tests passed
  • Added or updated unit tests (required for all new features)
  • Needs to be implemented in mobile (link to PR or User Story)
  • Has server changes (please link)
  • Has redux changes (please link)
  • Has UI changes
  • Includes text changes and localization file (.../i18n/en.json) updates
  • Touches critical sections of the codebase (auth, posting, etc.)

jespino and others added 21 commits March 19, 2019 11:46
* Added join/list public/private teams permissions

* Only show in the list the listable and joinable teams

* Join directly to team instead of using an invitation

* Removing other usage of InviteId to join teams

* Fixing tests

* Updated mattermost-redux dependency

* Fixing test name
* MM-12488: Adds groups search and filters.

* MM-12488: Removes return value.

* MM-12488: Changes to filter and search UX.

* MM-12488: Updates snaps.

* MM-12488: Fix for JS error.

* MM-12488: Decrease state updates.

* MM-12488: Reusing some keys.

* MM-12488: Extract regex creation.

* MM-12488: Uses constant keycode.

* MM-12488: Fix for pagination.

* MM-12488: Adds tests.

* MM-12488: Adds parameters to search function.

* MM-12488: Removes knowledge of contents of filters div. Removes some calls to .

* MM-12488: Snap update.

* MM-12488: Removes unused param.

* MM-12488: Cancels native click event properly.

* MM-12488: Removes unnecessary global flag from regex. Tests that flags are compared case-insensitively.
…#2518)

* Remove period from OAuth apps description in Main Menu > Integrations

* Update integrations.jsx
…sers and channels (#2486)

* Adds a flag to autocomplete users and channels using elasticsearch in the config

* Wording changes

* [MM-14253] Modify Elasticsearch admin console messages to reference users and channels
* Fix error message when drag and dropping folders

* Update generic failed upload error message

* Remove unused localization string
* [MM-14356] Some strings in Channel Settings aren't localizable

* use `<FormattedMessage>` to translate `globalNotifyLevel`
* add localized strings for `ignoreChannelMentions`
* add localized strings for notification “levels” such as Default, All, Mention, and None
* removed `({notifyLevel})` from translation json files as this value won’t be sent any longer as part of this string
* updated test snapshot

* Remove `notifyLevel` from Korean language file

* Add German translation from community

* Remove translation strings

Remove translation strings to allow translation server to handle.
* [MM-14571] Add e2e to test @mentions notifications

* [MM-14571] Cleanup fixture usage, use async/await in plugin

* [MM-14571] Lock down axios version to current version

* [MM-14571] Rename post message as file

* [MM-14571] Additional work based on feedback

* Remove dupe id in channel header
* Add channelid to header
* Update snapshot
* Clean up test
* Add cypress command for getting channel id

* [MM-14571] scroll element into view before clicking

* [MM-14571] scroll another element into view before clicking

* [MM-14571] Remove unneccessary scrollIntoView()
…te a parent message that has a reply: Reply RHS (#2421)
* MM-14350: Adds a translation values parameter to AdminPanel.

* MM-14350: Prefixes relative URL with site url to work under custom subpath.
* MM-13099 Use size_aware_image component for when loading images in posts (#2334)
* MM-13099 Use size_aware_image component for all instances for loading images in webapp.
* Removing getFileDimensionsForDisplay in favour of  SizeAwareImage as it would be reliable in preventing
  scroll pop
* Add a fallback for svg as older version do not have dimentions
MM-14500 Fix for pop caused by size_aware_image

  * Use svg for creating placeholder instead of canvas and dataUrl
    Change to inline-block for hover css shadow effect
    Add defensive check for dimensions

Removing display: inline-flex as it causes svg in the placeholder to not take the available space
Have to move border hioghlight to img tags as div is display block by default so shows border for the entire
box instead of just the image

Update snapshots and fix lint

* Fix review comments
… switcher" (#2490)

* [MM-14358] add E2E test for message draft pencil icon visible in channel switcher

* fix E2E test
* Add (SAML|LDAP|Email) Login Button Color Configurations

* casing and permalinks

* add trailing colons to experimental page

* hide experimental ldap group sync if not licensed for same

* reformat admin_console_index.test.jsx

* update search tests to reflect experimental updates
…pecs (#2527)

* fix flaky test of collapsed spec and pull out markdown into separate spec

* removed commented line
@reflog reflog merged commit 49905f3 into reflog:master Mar 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet