Request to merge brianhatchet:admin_firehose into master
0/3 discussions resolved
changed milestone to %sprint: Elevated Eagle
Last updated by Brian Hatchet2 2 Component, 3 3 EventEmitter, 4 4 Input, 5 Output, 5 Output - Owner
Can we keep the trailing commas?
MaintainerAdded back
changed this line in version 6 of the diff
- Last updated by Brian Hatchet
1 2 <div class="m-admin-firehose mdl-grid"> 3 <ng-container *ngIf="activity"> 4 <div class="m-firehose--moderator-action m-firehose--moderator-action--left-button mdl-color--white m-border mdl-cell mdl-cell--1-col" - Owner
Can we use new style
m-firehose__moderatorAction? - Owner
and use
--modifier - Maintainer
Refactored
changed this line in version 6 of the diff
- Last updated by Brian Hatchet
16 activities: Array<any> = []; 17 activity: any = null; 18 inProgress: boolean = true; 19 reportModalOpened: boolean = false; 20 21 @ViewChild('firehoseReportModal') modal: ReportReasonModalComponent; 22 23 constructor(private session: Session, public client: Client) {} 24 25 ngOnInit() { 26 this.load(); 27 } 28 29 private load() { 30 this.inProgress = true; 31 return this.client.get('api/v2/admin/firehose') - Owner
can we use async/await?
changed this line in version 4 of the diff
- Maintainer
Used async and wait
changed target branch from
mastertoepic/ReportingAndModerationunmarked as a Work In Progress
added 23 commits
- 76ac4c78...3590ad06 - 22 commits from branch
minds:epic/ReportingAndModeration - bd8b5f50 - Merge remote-tracking branch 'upstream/epic/ReportingAndModeration' into admin_firehose
- 76ac4c78...3590ad06 - 22 commits from branch
added 19 commits
- bd8b5f50...aff31974 - 18 commits from branch
minds:epic/ReportingAndModeration - ca16369c - Merge remote-tracking branch 'upstream/epic/ReportingAndModeration' into admin_firehose
- bd8b5f50...aff31974 - 18 commits from branch
added 4 commits
- ca16369c...dd47771c - 3 commits from branch
minds:epic/ReportingAndModeration - b1d0f465 - Merge remote-tracking branch 'upstream/epic/ReportingAndModeration' into admin_firehose
- ca16369c...dd47771c - 3 commits from branch
added 31 commits
- 8d2c3644 - (feat): buy buttons
- 2a627f99 - (fix): show correct eth balance
- 2f4ff888 - (chore): reduce boost rotator threshold due to backlog
- bfd43112 - [Sprint/ElevatedEagle] (feat): blog e2e tests
- e9bbf747 - Merge branch 'sprint/ElevatedEagle.feat.blog-e2e-tests' into 'master'
- ddcfd4f7 - [Sprint/DapperDingo] (feat): newsfeed e2e tests
- 68a08789 - Merge branch 'sprint/DapperDingo.feat.newsfeed-e2e-tests' into 'master'
- 9f371307 - Added bottom padding for login component #1319 (closed)
- 3cd970c4 - Merge branch 'fix-css-out-of-bounds-mobile-web' into 'master'
- 4317679d - [Sprint/CleverChipmunk] (fix): notification popups are behind groups topbar on mobile web
- 729de3ad - Merge branch...
- 9964e7bc - iOS - Quickfix to CSS
- 2b3c7bb5 - Merge branch 'ios-signup-css-fix' into 'master'
- 8d743d44 - Sprint/ElevatedEagle: Fixed colour theme issue on bulb button #1300 (closed)
- 123c5f52 - Merge branch 'fix-blacked-out-bulb-button-video-1300' into 'master'
- 9ad37154 - (fix): remove loggedOutLeftContainer template
- 445b95f7 - (fix): only set timeout for theme toggling if logged in
- ad7549d3 - Merge branch 'epic/ReportingAndModeration'
- 639a433e - (feat): eth purchase modal
- b80660fb - (fix): Change blocked user's content on remind notice (#1325 (closed))
- 6a385887 - Merge branch 'sprint/FunnyFrog.remind-message' into 'master'
- 362e9b26 - (feat): unleash darkmode
- 73c20ec7 - (chore): blogs have min-height vs height
- cc44538d - (fix): if no entity then don't blow up
- b0231389 - Merge branch...
- 9238d798 - (feature) Metamask download prompts in our transaction overlays
- d3c3b508 - Merge branch 'metamask-buy-token-modal' into 'epic/onchainImprovements'
- 2817a391 - Merge branch 'epic/onchainImprovements' of gitlab.com:minds/front
- b1351f4f - (fix) Don't prompt for metamask on offchain wires
- d5b84390 - Merge branch 'fixing-wire-creator-offchain' into 'master'
- 4243f5bd - Merge remote-tracking branch 'upstream/master' into admin_firehose
Toggle commit listchanged target branch from
epic/ReportingAndModerationtomastermarked as a Work In Progress from brianhatchet/front@158278fd
added 6 commits
- 158278fd...dbdc747a - 4 commits from branch
minds:master - 022538fb - Merge remote-tracking branch 'upstream/master' into admin_firehose
- e4c08b46 - Fixing unit tests
- 158278fd...dbdc747a - 4 commits from branch
added 9 commits
- e4c08b46...8d20be4c - 7 commits from branch
minds:master - 9e5a944f - Merge remote-tracking branch 'upstream/master' into admin_firehose
- 14e57d3a - Merge remote-tracking branch 'upstream/master' into admin_firehose
- e4c08b46...8d20be4c - 7 commits from branch
added 4 commits
- 14e57d3a...ffcd4c49 - 2 commits from branch
minds:master - 4458316c - Merge remote-tracking branch 'upstream/master' into admin_firehose
- a0dadbd5 - Firehose size fix
- 14e57d3a...ffcd4c49 - 2 commits from branch
unmarked as a Work In Progress
added 9 commits
- a0dadbd5...85c3f611 - 8 commits from branch
minds:master - d71fb6a3 - Merge remote-tracking branch 'upstream/master' into admin_firehose
- a0dadbd5...85c3f611 - 8 commits from branch
added 1 commit
- 4e769467 - (fix): failing test due to success not being set for admin
approved this merge request
- Owner
@all please approve
- Owner
@all please approve
approved this merge request
merged
mentioned in commit 65b5bbb3