basic multitenancy support #3158

Open
mkljczk wants to merge 7 commits from gitlab-mr-iid-1891 into develop
Member

For pleroma/pleroma#7342. Todo:

  • sign up
  • admin dashboard features

obraz.png

obraz.png

For pleroma/pleroma#7342. Todo: - [x] sign up - [x] admin dashboard features ![obraz.png](/attachments/812b5f94-7bec-40f2-994d-8032e728b3f8) ![obraz.png](/attachments/aab140a5-1c73-4ab9-8d8d-548d5e234b9d)
Owner
```suggestion:-0+0 ```
Owner

Need to have some sort of basic description/explanation in admin section on what feature does exactly.

Need to have some sort of basic description/explanation in admin section on what feature does exactly.
Owner

"Switch state" is way too abstract, having "Make public" / "Make private" would be better

"Switch state" is way too abstract, having "Make public" / "Make private" would be better
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This pull request has changes conflicting with the target branch.
  • src/boot/after_store.js
  • src/components/extra_buttons/extra_buttons.vue
  • src/components/registration/registration.js
  • src/components/registration/registration.vue
  • src/components/settings_modal/admin_tabs/frontends_tab.vue
  • src/components/settings_modal/admin_tabs/instance_tab.vue
  • src/components/settings_modal/settings_modal_admin_content.js
  • src/components/settings_modal/settings_modal_admin_content.vue
  • src/components/settings_modal/tabs/notifications_tab.vue
  • src/i18n/en.json
  • src/modules/adminSettings.js
  • src/services/api/api.service.js
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-1891:gitlab-mr-iid-1891
git switch gitlab-mr-iid-1891

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-1891
git switch gitlab-mr-iid-1891
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-1891
git switch gitlab-mr-iid-1891
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-1891
git switch develop
git merge --squash gitlab-mr-iid-1891
git switch develop
git merge --ff-only gitlab-mr-iid-1891
git switch develop
git merge gitlab-mr-iid-1891
git push origin develop
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma/pleroma-fe!3158
No description provided.