Commit Graph

1014 Commits

Author SHA1 Message Date
Henry Jameson
373fb077a8 use new color slot for badges 2022-10-17 21:50:49 +03:00
Ilja
5541d0ec29 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into fine_grained_moderation_privileges 2022-09-24 15:56:27 +02:00
Sean King
12d8d1711b
Added support for removing users from followers 2022-09-15 22:02:58 -06:00
tusooa
2bea5d8128 Merge branch 'add/edit-status' into 'develop'
Add edit status functionality

See merge request pleroma/pleroma-fe!1537
2022-09-11 18:08:00 +00:00
tusooa
8b25febe36 Merge branch 'navigation-update' into 'develop'
Navigation update + preferences storage (and some minor fixes)

See merge request pleroma/pleroma-fe!1592
2022-08-30 00:14:30 +00:00
Tusooa Zhu
0a79a74773
Use dedicated indicator for non-ascii domain names 2022-08-29 18:46:41 -04:00
Henry Jameson
cd7380efe7 Merge remote-tracking branch 'origin/develop' into navigation-update
* origin/develop:
  Update dependency opn to v5
  fix notices being under the navbar, also change offset to use variable
  fix modals not having proper z index
  reduce indexes to be below 9999 so that develop error messages appear above
  Do not allow to find by name in findUser()
  Use lookup endpoint to obtain users by nickname
  Use $ for id UserProfile routes
  Allow opening profile: multiChoiceProprties record, anonymous access
  Allow opening profile when clicking an avatar inside of user popover
2022-08-23 21:52:17 +03:00
Sean King
ee58e3868c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status 2022-08-22 19:08:58 -06:00
HJ
88a3cf8705 Merge branch 'from/develop/tusooa/user-profile-routes' into 'develop'
Stop generating /:nickname user profile routes

See merge request pleroma/pleroma-fe!1589
2022-08-22 21:56:55 +00:00
Henry Jameson
7b6745bb84 Merge remote-tracking branch 'origin/develop' into navigation-update
* origin/develop: (49 commits)
  Fix react & extra buttons not styled on tab-focus
  Fix popover not popping up
  Fix styling on Safari
  Use :focus-visible instead of :focus for focus markers
  Optimize Reply badge position
  Add badges to status interacting buttons
  Update dependency nightwatch to v2
  Update dependency eslint-plugin-n to v15.2.5
  Update dependency mocha to v10
  Update dependency karma-coverage to v2
  Update dependency sass to v1.54.5
  Update dependency karma-firefox-launcher to v2
  Update dependency vue-template-compiler to v2.7.9
  Pin dependencies
  Refresh yarn.lock
  Allow column width configuration: allow stretching navbar with columns
  Remove legacy code for chunksSortMode
  Add FIXME comment about html-webpack-plugin-after-emit
  Use exact webpack version in package.json
  Reintroduce css minimizer
  ...
2022-08-23 00:35:25 +03:00
HJ
8e97a40c70 Merge branch 'allow-application-width-configuration' into 'develop'
Allow application width configuration

See merge request pleroma/pleroma-fe!1533
2022-08-22 21:32:31 +00:00
Tusooa Zhu
aa97335b20
Make webpack 5 work 2022-08-15 18:01:33 -04:00
Henry Jameson
50f5afbce1 add and remove users to/from lists from their profile 2022-08-15 23:19:33 +03:00
Henry Jameson
8d3d8fffab fixes, clear cache on logout 2022-08-12 01:19:19 +03:00
Alexander Tumin
3e7e31d4a9 Allow column width configuration
Group column configuration in settings
Column width configuration: do not act on defaults
2022-08-11 16:38:24 +03:00
Tusooa Zhu
09f9640be1
Use lookup endpoint to obtain users by nickname 2022-08-09 22:11:55 -04:00
HJ
750696643f Merge branch 'feat/report-notification' into 'develop'
#949 Feat/report notification

See merge request pleroma/pleroma-fe!1322
2022-08-09 21:56:15 +00:00
HJ
7773e7de64 Merge branch 'lists-implementation' into 'develop'
Add lists support

See merge request pleroma/pleroma-fe!1584
2022-08-09 21:46:55 +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
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
Alexander Tumin
171f6f0894 Lists implementation 2022-08-06 17:56:54 +03: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
Henry Jameson
dbfca224d8 server-side storage for flags 2022-08-04 01:56:52 +03: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
bd5d5c9df7 "deal" with async promise executor, should be fine in these specific cases 2022-07-31 13:18:11 +03:00
Henry Jameson
ee066c4436 fix filesizeformat const/let stuff 2022-07-31 12:39:34 +03:00
Henry Jameson
b44df37c1b "fix" the sort function potentially not always outputting results 2022-07-31 12:39:02 +03:00
Henry Jameson
fc18673030 deal with no-prototype-builtins 2022-07-31 12:36:02 +03:00
Henry Jameson
fddb531ed2 --fix 2022-07-31 12:35:48 +03:00
Ilja
18d69f93d3 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-07-18 12:42:40 +02:00
Tusooa Zhu
48c474ed3a
Fix non-8bit string export problem 2022-07-16 11:15:08 -04:00
Tusooa Zhu
b11ac22192
Fix search() not honouring type param 2022-07-15 20:22:39 -04:00
Sean King
63519c325f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status 2022-07-10 20:06:18 -06:00
Sean King
fa5d35523d
Add ability to view status history for edited statuses 2022-06-20 22:52:08 -06:00
HJ
56501e95c4 Merge branch 'from/develop/tusooa/migration-ui' into 'develop'
Add ui for account migration

See merge request pleroma/pleroma-fe!1414
2022-06-19 20:35:58 +00:00
HJ
5ad7dc7835 Merge branch 'from/develop/tusooa/backup-ui' into 'develop'
Add ui for backup

See merge request pleroma/pleroma-fe!1520
2022-06-19 20:31:19 +00:00
Sean King
77e6aa6968
Remove comment regarding Mastodon in API service 2022-06-11 10:32:37 -06:00
Sean King
1a333aabba
Add edit status functionality 2022-06-07 21:31:48 -06:00
Tusooa Zhu
c17de10d3a
Delegate relativeTime plural rules to vue-i18n 2022-06-07 20:22:03 -04:00
HJ
0aa334515b Merge branch 'threecolumn' into 'develop'
Layout refactoring + Three column mode

See merge request pleroma/pleroma-fe!1503
2022-05-31 17:46:59 +00:00
HJ
9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ
069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
HJ
a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
Add language options

See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
HJ
48f97ebf40 Merge branch 'eientei-pass-avatar-file-name' into 'develop'
Pass file name of cropped avatar to form data

See merge request pleroma/pleroma-fe!1522
2022-05-22 16:25:46 +00:00
Alexander Tumin
29b084b4b8 Pass file name of cropped avatar to form data 2022-05-21 19:44:44 +03:00
Tusooa Zhu
a35daceb5b
Add settings for filtering end-of-poll notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu
df487e3980
Show poll-end notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu
f3ce76ddbf
Add backup UI 2022-05-09 00:42:21 -04:00
Tusooa Zhu
176da2bbe5
Add frontend ui for aliases and migration
Ref: migrate-ui
2022-04-29 21:27:03 -04:00
Tusooa Zhu
d39de30221
Add config opts for email language 2022-04-29 20:34:31 -04:00
Tusooa Zhu
a5e861cd01
Set userLanguage cookie when setting interface language 2022-04-29 20:34:29 -04:00
Henry Jameson
4b050c7fa5 properly ignore sticky elements when calculating offset because they
technically are following main scroll
2022-04-12 21:49:14 +03:00
Henry Jameson
b8b7ae8564 fancy scrollbars 2022-04-07 16:04:22 +03:00
Henry Jameson
f21dc21a83 properly implement resettableAsyncComponent 2022-03-28 23:55:57 +03:00
Ilja
d0bfd9a808 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-03-20 09:53:57 +01:00
Henry Jameson
cd4ad2df11 Merge remote-tracking branch 'origin/develop' into vue3-again
* origin/develop: (475 commits)
  Apply 1 suggestion(s) to 1 file(s)
  Update dependency @ungap/event-target to v0.2.3
  Update package.json
  fix broken icons after FA upgrade
  Update Font Awesome
  Update dependency webpack-dev-middleware to v3.7.3
  Update dependency vuelidate to v0.7.7
  Pin dependency @kazvmoe-infra/pinch-zoom-element to 1.2.0
  lint
  Make media modal buttons larger
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  ...
2022-03-16 21:00:20 +02:00
Henry Jameson
a97db1efd6 Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
* origin/develop: (83 commits)
  Make media modal buttons larger
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  Bump pinch-zoom-element version
  Clean up
  Check whether we swiped only for mouse pointer
  Scale swipe threshold with viewport width
  Update pinch-zoom-element
  Allow pinch-zoom to fill the whole screen
  Use native click for hiding overlay
  Reset position on swipe end even if we cannot navigate
  Make lint happy
  ...
2022-03-14 09:31:24 +02:00
Tusooa Zhu
7dd1a0dd30
Prevent hiding media viewer if swiped over SwipeClick 2022-03-13 12:02:02 -04:00
Tusooa Zhu
5829cd98af
Clean up debug code for image pinch zoom 2022-03-13 12:02:02 -04:00
Tusooa Zhu
a485ebc2bb
Check whether we swiped only for mouse pointer 2022-03-13 12:00:45 -04:00
Tusooa Zhu
6980e4ddf1
Scale swipe threshold with viewport width 2022-03-13 12:00:44 -04:00
Tusooa Zhu
9f3a983fef
Use native click for hiding overlay
The pointerup strategy is unsuccessful, as some other overlays
(Firefox's Inspect Element) will pass down pointerup events.
2022-03-13 12:00:44 -04:00
Tusooa Zhu
23a6b86ef3
Clean up 2022-03-13 12:00:44 -04:00
Tusooa Zhu
29cd8fbd3b
Add swipe-click handler to media modal
Now swiping will correctly change the current media, and with a good
preview. Clicking without swiping closes the overlay.
2022-03-13 12:00:44 -04:00
Tusooa Zhu
d9030b4fdd
Handle pinch action 2022-03-13 11:56:35 -04:00
Tusooa Zhu
a7570f5eb2
Preview swipe action 2022-03-13 11:56:34 -04:00
Tusooa Zhu
f96e5882d1
Make media modal be aware of multi-touch actions
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2022-03-13 11:56:30 -04:00
Ilja
d0c4ad22cd Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification 2022-02-26 02:08:13 +01:00
Ilja
819b760261 Fix up and code review
* Check if it works properly
    * Notifs are shown as BE returns them
    * The Interaction view has Reports, but only when you're mod or admin
* Do some extra translations
* Fix some console spam
2022-02-26 01:53:01 +01:00
Henry Jameson
9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
marcin mikołajczak
79d02bddbe Birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 19:11:14 +01:00
Henry Jameson
571e73a346 better approach to unescaping 2022-02-03 23:13:28 +02:00
rinpatch
d36b45ad43 entity_normalizer: Escape name when parsing user
In January 2020 Pleroma backend stopped escaping HTML in display names
and passed that responsibility on frontends, compliant with Mastodon's
version of Mastodon API [1]. Pleroma-FE was subsequently modified to
escape the display name [2], however only in the "name_html" field. This
was fine however, since that's what the code rendering display names used.

However, 2 months ago an MR [3] refactoring the way the frontend does emoji
and mention rendering was merged. One of the things it did was moving away
from doing emoji rendering in the entity normalizer and use the unescaped
'user.name' in the rendering code, resulting in HTML injection being
possible again.

This patch escapes 'user.name' as well, as far as I can tell there is no
actual use for an unescaped display name in frontend code, especially
when it comes from MastoAPI, where it is not supposed to be HTML.

[1]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1052
[2]: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2167
[3]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1392
2021-11-16 20:35:23 +03:00
HJ
1c53528433 Merge branch 'fix-favico-badge-chrome' into 'develop'
fix favico badge not working on chrome

See merge request pleroma/pleroma-fe!1391
2021-09-07 16:17:31 +00:00
Henry Jameson
f16658adfc fix tests 2021-08-15 02:59:14 +03:00
Henry Jameson
97e86381c8 remove old emoji added, everything emoji-bearing uses RichContent now 2021-08-13 13:12:33 +03:00
Henry Jameson
4c974f5ca2 richcontent support in polls, user cards and user profiles 2021-08-13 13:06:42 +03:00
Henry Jameson
6c6df29ed3 support richcontent in polls 2021-08-13 12:19:57 +03:00
Henry Jameson
8fe4355a6b fix rich images 2021-06-18 21:29:47 +03:00
Henry Jameson
bebafa1a2c refactored line converter, untied its logic from greentexting, better
handling of broken cases
2021-06-13 15:24:29 +03:00
Henry Jameson
418f029789 review + fixes 2021-06-12 20:43:29 +03:00
Henry Jameson
90a188f2c3 cleanup 2021-06-12 19:54:34 +03:00
Henry Jameson
cd44556750 restructure and tests
squash! restructure and tests
2021-06-12 19:54:30 +03:00
Henry Jameson
5834790d0b fix #935 2021-06-11 11:50:05 +03:00
Henry Jameson
f819227bed fixed console errors, improved user-selecting, added cyantexting 2021-06-11 11:49:32 +03:00
Henry Jameson
cc00af7a31 Hellthread(tm) Certified 2021-06-10 18:52:01 +03:00
Henry Jameson
7d6fc044fb new mentions look 2021-06-07 23:42:04 +03:00
Henry Jameson
8e9f5d7580 renamed StatusText to StatusBody for clarity, fixed chats 2021-06-07 19:50:38 +03:00
Henry Jameson
04fa1f0b2d some docs, added richcontent to usernames in status, updated stillImage
to allow scale of "gif" label
2021-06-07 18:41:47 +03:00
Henry Jameson
b0ae32e309 made getAttrs correctly handle both ' and " 2021-06-07 18:41:47 +03:00
Henry Jameson
be79643bcf fix emoji processor not leaving string as-is if no emoji are found 2021-06-07 18:41:47 +03:00
Henry Jameson
20ce646852 [WIP] MUCH better approach to replacing emojis with still versions 2021-06-07 18:41:47 +03:00
Henry Jameson
2a2483f4c9 handle multiple favicons (different sizes) 2021-06-02 12:47:54 +03:00
Henry Jameson
008e711e11 fix favico badge not working on chrome 2021-06-02 12:15:31 +03:00
HJ
dc611dffdb Merge branch 'flash-support' into 'develop'
Flash support

See merge request pleroma/pleroma-fe!1380
2021-05-31 11:00:53 +00:00
Henry Jameson
8a9115b58e temp fix for now-unused resettable async component 2021-04-25 14:51:15 +03:00
Matilde Park
06d0254cc5 entity_normalizer: safely check screen_name
Prevents a crash on undefined screen name cases.
2021-04-21 01:40:25 -04:00
Henry Jameson
87903fbf6d do not load ruffle multiple times! 2021-04-12 01:15:59 +03:00
Henry Jameson
5fdc4a1904 whooops dropped my monstercondo 2021-04-12 00:03:17 +03:00
Henry Jameson
d695dcaff9 experimental flash support through ruffle 2021-04-09 19:14:05 +03:00
HJ
8b96ea9377 Merge branch 'settings-import-export' into 'develop'
Settings backup/restore + small fixes

See merge request pleroma/pleroma-fe!1372
2021-04-07 17:40:07 +00:00
Henry Jameson
a8967d85bd streamlined WS flow, reduced spam amount related to WS reconnections 2021-03-09 02:38:10 +02:00
Henry Jameson
90afcd3420 WIP some work on making errors less spammy 2021-03-08 22:24:39 +02:00
Henry Jameson
2e7bd99444 Merge remote-tracking branch 'origin/develop' into websocket-fixes
* origin/develop: (119 commits)
  Apply 1 suggestion(s) to 1 file(s)
  Make it possible to localize user highlight options
  remove shoutbox test hacks
  fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
  update changelog with 2.3.0
  change icons around
  Translated using Weblate (Japanese)
  Update timeline_quick_settings.js
  add screen_name_ui to tests
  separate screen_name and screen_name_ui with decoded punycode
  Update CHANGELOG.md
  add basic validation for statusless status notifications
  changelog mention
  fix chat unread badge
  update shelljs to get rid of warnings on build
  save a few characters
  focus input in emoji picker and react picker
  fix vue warnings
  add only to wording
  basic loggedin check for reply filtering
  ...
2021-03-08 22:01:28 +02:00
Henry Jameson
3d95ea6acb cleanup + fix 2021-03-08 21:56:20 +02:00
Henry Jameson
bd5b62b107 changed importexport into a service instead of component for simplicity 2021-03-08 19:42:24 +02:00
Henry Jameson
4baa397ed0 fixed another problem with p's broken theme causing theme editor to
become unusable
2021-03-08 19:19:16 +02:00
Shpuld Shpludson
237f272d15 Merge branch 'develop' into 'fix/punycode-buggy'
# Conflicts:
#   CHANGELOG.md
2021-02-27 18:03:49 +00:00
Shpuld Shpuldson
09fe160e8b separate screen_name and screen_name_ui with decoded punycode 2021-02-26 16:23:11 +02:00
Shpuld Shpuldson
cd2f5ced31 add basic validation for statusless status notifications 2021-02-26 14:27:25 +02:00
Shpuld Shpuldson
47770ed715 get rid of older messages when scrolling down in chat to keep it from bloating dom 2021-02-17 10:16:58 +02:00
Shpuld Shpuldson
52c22e863e Fix setting report state, add proper error handling 2021-02-03 12:02:37 +02:00
Shpuld Shpuldson
3822a73a49 Fix report modal not working, add include_types 2021-02-01 12:55:23 +02:00
Henry Jameson
2576b75059 fallback if shadows aren't defined 2021-01-28 14:05:32 +02:00
Shpuld Shpuldson
8334649c11 Merge branch 'develop' into feat/report-notification 2021-01-27 13:24:19 +02:00
Shpuld Shpuldson
54def7d210 remove mock data 2021-01-27 13:13:59 +02:00
Shpuld Shpuldson
06f795d1d6 add proper state switcher 2021-01-27 13:13:10 +02:00
Henry Jameson
272ba8f7a9 Fix p's weird corrupt theme data crashing theme engine 2021-01-23 13:58:40 +02:00
Shpuld Shpludson
0358284ebf Merge branch 'feat/language-picker-native-names' into 'develop'
Use native language names in the language picker

See merge request pleroma/pleroma-fe!1302
2021-01-21 13:41:36 +00:00
rinpatch
11c7355749 Use native language names in the language picker
This seems more intuitive to me and is what I've seen in most other
language pickers.
2021-01-21 14:24:16 +03:00
feld
831cf9eafb Apply 1 suggestion(s) to 1 file(s) 2021-01-20 14:47:13 -06:00
Mark Felder
36e56354e4 More robust backwards compatibility 2021-01-19 10:01:55 -06:00
Mark Felder
9656c9b969 Support old user.deactivated and new user.is_active fields 2021-01-18 15:54:12 -06:00
Shpuld Shpuldson
e73553dca7 wip 2021-01-18 15:26:08 +02:00
Henry Jameson
9a8bc245a6 fixed few-posts TLs when streaming is enabled 2021-01-13 22:17:29 +02:00
Henry Jameson
48bef143d8 fix not being able to re-enable sockets until page refresh 2021-01-13 21:33:20 +02:00
Henry Jameson
adc3b17fe0 add success global notice style/level 2021-01-13 21:29:12 +02:00
Shpuld Shpuldson
65dbf7b85d Add report button to status ellipsis menu 2021-01-12 14:43:21 +02:00
Shpuld Shpuldson
8674f20023 separated component 2021-01-11 19:32:58 +02:00
Shpuld Shpuldson
a4e3cccf1c somewhat workign version still with fixture 2021-01-06 18:31:34 +02:00
Shpuld Shpuldson
ab2c2c66bf Merge branch 'develop' into feat/report-notification 2021-01-05 13:58:52 +02:00
Shpuld Shpludson
ef6e2087ae fix #1036 convert screen name to unicode with punycode 2021-01-05 08:09:08 +00:00
HJ
8d9bf3efc8 Merge branch 'plain-bg' into 'develop'
Solid color wallpaper support

See merge request pleroma/pleroma-fe!1314
2020-12-18 08:37:01 +00:00
Shpuld Shpludson
466fc84e82 Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop'
fix #1020 fix error handling in profile tab

Closes #1020

See merge request pleroma/pleroma-fe!1299
2020-12-16 16:51:03 +00:00
Henry Jameson
0cf06cb9ec Merge remote-tracking branch 'origin/develop' into plain-bg
* origin/develop:
  fix remote follow button style
  Disable horizontal textarea resize
  Add uk.json in messages.js
  Display upload limit on the Features panel
  use title html for poll options before vote
  fix recent mistakes in react button
2020-12-16 18:43:38 +02:00
Henry Jameson
c197756767 Basic no-wallpaper support 2020-12-16 18:25:07 +02:00
Shpuld Shpuldson
415119cda9 use title html for poll options before vote 2020-12-07 00:11:21 +02:00
Shpuld Shpuldson
5e96260a4f add test data for dev 2020-12-04 12:48:15 +02:00
Shpuld Shpuldson
1fd1553a1c Merge branch 'develop' into feat/report-notification 2020-12-04 11:20:01 +02:00
Shpuld Shpludson
fc4a17aa8c Merge branch 'develop' into 'fix/fix-error-handling-in-profile-tab'
# Conflicts:
#   CHANGELOG.md
2020-12-03 14:41:55 +00:00
Shpuld Shpuldson
2427757184 fix your own chat messages disappearing 2020-12-03 16:09:40 +02:00
Shpuld Shpuldson
4dde9c4d52 refactor error handling in profile tab 2020-12-02 12:46:31 +02:00
Shpuld Shpludson
d770bab1b0 Merge branch 'fix/timeline-error-handling-fixes' into 'develop'
Various timeline fixes

See merge request pleroma/pleroma-fe!1283
2020-11-18 11:49:54 +00:00
Henry Jameson
b66b4124f4 Merge remote-tracking branch 'origin/develop' into fix-pinned
* origin/develop:
  change favicon dimensions for high res, add handling when favicon isn't available
  remove the favicon changes
  make badge just a ball, make it use theming
  add favicon badge for unread notifs
2020-11-17 20:32:56 +02:00
Shpuld Shpludson
d905a6cb70 Merge branch 'feat/favicon-badge' into 'develop'
Add favicon badge for unread notifs

See merge request pleroma/pleroma-fe!1273
2020-11-17 18:25:05 +00:00
Henry Jameson
49f7c84e3f Fix pinned statuses and perhaps some other stuff 2020-11-17 15:25:38 +02:00
Shpuld Shpuldson
15bed586dc report notification wip 2020-11-15 13:57:02 +02:00