Skip to content
Snippets Groups Projects

Generate invite tokens from admin-fe

Merged Angelina Filippova requested to merge linafilippova/admin-fe:feature/invites into master

This MR allows to create invite tokens, list them on a separate tab, invite users via email. It also updates error handling and allows to generate tokens for resetting password.

Closes #28 (closed)

Edited by Angelina Filippova

Merge request reports

Pipeline #17505 passed

Pipeline passed for 825ce488 on linafilippova:feature/invites

Approval is optional

Merged by Maxim FilippovMaxim Filippov 5 years ago (Sep 23, 2019 7:00pm UTC)

Merge details

  • Changes merged into master with b7c8ebec (commits were squashed).
  • Deleted the source branch.
  • Auto-merge enabled

Pipeline #17506 passed

Pipeline passed for b7c8ebec on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Maxim Filippov
  • LGTM, besides what I've mentioned in the comments

  • added 1 commit

    • a90b8a1f - Apply suggestion to src/store/modules/invites.js

    Compare with previous version

  • added 1 commit

    • 4d422a39 - Apply suggestion to src/store/modules/invites.js

    Compare with previous version

  • added 1 commit

    • 7b30e7f4 - Apply suggestion to src/views/invites/index.vue

    Compare with previous version

  • Angelina Filippova resolved all discussions

    resolved all discussions

  • added 3 commits

    • e08c491a - Remove isDesktop conditionals from components where possible
    • 9fce1b2f - Refactor applying actions to multiple users
    • 497176e5 - Merge branch 'feature/invites' of git.pleroma.social:linafilippova/admin-fe into feature/invites

    Compare with previous version

  • added 3 commits

    Compare with previous version

  • Maxim Filippov enabled an automatic merge when the pipeline for af381c0e succeeds

    enabled an automatic merge when the pipeline for af381c0e succeeds

  • added 1 commit

    Compare with previous version

  • Maxim Filippov enabled an automatic merge when the pipeline for 825ce488 succeeds

    enabled an automatic merge when the pipeline for 825ce488 succeeds

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading