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 817
    • Issues 817
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 73
    • Merge Requests 73
  • 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
  • !353

Closed
Opened 2 weeks ago by Olivia Madrid@omadrid
  • Report abuse
Report abuse

WIP: Referrals console

For review of architecture/file locations

Check out, review, and merge locally

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

git fetch https://gitlab.com/omadrid/front.git referralsConsole
git checkout -b omadrid/front-referralsConsole 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 omadrid/front-referralsConsole

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 omadrid:referralsConsole into master
  • Email patches
  • Plain diff
Pipeline #68413156 passed for 08f50ae5 on omadrid:referralsConsole
    Requires 2 more approvals from Devs.
    Brian Hatchet
    Brian Hatchet
    Marcelo Rivera
    Marcelo Rivera
    Emiliano Balbuena
    Emiliano Balbuena
    Ben Hayward
    Ben Hayward
    Mark Harding
    Mark Harding

    Closed by Olivia Madrid 15 minutes ago

    The changes were not merged into master

    • Discussion 0
    • Commits 8
    • Pipelines 4
    • Changes 20
    • Loading...
    • Olivia Madrid @omadrid added 42 commits 1 week ago

      added 42 commits

      • 584d2c27...6b47ccf4 - 38 commits from branch minds:master
      • 62ebfd4e - setup architecture for referrals console in wallet/tokens
      • d322ec3e - tweak html structure
      • a282e7e5 - WIP: Referrals - move referrals components into a module
      • 5ce86a90 - WIP: Referrals front end

      Compare with previous version

      Toggle commit list
    • Olivia Madrid @omadrid added 9 commits 6 days ago

      added 9 commits

      • 5ce86a90...4d5c1bd1 - 2 commits from branch minds:master
      • f79262d4 - setup architecture for referrals console in wallet/tokens
      • f7b387d2 - tweak html structure
      • d5547685 - WIP: Referrals - move referrals components into a module
      • 2ca7af71 - WIP: Referrals front end
      • cbcdddf3 - (fix): don't let bulb toggle darkmode on touchscreen devices
      • aebef438 - (chore): make all the buttons in the media page action bar the same color
      • e5c492b3 - WIP: referrals - still needs sendMessage, infiniteScroll, styling for table and mobile

      Compare with previous version

      Toggle commit list
    • Olivia Madrid @omadrid added 10 commits 3 days ago

      added 10 commits

      • e5c492b3...78c51325 - 2 commits from branch minds:master
      • 8f4c7364 - setup architecture for referrals console in wallet/tokens
      • 3ac3c2c9 - tweak html structure
      • bb04962c - WIP: Referrals - move referrals components into a module
      • ab108c40 - WIP: Referrals front end
      • 075f09a2 - (fix): don't let bulb toggle darkmode on touchscreen devices
      • 359e8e60 - (chore): make all the buttons in the media page action bar the same color
      • 296dcf0e - WIP: referrals - still needs sendMessage, infiniteScroll, styling for table and mobile
      • 08f50ae5 - WIP: Referrals - implement infinite scroll

      Compare with previous version

      Toggle commit list
    • Mark Harding @markeharding added MR::Awaiting Review label 6 hours ago

      added MR::Awaiting Review label

    • Olivia Madrid @omadrid closed 15 minutes ago

      closed

    • 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
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    7
    7 participants
    user avatar
    Brian Hatchet
    user avatar
    Marcelo Rivera
    user avatar
    Emiliano Balbuena
    user avatar
    Ben Hayward
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Olivia Madrid
    Reference: minds/front!353