Commit graph

193 commits

Author SHA1 Message Date
Henry Jameson
39ea72d6cd Merge branch 'develop' into shigusegubu
* develop: (61 commits)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Basque)
  Added translation using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Basque)
  Translated using Weblate (Polish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Polish)
  Translated using Weblate (Spanish)
  Added translation using Weblate (Indonesian)
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  ...
2021-11-04 18:26:21 +02:00
HJ
370f1e55ad Merge branch 'develop' into 'themeApply'
# Conflicts:
#   CHANGELOG.md
2021-09-09 21:51:39 +00: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
Henry Jameson
f96ffe3699 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix tests, add performance test (skipped, doesn't assert anything), tweak max mentions count
  made the code responsible for showing unwritten mentions actually work
  remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 23:01:29 +03:00
Henry Jameson
2cfff1b8b9 remove new options for style and separate line, now groups all chained
mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 02:56:40 +03:00
eris
f35e3d0f3f Fix merge conflict in CHANGELOG
# Conflicts:
#   CHANGELOG.md
2021-07-22 20:47:36 +00:00
eris
179af131ee Fix changelog merge conflict
# Conflicts:
#   CHANGELOG.md
2021-07-22 20:46:41 +00:00
Shpuld Shpludson
425919a0d2 Merge branch 'fix-themes-select' into 'develop'
Fix theme select not working

See merge request pleroma/pleroma-fe!1393
2021-07-19 18:33:19 +00:00
HJ
ba961b784f Apply 1 suggestion(s) to 1 file(s) 2021-07-19 17:10:13 +00:00
Shpuld Shpludson
373b14e1e4 Merge branch 'fix-settings-anon' into 'develop'
Fix Boolean/Choice settings not working properly on initial launch

See merge request pleroma/pleroma-fe!1389
2021-07-19 16:11:11 +00: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
Henry Jameson
55682ea93f Merge branch 'settings-and-filtering' into shigusegubu
* settings-and-filtering:
  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 14:32:23 +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
139a0d1562 Merge branch 'develop' into 'themeApply'
# Conflicts:
#   CHANGELOG.md
2021-06-15 21:50:39 +00: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
7e3393b5a2 Use cleaner instance config check for shoutbox setting 2021-06-15 00:59:36 +00:00
Eris
5047663c51 Make locale language cleaner 2021-06-15 00:25:09 +00:00
Eris
312a237ca4 Revert duplicate buttons and move existing buttons to bottom-right corner independent of scroll 2021-06-14 23:31:16 +00:00
Eris
4639e30cb8 Fix config naming for consistency 2021-06-14 20:41:34 +00:00
Eris
8fa0331771 Add apply and reset themes to top of theme tab 2021-06-14 20:09:28 +00:00
Eris
1668315bf8 Fix lint error 2021-06-14 20:02:13 +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
Henry Jameson
7ab5a1c8f8 Merge branch 'fix-themes-select' into shigusegubu
* fix-themes-select:
  Fixed mergedConfig misbehaving on first boot
  lint
2021-06-14 10:58:50 +03:00
Henry Jameson
fb3f7649df Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  lint
  review + fixes
2021-06-12 20:44:58 +03:00
Henry Jameson
418f029789 review + fixes 2021-06-12 20:43:29 +03:00
Henry Jameson
7ca3e22b5f proper position 2021-06-08 16:42:02 +03:00
Henry Jameson
59d8a3bd92 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  change defaults
  bump limit to a saner one
  moved mentions into a separate component - MentionLine, added collapsing of mentions when there's too many of 'em
  fix empty spaces again
  configurable mentions placement
  moving mentions into separate row
  moved transparent button styles into button itself
2021-06-08 16:34:12 +03:00
Henry Jameson
637a7c1e9f Merge branch 'settings-and-filtering' into shigusegubu
* settings-and-filtering:
  Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2021-06-08 16:33:50 +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
7ae85c8318 change defaults 2021-06-08 14:51:42 +03:00
Henry Jameson
9ea370033a configurable mentions placement 2021-06-08 12:58:28 +03:00
Henry Jameson
38d9ea8b17 lint 2021-06-08 00:09:16 +03:00
Henry Jameson
1c3f0dc0d0 Merge branch 'fix-themes-select' into shigusegubu
* fix-themes-select:
  fix theme selection not working
2021-06-07 23:55:27 +03:00
Henry Jameson
59d046b163 fix theme selection not working 2021-06-07 23:48:46 +03:00
Henry Jameson
6071301b0c Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  moved some post styles into status body since they inferfere with usernames
  fixed some strange error
  lint
  renamed StatusText to StatusBody for clarity, fixed chats
  new component - StatusText, to separate post's text from its attachments
  some docs, added richcontent to usernames in status, updated stillImage to allow scale of "gif" label
  lint, fix warnings
  made getAttrs correctly handle both ' and "
  mention link
  more tests
  move styles to richcontent
  fix emoji processor not leaving string as-is if no emoji are found
  lint
  fix escaped apostrophes
  [WIP] MUCH better approach to replacing emojis with still versions
2021-06-07 20:04:52 +03:00
Henry Jameson
8e9f5d7580 renamed StatusText to StatusBody for clarity, fixed chats 2021-06-07 19:50:38 +03:00
Henry Jameson
71ad7e467e Merge branch 'fix-settings-anon' into shigusegubu
* fix-settings-anon:
  better approach
  fix BooleanSetting and ChoiceSetting not working properly on initial launch as anon visitor (would show all as changed, empty selects)
2021-06-02 12:22:35 +03:00
Henry Jameson
32d1a0e181 better approach 2021-05-31 14:23:57 +03:00
Henry Jameson
e95412a03c fix BooleanSetting and ChoiceSetting not working properly on initial
launch as anon visitor (would show all as changed, empty selects)
2021-05-31 14:16:37 +03:00
HJ
0ca0e642a4 Merge branch 'v-slot-upgrade' into 'develop'
Change old slot syntax (removed in vue3) to new one

See merge request pleroma/pleroma-fe!1379
2021-05-31 11:15:44 +00:00
HJ
4e96af0442 Merge branch 'better-selects' into 'develop'
Better <select> components

See merge request pleroma/pleroma-fe!1373
2021-05-31 11:08:56 +00:00
Henry Jameson
80220c1b07 fix warnings 2021-05-31 14:08:12 +03:00
Henry Jameson
c039656460 fix warnings 2021-05-31 14:02:36 +03:00
eris
7341b8a551 Implement right sidebar option as user option 2021-05-26 22:22:55 +00:00
Henry Jameson
61dcdbf992 migrate to v-slot 2021-04-07 22:42:34 +03:00
Henry Jameson
1afda1ac6d lost file 2021-04-07 20:53:58 +03:00
Henry Jameson
0c77a3e1d6 remove extra chevron post-merge 2021-04-07 20:47:59 +03:00