Commit Graph

7803 Commits

Author SHA1 Message Date
Sean King 325930eecb
Fix merge conflicts 2022-08-08 07:32:38 -06:00
Henry Jameson 55791f3824 move pleroma-tan just a tiny bit lower 2022-08-08 14:21:06 +03:00
Henry Jameson e147dbfb82 art credit 2022-08-08 14:20:01 +03:00
Henry Jameson 0832228e45 lint 2022-08-08 12:18:06 +03:00
Henry Jameson 3f7cf52f53 proper animation 2022-08-08 12:17:32 +03:00
Henry Jameson 95f03a56ab don't let function access `this` 2022-08-08 02:18:29 +03:00
Henry Jameson 502d76ebcd lint 2022-08-08 02:14:43 +03:00
Henry Jameson f63ee29fac proper links and fix user detection 2022-08-08 02:14:09 +03:00
Henry Jameson fcf62a13ed don't show to anons, make it possible to disable notification instance-wide 2022-08-08 02:01:07 +03:00
Henry Jameson 59d160a6dd Merge remote-tracking branch 'origin/develop' into been-awhile
* origin/develop:
  lint
  fix bugs
  Apply 1 suggestion(s) to 1 file(s)
  change icons
  Update dependency vue-i18n to v9.2.0
  made quick settings into their own component, added quick view settings, added both to conversation view
2022-08-08 01:48:38 +03:00
HJ 4bfad25f01 Apply 2 suggestion(s) to 1 file(s) 2022-08-07 17:38:36 +00:00
HJ 068139b27e Merge branch 'timeline-view-menu' into 'develop'
Quick View Menu for timeline and conversations, filter for conversations

Closes #1179

See merge request pleroma/pleroma-fe!1578
2022-08-07 17:36:05 +00:00
Sean King 470654d275
Update fallback privileges for moderators to include reports_manage_reports 2022-08-07 01:20:49 -06:00
Sean King 572f28d7c9 Merge branch 'fix/merge-conflicts/report-notifications' into 'feat/report-notification'
Fixing merge conflicts and lint for report notifications MR

See merge request pleroma/pleroma-fe!1585
2022-08-07 06:38:56 +00:00
Sean King 6a2f427072
Fix lint stuff 2022-08-06 22:15:34 -06:00
Sean King dc9951d400
Fix merge conflicts 2022-08-06 22:02:21 -06:00
Ilja 56d1232588 Show moderation drop down menu and items based on privileges
There's a seperator between certain blocks of items. I show/hide the seperator together with the block under it.
When a block with a seperator is at the top, the seperator doesn't show, keeping a consistent look with seperators only between blocks.

I also hide granting roles for deactivated accounts because that doesn't make much sense to me.

For the rest the items are hidden when you're not privileged. When there's no privileges that show items, the menu isn't shown either.
2022-08-06 22:33:38 +02:00
Alexander Tumin 891fbf996d Lists implementation: make route naming consistent 2022-08-06 21:39:36 +03:00
Alexander Tumin b5eba5974c Lists implementation: tests, linter fix 2022-08-06 18:28:49 +03:00
Alexander Tumin 171f6f0894 Lists implementation 2022-08-06 17:56:54 +03:00
Ilja 6c9768b8e2 Option to delete a post is shown when privileged with messages_delete 2022-08-06 14:00:29 +02:00
Ilja 0d714f07ec Add priviliges
We can now check what priviliges someone has besides only the role.
On older back-ends, privileges aren't provided, so we have a fall-back to list the privileges corresponding to what mods/admins are allowed on older BE's.
2022-08-06 12:01:13 +02:00
marcin mikołajczak 6649baaac9 Merge remote-tracking branch 'pleroma/develop' into birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-05 11:53:44 +02:00
Hélène fbc3f783d1 Apply 2 suggestion(s) to 1 file(s) 2022-08-05 08:16:47 +00:00
Henry Jameson 09f3783647 lint 2022-08-04 23:44:56 +03:00
Henry Jameson 44d6d36ed1 fix bugs 2022-08-04 23:32:06 +03:00
HJ 2802e47ac9 Apply 1 suggestion(s) to 1 file(s) 2022-08-04 19:34:29 +00:00
Henry Jameson 8c59bad3c2 unit test + some refactoring 2022-08-04 22:09:42 +03:00
tusooa 610720f164 Merge branch 'renovate/vue-i18n-9.x' into 'develop'
Update dependency vue-i18n to v9.2.0

See merge request pleroma/pleroma-fe!1580
2022-08-04 18:29:19 +00:00
Henry Jameson 9c00610d00 refactoring 2022-08-04 17:20:11 +03:00
Henry Jameson 6c0a6ff8b0 shadow 2022-08-04 02:15:35 +03:00
Henry Jameson 8b56db177b debug handlers for now 2022-08-04 02:12:04 +03:00
Henry Jameson dbfca224d8 server-side storage for flags 2022-08-04 01:56:52 +03:00
Sean King 04e62df377
Allow for template inside Timeago component that shows unless the time string is 'just now' 2022-08-02 23:19:25 -06:00
Henry Jameson 4903069481 change icons 2022-08-02 23:54:06 +03:00
Pleroma Renovate Bot 82d63c3bb8 Update dependency vue-i18n to v9.2.0 2022-08-02 09:06:45 +00:00
Pleroma Renovate Bot 420e56fa4d Update babel monorepo to v7.18.10 2022-08-02 09:05:29 +00:00
Sean King b70d50407c
Refresh the relative time object for a Timeago component if the time changes 2022-08-01 21:25:08 -06:00
Sean King 232cc72df8
Fix lint errors and warnings 2022-08-01 18:45:52 -06:00
Sean King 081aa0fd05
Fix merge conflicts 2022-08-01 18:17:09 -06:00
Henry Jameson 5b7c653874 initial scratch 2022-08-02 00:37:48 +03:00
Henry Jameson f4276f7241 made quick settings into their own component, added quick view settings,
added both to conversation view
2022-08-01 23:20:27 +03:00
HJ 3fc9673a7d Merge branch 'from/develop/tusooa/1172-reg-indicator' into 'develop'
Add optional/required indicator for registration fields

Closes #1172

See merge request pleroma/pleroma-fe!1543
2022-08-01 11:48:52 +00:00
HJ 3c9d6b0ff0 Merge branch 'renovate/vue-router-4.x' into 'develop'
Update dependency vue-router to v4.1.3

See merge request pleroma/pleroma-fe!1574
2022-08-01 11:47:41 +00:00
HJ 8e7f3ea074 Merge branch 'eslint-update' into 'develop'
update ESLint

See merge request pleroma/pleroma-fe!1576
2022-08-01 11:46:57 +00:00
HJ d0a09480b3 Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate

See merge request pleroma/pleroma-fe!1560
2022-08-01 11:46:31 +00:00
Weblate 71d9bbb56b Merge remote-tracking branch 'origin/develop' into develop 2022-07-31 23:00:53 +00:00
HJ 33ad712852 Merge branch 'disjointed-popovers' into 'develop'
Disjointed popovers

See merge request pleroma/pleroma-fe!1540
2022-07-31 17:57:32 +00:00
Henry Jameson 32718016e1 label, info on WIPs 2022-07-31 17:07:07 +03:00
Henry Jameson dd1abc9f5d add gitlab templates 2022-07-31 17:04:48 +03:00