Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 826
    • Issues 826
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 60
    • Merge Requests 60
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !357

Open
Opened 5 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe](feat): Added in buttons for play store and ios #613

Towards closing #613

image

Edited 16 minutes ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git ios-android-added-play-store2
git checkout -b benhayward.ben/front-ios-android-added-play-store2 FETCH_HEAD

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 benhayward.ben/front-ios-android-added-play-store2

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 benhayward.ben:ios-android-added-play-store2 into master
The source branch is 24 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67067900 passed for 28c37730 on benhayward.ben:ios-android-added-play-store2
    Requires 2 more approvals from Devs.
    Brian Hatchet
    Brian Hatchet
    Emiliano Balbuena
    Emiliano Balbuena
    Marcelo Rivera
    Marcelo Rivera
    Martin Santangelo
    Martin Santangelo
    Mark Harding
    Mark Harding
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request

    Allows commits from members who can merge to the target branch

    Closes #613

    Deletes source branch

    • Discussion 2
    • Commits 2
    • Pipelines 2
    • Changes 4
    0/1 discussion resolved
    • Loading...
    • Mark Harding
      Mark Harding @markeharding started a discussion on an old version of the diff 12 hours ago
      Last updated by Ben Hayward 15 minutes ago
      src/app/modules/mobile/marketing/marketing.component.html
      14 13 </h2>
      15
      16 14 </div>
      17 15
      18 16 <div class="m-marketing--hero--actions">
      19 17 <i class="material-icons m-mobile__giantDroid">android</i>
      18 <div class="m-marketing--hero--actions">
      19 <i class="material-icons m-mobile__giantDroid">android</i>
      20 </div>
      21
      22 <div class="mdl-card__supporting-text m-marketing--section--downloadContainer">
      23 <a href="https://geo.itunes.apple.com/us/app/minds-com/id961771928?mt=8&amp;uo=6">
      24 <img class="m-marketing--section--downloadButton m-marketing--section--downloadButton--ios"
      25 src="https://devimages-cdn.apple.com/app-store/marketing/guidelines/images/badge-download-on-the-app-store.svg">
      26 </a>
      27 <a href='https://play.google.com/store/apps/details?id=com.minds.mobile&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
      • Mark Harding
        Mark Harding @markeharding · 12 hours ago
        Owner

        I think we should replace google play with our app. Also these should be less prominent that the download link for our version

      • Ben Hayward @benhayward.ben changed this line in version 2 of the diff 18 minutes ago

        changed this line in version 2 of the diff

      • Ben Hayward
        Ben Hayward @benhayward.ben · 15 minutes ago
        Developer

        Okay, no bother, I've done that. How do you feel about the above?

      Please register or sign in to reply
    • Ben Hayward @benhayward.ben added 1 commit 18 minutes ago

      added 1 commit

      • 28c37730 - Addressed feedback

      Compare with previous version

    • Ben Hayward @benhayward.ben changed the description 16 minutes ago

      changed the description

    • 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
    Assignee
    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
    6
    6 participants
    user avatar
    Brian Hatchet
    user avatar
    Emiliano Balbuena
    user avatar
    Marcelo Rivera
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Ben Hayward
    Reference: minds/front!357