Commit Graph

635 Commits

Author SHA1 Message Date
Tusooa Zhu 31c4300456
Add English translations for diving 2022-03-07 19:19:29 -05:00
Tusooa Zhu cd0f6a4f78
Add English translations for message threading 2022-03-07 19:19:29 -05:00
Alexander Tumin 2b7f12613e Add bot indication to user icon on statuses 2022-03-01 01:00:38 +03:00
Alexander Tumin fe0ed7e8f0 Mute bot posts 2022-02-28 23:14:45 +03:00
Henry Jameson e3d602fdcc revert changes related to streaming/firehose setting, reword it so it's
not confused with websocket streaming
2022-02-28 17:45:07 +02: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 9623b0e140 better phrasing 2022-02-24 14:41:55 +02:00
Your New SJW Waifu 18d1d3e651 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-23 10:09:43 -06:00
Henry Jameson 9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
Tusooa Zhu c7690aecd0
Add English translation for media modal counter 2022-02-21 10:34:20 -05:00
HJ 58d0f9678b Merge branch 'fix-mentions-new-bugs' into 'develop'
Fix newfound bugs with rich mentions + user suggestions

See merge request pleroma/pleroma-fe!1430
2022-02-20 15:11:52 +00:00
HJ ddee8bb686 Merge branch 'proper-attachments' into 'develop'
Attachment improvements

See merge request pleroma/pleroma-fe!1399
2022-02-20 15:11:33 +00:00
marcin mikołajczak 79d02bddbe Birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 19:11:14 +01:00
Your New SJW Waifu 180a81806c Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-10 16:38:29 -06:00
Henry Jameson ea6114f63c better phrasing? 2022-02-03 22:36:13 +02:00
Henry Jameson bfb3a4364b options to disable (You)s and highlighting of yourself 2022-02-03 22:34:57 +02:00
Your New SJW Waifu fd07a52a89 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-03 08:04:30 -06:00
Tusooa Zhu 7cc0d0763c
Add English translation for mention link prefs 2022-01-29 16:57:59 -05:00
Henry Jameson 94c37e8adf Merge remote-tracking branch 'origin/develop' into proper-attachments
* origin/develop:
  undo accidental change when merging
  Apply 1 suggestion(s) to 1 file(s)
  Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2022-01-24 21:29:19 +02:00
Henry Jameson c551e3e697 Merge remote-tracking branch 'origin/develop' into proper-attachments
* origin/develop: (81 commits)
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  entity_normalizer: Escape name when parsing user
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  ...
2022-01-24 19:28:38 +02:00
Henry Jameson 2f8aae371b Merge remote-tracking branch 'origin/settings-and-filtering' into settings-and-filtering
* origin/settings-and-filtering:
  Apply 1 suggestion(s) to 1 file(s)
2022-01-24 19:13:29 +02:00
Henry Jameson 9ea0f10abb Merge remote-tracking branch 'origin/develop' into settings-and-filtering
* origin/develop: (169 commits)
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  entity_normalizer: Escape name when parsing user
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  ...
2022-01-24 19:12:17 +02:00
Your New SJW Waifu 0e5290334a Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-01-23 11:19:15 -06:00
HJ 6509542dbd Merge branch 'fixes_for_deactivated_profile' into 'develop'
Improve the user card for deactivated users

See merge request pleroma/pleroma-fe!1417
2022-01-19 13:09:49 +00:00
Ilja 2ac78219ee Improve the user card for deactivated users 2022-01-19 13:09:48 +00:00
HJ af2a408b78 Apply 1 suggestion(s) to 1 file(s) 2022-01-09 17:59:50 +00:00
Your New SJW Waifu 40ed0d9403 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-30 10:40:08 -06:00
Your New SJW Waifu 5834d5f596 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-12-14 06:57:49 -06:00
Ilja 4587f37dd7 Allow canceling a follow request
When a follow request is sent, but not (yet) accepted, the behaviour is now to cancel the request instead of re sending.

The reason is double
* You couldn't cancel a follow request if you change your mind and the request wasn't answered yet
* Instances don't always correctly process a new follow request when the following is already happening. If something went wrong (e;g. the target server thinks you're following, but your instance thinks you're not yet), it's better to first sent an unfollow. This is the behaviour that Mastodon and most probably most other clients have. Therefore this flow is more tested and expected by other instances.
2021-12-12 18:09:21 +01:00
HJ a20f1794d0 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies

See merge request pleroma/pleroma-fe!1263
2021-12-03 18:14:32 +00:00
Ilja b4cfda4a20 Simple policy reasons for instance specific policies 2021-12-03 18:14:32 +00:00
Your New SJW Waifu d55bed41bf Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-09-09 10:48:20 -05:00
HJ a8a82ad12f Merge branch 'showMobileNewPost' into 'develop'
New user option: Always show floating New Post button

See merge request pleroma/pleroma-fe!1395
2021-09-09 12:19:53 +00:00
HJ 8af1f08539 Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering

Closes #935

See merge request pleroma/pleroma-fe!1392
2021-09-07 16:15:41 +00:00
Ekaterina Vaartis 3117623f30 Implement loading more statuses when searching 2021-08-16 21:46:50 +03:00
Henry Jameson 0507eb6550 ability to move attachments around when making a new post 2021-08-15 21:04:49 +03:00
eris 179af131ee Fix changelog merge conflict
# Conflicts:
#   CHANGELOG.md
2021-07-22 20:46:41 +00:00
Your New SJW Waifu 46533b4a74 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-07-20 12:23:39 -05:00
Your New SJW Waifu 930a63b938 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-06-23 10:08:13 -05:00
Henry Jameson b68fb7738b Merge remote-tracking branch 'origin/develop' into better-still-emoji
* origin/develop:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox
2021-06-18 02:27:57 +03:00
eris b2ebfc1fd6 Merge branch 'develop' into 'editProfile'
# Conflicts:
#   CHANGELOG.md
2021-06-17 19:35:09 +00:00
Eris e1361a1cae Add edit profile button 2021-06-17 19:29:58 +00:00
Henry Jameson e654fead23 refactored attachments and gallery. All attachments now are in gallery. 2021-06-17 16:29:46 +03:00
Eris 9c4957268d Use proper setting name 2021-06-17 13:21:25 +03:00
Eris 4ecbb58086 Make locale language cleaner 2021-06-17 13:21:25 +03:00
Eris 9e9ab5cec9 New option: Hide shoutbox 2021-06-17 13:21:25 +03:00
Henry Jameson a96a62929d Merge remote-tracking branch 'origin/develop' into settings-and-filtering
* origin/develop:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox
2021-06-16 13:52:13 +03:00
eris cab0095989 Merge branch 'develop' into 'showMobileNewPost'
# Conflicts:
#   CHANGELOG.md
#   src/App.js
2021-06-15 21:49:33 +00:00
Eris d7a53aec61 Use proper setting name 2021-06-15 18:09:00 +00:00
Eris 5047663c51 Make locale language cleaner 2021-06-15 00:25:09 +00:00
Eris 4639e30cb8 Fix config naming for consistency 2021-06-14 20:41:34 +00:00
Eris 0c10145242 New option: Hide shoutbox 2021-06-14 19:42:56 +00:00
Eris adfe56a3a3 New option: Always show floating New Post button 2021-06-14 17:54:40 +00:00
Your New SJW Waifu b22e5ed6d7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-06-10 14:35:33 -05:00
Henry Jameson a3b8e7ad99 missing localization 2021-06-08 16:37:13 +03:00
Henry Jameson b87a9d6675 Rearranged settings, moved more stuff to filtering where apllicable.
Changed how filering works.
2021-06-08 16:14:01 +03:00
Henry Jameson 2f383c2c01 moved mentions into a separate component - MentionLine, added collapsing
of mentions when there's too many of 'em
2021-06-08 14:34:47 +03:00
Henry Jameson 9ea370033a configurable mentions placement 2021-06-08 12:58:28 +03:00
Henry Jameson 3abd357694 moving mentions into separate row 2021-06-08 11:38:44 +03:00
Henry Jameson 8045d1866e localization 2021-06-07 20:25: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 245addb530 remove "leak ur cookiz" 2021-05-31 13:55:28 +03:00
Your New SJW Waifu 7eabd4efad Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-05-28 09:42:21 -05:00
eris 7341b8a551 Implement right sidebar option as user option 2021-05-26 22:22:55 +00:00
Henry Jameson 09ef284af7 better label, better error handling 2021-04-13 00:08:17 +03:00
Henry Jameson adafae977a Play-on-click, layout improvements. 2021-04-12 00:00:23 +03:00
Your New SJW Waifu 8ba9dc1d31 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-04-09 23:57:55 -05: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
Your New SJW Waifu 8ae73eff04 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-03-19 12:36:13 -05:00
Shpuld Shpludson d57ee274de Merge branch 'feat/notification-quick-filters' into 'develop'
Add quick filters for notifications

See merge request pleroma/pleroma-fe!1364
2021-03-17 08:17:23 +00:00
Shpuld Shpludson d262f208dc Merge branch 'feat/do-not-capitalize-every-word' into 'develop'
Do not capitalize every word in random strings

See merge request pleroma/pleroma-fe!1376
2021-03-15 12:33:44 +00:00
rinpatch feb40ec5ff Do not capitalize every word in random strings
Capitalization like that is only ever used in article/book titles, I
have not seen another website use it in interface elements.
2021-03-15 13:49:03 +03:00
rinpatch 47719571e4 Use more specific button titles instead of general.submit
- "Post" for post submission (we already had the button title be "Posting"
when the post was being sent, so there was a weird inconsistency)
- "Register" for registration submission
- "Save changes" for usages in settings
2021-03-15 13:28:33 +03:00
Shpuld Shpludson a00212a3bb Merge branch 'websocket-fixes' into 'develop'
Various websocket fixes

See merge request pleroma/pleroma-fe!1326
2021-03-15 09:45:38 +00:00
Shpuld Shpuldson 19fc7dda9e merge conflict, use v-slot:trigger, fix popover svg dimensions bug 2021-03-15 11:02:16 +02:00
Shpuld Shpludson 184364c7e0 Merge branch 'feat/timeline-menu-in-navpanel' into 'develop'
Add timeline menu toggle to nav panel

See merge request pleroma/pleroma-fe!1352
2021-03-15 07:03:22 +00: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 395e12cbc6 better error/warnings 2021-03-08 21:00:43 +02:00
Henry Jameson dda95543e8 implemented import/export for themes 2021-03-08 19:53:30 +02:00
Your New SJW Waifu 160950f9c5 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-03-05 06:43:30 -06:00
rinpatch b4f5df9ce5 Make it possible to localize user highlight options 2021-03-04 22:24:17 +03:00
Your New SJW Waifu 411ae0d9dc Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-03-04 07:53:35 -06:00
Shpuld Shpuldson ae159f6ad8 ui never refers to them as likes 2021-03-01 16:30:10 +02:00
Shpuld Shpludson 91f93d4a55 Merge branch 'develop' into 'feat/timeline-quick-settings'
# Conflicts:
#   CHANGELOG.md
2021-02-28 15:37:39 +00:00
Your New SJW Waifu 740a46245a Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-28 09:36:20 -06:00
Your New SJW Waifu 4df1078a73 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-25 16:03:05 -06:00
Shpuld Shpuldson 096747a5dc add only to wording 2021-02-25 11:12:51 +02:00
Shpuld Shpuldson 51a78e8b8a add a quick settings menu for timeline headers 2021-02-25 10:56:16 +02:00
Shpuld Shpuldson 3f23aecd10 add sensitive by default option 2021-02-23 10:00:23 +02:00
Shpuld Shpuldson 485f4b899c changelog conflict 2021-02-22 18:11:27 +02:00
Shpuld Shpuldson 98cb9abac7 Add timeline menu toggle to nav panel 2021-02-22 16:24:04 +02:00
Your New SJW Waifu 9489dee30e Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-16 13:24:36 -06:00
Shpuld Shpuldson a636e53404 add reason field when approval is required 2021-02-15 11:10:09 +02:00
Your New SJW Waifu 5aae346e62 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-14 10:14:11 -06:00
rinpatch 6acf812101 User card: use general.role instead of card-specific roles
Also removes admin_menu.roles from some localizations since it is not
used anywhere
2021-02-13 16:34:43 +03:00
Shpuld Shpludson 7f3fd9ca21 Merge branch 'multi-choice-poll-wording' into 'develop'
Display 'people voted' instead of 'votes' for multi-answers polls

Closes #993

See merge request pleroma/pleroma-fe!1341
2021-02-12 19:15:42 +00:00
eugenijm 01275fbac0 Ensure poll.voters_count doesn't fallback to poll.votes when it's 0 2021-02-12 19:43:57 +03:00
rinpatch da807a12fb Make bot label localizable 2021-02-12 13:48:39 +03:00
Shpuld Shpludson 8b7c367b04 Merge branch 'staff-grouping' into 'develop'
Group staff by role in the About page

Closes #737

See merge request pleroma/pleroma-fe!1309
2021-02-12 08:05:55 +00:00
eugenijm 1506b97e35 Display 'people voted' instead of 'votes' for multi-choice polls 2021-02-09 16:36:45 +03:00
Your New SJW Waifu 59b7980e7c Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-05 07:53:23 -06:00
Shpuld Shpuldson 52c22e863e Fix setting report state, add proper error handling 2021-02-03 12:02:37 +02:00
Henry Jameson 8958f386be Merge remote-tracking branch 'origin/develop' into settings-changed
* origin/develop: (306 commits)
  fallback if shadows aren't defined
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Italian)
  Translated using Weblate (Russian)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Russian)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese)
  ...
2021-02-01 19:39:57 +02:00
Shpuld Shpuldson 8334649c11 Merge branch 'develop' into feat/report-notification 2021-01-27 13:24:19 +02:00
Your New SJW Waifu 9167882de9 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-01-22 14:58:56 -06:00
rinpatch b76a68e622 UserCard: Make user roles translateable
I did not add a translation for my native language in this patch because
I am not sure how weblate would react, but I did add it locally and it
seems to work.
2021-01-20 14:04:00 +03:00
Henry Jameson 64fa662644 added notices for ws events 2021-01-13 21:32:25 +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
Your New SJW Waifu 35c3753cc3 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-18 09:07:23 -06:00
eugenijm 481c71517e Group staff members by role in the About page 2020-12-18 13:41:37 +03: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
Your New SJW Waifu 122f96579e Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-17 19:18:17 -06:00
Shpuld Shpludson 10399c193a Merge branch 'feat/move-external-source-button-to-extra-buttons' into 'develop'
Move external source link to extra buttons, expand the expand button

See merge request pleroma/pleroma-fe!1303
2020-12-16 17:46:15 +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 5cb41c7175 theme ui 2020-12-16 18:28:10 +02:00
Henry Jameson c197756767 Basic no-wallpaper support 2020-12-16 18:25:07 +02:00
Shpuld Shpludson 22546ea813 Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'
# Conflicts:
#   CHANGELOG.md
2020-12-15 19:50:59 +00:00
Your New SJW Waifu 1d35209db2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-12 14:14:05 -06:00
eugenijm 51e6f5e255 Display upload limit on the Features panel 2020-12-11 17:16:59 +03:00
Shpuld Shpuldson 46320090e3 move external source button to extra buttons, make expand button easier to click and highlight on hover 2020-12-03 11:57:17 +02:00
Shpuld Shpuldson 4dde9c4d52 refactor error handling in profile tab 2020-12-02 12:46:31 +02:00
Your New SJW Waifu 92728dd8ec Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-11-20 15:50:47 -06:00
Shpuld Shpludson 838cbd8715 Merge branch 'nsfw-link-preview' into 'develop'
Click-to-reveal cover for link previews in NSFW posts

Closes #973

See merge request pleroma/pleroma-fe!1287
2020-11-20 07:54:26 +00:00
Your New SJW Waifu 313d2d34a6 new default text 2020-11-19 21:03:17 -06:00
Your New SJW Waifu 4b1b9cacc6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-11-19 21:01:48 -06:00
eugenijm 45180d4069 Added the NSFW alert to the link preview. 2020-11-19 20:08:56 +03:00
Shpuld Shpuldson 1d2ba946b6 make notifications also use the popup errors, remove all error from status/notif state 2020-11-10 14:28:10 +02:00
Shpuld Shpuldson d150dae5d1 fixes to timeline error handling 2020-11-10 12:52:54 +02:00
Henry Jameson e695506c51 proper modified icon + popup 2020-10-17 22:28:49 +03:00
Your New SJW Waifu 1d28afbaf6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-10-12 09:22:31 -05:00
Your New SJW Waifu 671186c73c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-10-05 14:31:54 -05:00
Shpuld Shpludson 8a34ff2957 Merge branch 'develop' into 'feat/masto-ws-deletes'
# Conflicts:
#   CHANGELOG.md
#   src/components/status/status.js
#   src/components/status/status.scss
2020-10-01 12:54:54 +00:00
Shpuld Shpludson 91778a0276 Merge branch 'feat/custom-virtual-scrolling' into 'develop'
Timeline virtual scrolling

See merge request pleroma/pleroma-fe!1043
2020-09-29 10:18:37 +00:00
Shpuld Shpludson f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Maksim Pechnikov 3dbc1bedbf Merge branch 'develop' into feature/import_export_mutes 2020-09-18 22:04:01 +03:00
Your New SJW Waifu 08d6fee1e7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-17 16:31:48 -05:00
Shpuld Shpuldson 1b811d8b93 change side drawer to use shoutbox name 2020-09-16 11:29:10 +03:00
Maksim Pechnikov 947d7cd6f2 added import/export mutes 2020-09-08 09:41:42 +03:00
Shpuld Shpuldson 0758569625 change i18n phrasing 2020-09-07 10:39:30 +03:00
Shpuld Shpuldson 40ca0b394e add basic deletes support that works with masto WS 2020-09-06 15:28:09 +03:00
Your New SJW Waifu 5aee3b2bd1 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-03 20:39:15 -05:00
Mark Felder 5809f33c86 Password reset no longer informs user of errors or account existence 2020-09-01 16:48:51 -05:00
Your New SJW Waifu 5d1fe9c282 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-08-06 23:39:52 -05:00
lain 3e6e6096bf Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'
Separate timeline navigation from navpanel

See merge request pleroma/pleroma-fe!1172
2020-08-06 10:17:44 +00:00
Your New SJW Waifu 150fe52a66 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-26 11:17:56 -05:00
Lain Soykaf 96929d9930 ChatPanel: Rename `chat` to `shoutbox`.
To remove confusion with the new ChatMessages.
2020-07-23 17:31:35 +02:00
Your New SJW Waifu 23f9ad5cfa Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-16 16:17:19 -05:00
Mark Felder 149941828f Improve layout of the Notifications Filters section 2020-07-15 09:56:46 -05:00
Mark Felder 49aaf9dc57 Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:01:40 -05:00
Shpuld Shpuldson 89d1fb5cf4 remove remaining autoload i18n 2020-07-14 15:15:02 +03:00
Shpuld Shpuldson b8c1b25397 remove most of reply preview and autoload related stuff 2020-07-14 15:08:04 +03:00
Shpuld Shpuldson cac1418aff fix merge conflicts 2020-07-14 11:44:06 +03:00
Mark Felder da94935aaa Merge branch 'develop' into refactor/notification_settings 2020-07-13 13:25:23 -05:00
Your New SJW Waifu 646a4f6d50 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-12 12:47:52 -05:00
Shpuld Shpuldson 4a6300bbee add simple You: to chat list last message 2020-07-12 11:11:12 +03:00
eugenijm 18a1f5d62a Add the empty chat list placeholder.
Do not use full height when displaying the chat list.
Remove an unsued chat action.
2020-07-08 15:21:31 +03:00
eugenijm aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Your New SJW Waifu a65daa3685 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-08 05:45:46 -05:00
Shpuld Shpludson eea002e6f5 streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff 2020-07-08 10:11:17 +00:00
Your New SJW Waifu ebd893a3a2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-07 18:02:58 -05:00
Shpuld Shpuldson ddde05771f update with bookmarks, clean up some code 2020-07-07 17:34:35 +03:00
Shpuld Shpuldson e3991db5c4 fix conflicts and add error handling to media descriptions 2020-07-07 10:01:37 +03:00
Your New SJW Waifu 634847e6e4 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-06 06:58:49 -05:00
Shpuld Shpuldson 87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Shpuld Shpuldson f254a847d2 move translation strings to correct place, translate error message 2020-07-06 10:53:03 +03:00
Shpuld Shpuldson afdc3f96f0 fix conflicts, make subject update the preview 2020-07-06 10:45:47 +03:00
Your New SJW Waifu cb193273d5 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-05 16:28:00 -05:00
Shpuld Shpludson af4a26b588 Merge branch 'feat/allow-use-without-cookies' into 'develop'
Fix #815: Allow use without cookies, Add a global notice popup system

Closes #815

See merge request pleroma/pleroma-fe!1166
2020-07-05 06:53:29 +00:00
Your New SJW Waifu b2d941e249 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-04 18:17:20 -05:00
Eugenij de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson ebe885953c change more opinionated translation 2020-07-03 12:59:30 +03:00
Shpuld Shpuldson 21d1f557f6 change styles for the dropdown, make things work nicely on mobile 2020-07-03 12:56:31 +03:00
Shpuld Shpludson c0fb35b106 Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'
# Conflicts:
#   CHANGELOG.md
2020-07-02 04:50:03 +00:00
Your New SJW Waifu df1cef6e99 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-01 14:06:04 -05:00
Shpuld Shpuldson 43b7a5d9b3 update the message and changelog 2020-07-01 19:22:39 +03:00
Shpuld Shpuldson d30b0b28c9 catch localforage error and let the application work, add an alert for user to dismiss 2020-07-01 19:15:28 +03:00
Shpuld Shpuldson 38d8526660 change Show New text to Reload when flushing 2020-06-30 17:37:36 +03:00
Your New SJW Waifu a5e9d280b0 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-29 15:14:28 -05:00
Shpuld Shpuldson 79011e02ef Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring 2020-06-29 15:19:41 +03:00
lain 82944f862d Merge branch '812-subject-separation' into 'develop'
StatusContent: Better separate subject from status content.

Closes #812

See merge request pleroma/pleroma-fe!1150
2020-06-29 07:53:12 +00:00
Shpuld Shpuldson 61f34ff361 remove panel-footer in userpanel, simplify preview header, fix word-wrap in preview 2020-06-28 16:40:39 +03:00
Shpuld Shpuldson ed5b36f751 make line sizes match for errors/loading and statuses, make X hitbox bigger, remove attachments, add shorter custom message for empty status preview. fix auto update triggering 2020-06-28 15:43:08 +03:00
Shpuld Shpuldson 223fabfe90 add rich text preview 2020-06-28 12:16:41 +03:00
William Pitcock 2c6ec37e6a media description support 2020-06-28 02:10:06 -04:00
Your New SJW Waifu 1469b27d82 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-27 16:48:07 -05:00
Shpuld Shpludson ea0a12f604 Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
2020-06-27 07:19:49 +00:00
Mark Felder 6606b57f44 Update english i18n 2020-06-26 16:59:22 -05:00
Mark Felder caf9a2a8f6 Revert i18n to develop 2020-06-26 16:56:57 -05:00
Shpuld Shpuldson 8c3106c588 Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used 2020-06-26 18:20:32 +03:00
Mark Felder 199fc9351d Merge branch 'develop' into refactor/notification_settings 2020-06-25 15:28:17 -05:00
Your New SJW Waifu e50677913c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-22 14:21:29 -05:00
Sergey Suprunenko 2451956d83
Add 'bot' flag to Profile settings 2020-06-21 14:59:05 +02:00
Your New SJW Waifu ec393a2660 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-10 14:13:48 -05:00
kPherox de9cc033df
Add i18n en 2020-06-10 03:48:41 +09:00
Your New SJW Waifu 916cefc15e Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-08 10:51:11 -05:00
Sergey Suprunenko 1007039478
Autocomplete domain mutes from list of known instances 2020-06-08 13:17:18 +02:00