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 888
    • Issues 888
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 48
    • Merge Requests 48
  • 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
  • !494

Open
Opened 2 weeks ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

WIP: epic/post-scheduler

Check out, review, and merge locally

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

git fetch origin
git checkout -b epic/post-scheduler origin/epic/post-scheduler

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 epic/post-scheduler

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 epic/post-scheduler into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #79213484 failed for de6bc61c on epic/post-scheduler
              Requires 2 more approvals from Devs and Deployers.
              Brian Hatchet
              Brian Hatchet
              Guy Thouret
              Guy Thouret
              Mark Harding
              Mark Harding
              Martin Santangelo
              Martin Santangelo
              Marcelo Rivera
              Marcelo Rivera
              This is a Work in Progress
              You can merge this merge request manually using the
              • Discussion 25
              • Commits 19
              • Pipelines 18
              • Changes 24
              18/21 threads resolved
              • Loading...
              • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

                added 1 commit

                • 3d3b9987 - (feat) add tooltip to show date

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

                added 1 commit

                • 79d4c893 - (feat) add custom time when posting, creating and editing blog and when editing activity

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

                added 1 commit

                • 032af961 - (fix) change property name and add mock component to spec tests

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 2 weeks ago

                added 1 commit

                • 01a4158c - (fix) change format of time created property

                Compare with previous version

              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • ff0c90e4 - (fix) adapt code to reviews

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro resolved all threads 1 week ago

                resolved all threads

              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • 4c47ed6c - (feat) add view and styles for scheduled activities count

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • 8aa592f5 - (feat) filter activities by time_created to get scheduled

                Compare with previous version

              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 1 week ago
                Last updated by Marcelo Rivera 1 hour ago
                src/app/modules/blogs/blog.scss
                301 301
                302 302 m-wire-threshold-input {
                303 303 position: relative;
                304 padding: 8px;
                • Mark Harding
                  Mark Harding @markeharding · 1 week ago
                  Owner

                  this doesn't look related to post scheduler?

                • Juan Manuel Solaro
                  Juan Manuel Solaro @juanmsolaro · 1 week ago
                  Developer

                  I removed that padding because of spacing. We don't have enough when mark Mature Content flag. Screenshot_from_2019-08-22_12-42-50 Another option is to reduce padding from the 'E' icon to from 8px to 6px, like this: Screenshot_from_2019-08-22_12-46-51

                • Marcelo Rivera
                  Marcelo Rivera @eiennohi · 1 hour ago
                  Developer

                  @markeharding what's your input on this?

                • Please register or sign in to reply
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Mark Harding
                Mark Harding @markeharding started a thread on an old version of the diff 1 week ago
                Resolved by Juan Manuel Solaro 1 week ago
              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • 3fa631c7 - (fix) minor view fixes

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • 56dfa91a - (feat) ability to count scheduled activities

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • 8741ca7a - (test) add spec to poster date selector component

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

                added 1 commit

                • 1a8b1ef8 - (fix) adapt and fix code to mark's review

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 6 days ago

                added 1 commit

                • ac65702a - (fix) move scheduled endpoint as per review

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 3 days ago

                added 1 commit

                • b3966e9f - (feat) e2e tests for scheduled activities

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 67 commits 2 days ago

                added 67 commits

                • b3966e9f...5ed6e576 - 66 commits from branch master
                • 0c67461b - (fix) merge master to branch

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 4 commits 1 day ago

                added 4 commits

                • 0c67461b...9f4057ca - 3 commits from branch master
                • 678daba4 - Merge branch 'master' into epic/post-scheduler

                Compare with previous version

              • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

                added 1 commit

                • 5914b929 - (fix) apply prettier fixes

                Compare with previous version

              • Emiliano Balbuena @edgebal added 6 commits 2 hours ago

                added 6 commits

                • 5914b929...d69d2bd0 - 4 commits from branch master
                • fea27a60 - (chore): Lint w/ prettierrc
                • de6bc61c - Merge remote-tracking branch 'origin/master' into epic/post-scheduler

                Compare with previous version

              • Marcelo Rivera
                Marcelo Rivera @eiennohi started a thread on the diff 1 hour ago
                src/app/common/components/poster-date-selector/poster-date-selector.component.ts
                1 import { Component, EventEmitter, Input, Output } from '@angular/core';
                2 import { DatePipe } from '@angular/common';
                3
                4 @Component({
                5 moduleId: module.id,
                6 selector: 'm-poster-date-selector',
                7 templateUrl: 'poster-date-selector.component.html',
                • Marcelo Rivera
                  Marcelo Rivera @eiennohi · 1 hour ago
                  Developer

                  nothing big, but this filename could be just selector.component.ts, and the same for the html and scss. This looks cleaner, and the full name isn't needed, as we have those files in the folder.

                • Please register or sign in to reply
              • Marcelo Rivera
                Marcelo Rivera @eiennohi started a thread on the diff 1 hour ago
                src/app/modules/channels/sorted/sorted.component.ts
                62 63
                64 viewScheduled: boolean = false;
                65
                63 66 @ViewChild('poster', { static: false }) protected poster: PosterComponent;
                64 67
                68 scheduledCount: number = 0;
                69
                65 70 constructor(
                66 71 public feedsService: FeedsService,
                67 72 protected service: SortedService,
                68 73 protected session: Session,
                69 74 protected clientMetaService: ClientMetaService,
                70 75 @SkipSelf() injector: Injector,
                71 protected cd: ChangeDetectorRef
                76 protected cd: ChangeDetectorRef,
                77 public client: Client
                • Marcelo Rivera
                  Marcelo Rivera @eiennohi · 1 hour ago
                  Developer

                  always include trailing commas at the end of these, so we have better diffs in future MRs

                • 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
              Brian Hatchet
              user avatar
              Guy Thouret
              user avatar
              Mark Harding
              user avatar
              Martin Santangelo
              user avatar
              Marcelo Rivera
              user avatar
              Emiliano Balbuena
              user avatar
              Olivia Madrid
              Reference: minds/front!494