Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 188
    • Issues 188
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !295

Merged
Opened 2 weeks ago by Martin Santangelo@msantang78
  • Report abuse
Report abuse

[Sprint/KiltedKoala] (feat) scroll latest media in capture

closes #185

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/capture-image-scroll origin/feat/capture-image-scroll

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/release/3.9.0
git merge --no-ff feat/capture-image-scroll

Step 4. Push the result of the merge to GitLab

git push origin release/3.9.0

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 feat/capture-image-scroll into release/3.9.0
  • Email patches
  • Plain diff
Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.
Merge request approved. Approved by
Brian Hatchet
Brian Hatchet
Emiliano Balbuena
Emiliano Balbuena

Merged by Martin Santangelo 9 hours ago

The changes were merged into release/3.9.0 with 88a48bab

Pipeline #77894751 passed with warnings for 88a48bab on release/3.9.0
          • Discussion 4
          • Commits 4
          • Pipelines 4
          • Changes 6
          0/2 threads resolved
          • Loading...
          • Martin Santangelo @msantang78 changed milestone to %sprint: Kilted Koala 2 weeks ago

            changed milestone to %sprint: Kilted Koala

          • Martin Santangelo @msantang78 added Squad::Green scoped label 2 weeks ago

            added Squad::Green scoped label

          • Martin Santangelo @msantang78 added 1 commit 1 week ago

            added 1 commit

            • eb546bf9 - (chore) remove snapshot

            Compare with previous version

          • Martin Santangelo @msantang78 added 22 commits 1 week ago

            added 22 commits

            • eb546bf9...70354547 - 21 commits from branch release/3.9.0
            • 15c96e38 - Merge branch 'release/3.9.0' into feat/capture-image-scroll

            Compare with previous version

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 week ago
            Last updated by Martin Santangelo 6 days ago
            src/capture/CaptureGallery.js
            64 60 /**
            65 61 * Load photos
            66 62 */
            67 _loadPhotos() {
            63 _loadPhotos = async() => {
            64
            65 if (this.state.loading || !this.state.hasMore) return;
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 1 week ago
              Developer

              We don't allow one line ifs without curly braces on the front end according to the tslint json. We should probably get consistent across our js code and turn this on in the eslintrc for mobile

            • Martin Santangelo
              Martin Santangelo @msantang78 · 6 days ago
              Maintainer

              I agree, I usually don't use one line ifs, only with return sometimes. I will update that

            • Martin Santangelo @msantang78 changed this line in version 4 of the diff 6 days ago

              changed this line in version 4 of the diff

            • Please register or sign in to reply
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 week ago
            Last updated by Martin Santangelo 6 days ago
            src/capture/CaptureGallery.js
            100 104 */
            101 105 render() {
            102 106
            103 const body = this.state.imagesLoaded ?
            104 _.chunk(this.state.photos.map((p, i) => this.renderTile(p, i)), 3)
            105 .map((c, i) => <View style={styles.row} key={i}>{c}</View>)
            106 : <CenteredLoading />
            107 if (!this.state.imagesLoaded) return <CenteredLoading />
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 1 week ago
              Developer

              Another inline if

            • Martin Santangelo @msantang78 changed this line in version 4 of the diff 6 days ago

              changed this line in version 4 of the diff

            • Please register or sign in to reply
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 6 days ago
            Developer

            Ping @msantang78

            Edited by Brian Hatchet 6 days ago
          • Martin Santangelo @msantang78 added 1 commit 6 days ago

            added 1 commit

            • 3a40e976 - (chore) format code

            Compare with previous version

          • Emiliano Balbuena @edgebal approved this merge request 11 hours ago

            approved this merge request

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 9 hours ago

            approved this merge request

          • Martin Santangelo @msantang78 mentioned in commit 88a48bab 9 hours ago

            mentioned in commit 88a48bab

          • Martin Santangelo @msantang78 merged 9 hours ago

            merged

          • 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
          sprint: Kilted Koala
          Milestone
          sprint: Kilted Koala
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          3
          3 participants
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          Reference: minds/mobile-native!295

          Revert this merge request

          This will create a new commit in order to revert the existing changes.

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.

          Cherry-pick this merge request

          Switch branch
          Cancel
          A new branch will be created in your fork and a new merge request will be started.