Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 870
    • Issues 870
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 53
    • Merge Requests 53
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !510

Open
Opened 1 day ago by Olivia Madrid@omadrid
  • Report abuse
Report abuse

[Sprint/LuckyLizard](fix): Play videos within activity if not canary

For non-canary users, clicking videos should play from the feed activity, not go to the media page. (Canary users go to media modal)

Closes #1761 and #1764

Edited 7 hours ago by Olivia Madrid

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b fix/video-play-outside-canary-1761 origin/fix/video-play-outside-canary-1761

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff fix/video-play-outside-canary-1761

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge fix/video-play-outside-canary-1761 into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77938617 passed with warnings for a1032494 on fix/video-play-outside-canary-1761
            Requires approval from Deployers. Approved by
            Ben Hayward
            Ben Hayward
            Emiliano Balbuena
            Emiliano Balbuena
            Martin Santangelo
            Martin Santangelo
            Brian Hatchet
            Brian Hatchet
            Marcelo Rivera
            Marcelo Rivera
            Guy Thouret
            Guy Thouret
            Ready to be merged automatically. Ask someone with write access to this repository to merge this request

            Closes #1761 and #1764

            • Discussion 4
            • Commits 7
            • Pipelines 4
            • Changes 10
            0/3 threads resolved
            • Loading...
            • Olivia Madrid @omadrid added 1 commit 1 day ago

              added 1 commit

              • a9df951b - (fix): import featuresServiceMock to pass tests

              Compare with previous version

            • Olivia Madrid @omadrid added 1 commit 1 day ago

              added 1 commit

              • d32fbf54 - (fix): one more import for test passing

              Compare with previous version

            • Olivia Madrid @omadrid marked as a Work In Progress 22 hours ago

              marked as a Work In Progress

            • Olivia Madrid @omadrid changed the description 22 hours ago

              changed the description

            • Olivia Madrid @omadrid added 10 commits 7 hours ago

              added 10 commits

              • d32fbf54...c4f8e4b0 - 6 commits from branch master
              • 1eafe83c - Merge branch 'master' of gitlab.com:minds/front into fix/video-play-outside-canary-1761
              • d41756c0 - Merge branch 'master' of gitlab.com:minds/front into fix/video-play-outside-canary-1761
              • 222cb073 - (fix): cross browser fullscreen works
              • a1032494 - Merge branch 'master' of gitlab.com:minds/front into fix/video-play-outside-canary-1761

              Compare with previous version

              Toggle commit list
            • Olivia Madrid @omadrid unmarked as a Work In Progress 7 hours ago

              unmarked as a Work In Progress

            • Olivia Madrid @omadrid changed title from WIP: (fix): Play videos within activity if not canary to [Sprint/LuckyLizard](fix): Play videos within activity if not canary 7 hours ago

              changed title from WIP: (fix): Play videos within activity if not canary to [Sprint/LuckyLizard](fix): Play videos within activity if not canary

            • Olivia Madrid @omadrid changed the description 7 hours ago

              changed the description

            • Mark Harding
              Mark Harding @markeharding · 2 hours ago
              Owner

              placed on rubbersoul for testing

            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on the diff 2 hours ago
              src/app/modules/legacy/components/cards/remind/remind.ts
              181 181 class: 'm-overlayModal--media'
              182 182 }).present();
              183 183 } else {
              184 this.router.navigate([`/media/${this.activity.entity_guid}`]);
              184 if (this.activity.custom_type !== 'video'){
              • Ben Hayward
                Ben Hayward @benhayward.ben · 2 hours ago
                Developer

                Only minor but the bracket at the end of this line needs a space char before it

              • Please register or sign in to reply
            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on the diff 2 hours ago
              src/app/modules/media/components/video/video.component.ts
              392 398 }
              393 399
              394 400 requestMediaModal() {
              395 if (!this.canPlayThrough) {
              401 if (!this.metadataLoaded) {
              396 402 return;
              397 403 }
              398 404
              399 if (this.isModal) {
              405 let isMediaPage = false;
              406 if (!this.isModal && !this.isActivity){
              • Ben Hayward
                Ben Hayward @benhayward.ben · 2 hours ago
                Developer

                Another over here

              • Please register or sign in to reply
            • Ben Hayward @benhayward.ben approved this merge request 1 hour ago

              approved this merge request

              • Brian Hatchet
                Brian Hatchet :speech_balloon: @brianhatchet · 57 minutes ago
                Developer

                https://screencast.com/t/Sm9n4WWUDS

                Video showing two issues I found.

                First is the embedded videos in reminds still go to galleries

                The other is double clicks on youtube videos

              • Please register or sign in to reply
            • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
            Please register or sign in to reply
            0 Assignees
            None
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            0
            Labels
            None
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            9
            9 participants
            user avatar
            Emiliano Balbuena
            user avatar
            Martin Santangelo
            user avatar
            Brian Hatchet
            user avatar
            Marcelo Rivera
            user avatar
            Guy Thouret
            user avatar
            Juan Manuel Solaro
            user avatar
            Mark Harding
            Reference: minds/front!510