Commit graph

5900 commits

Author SHA1 Message Date
Henry Jameson
5e88e2a9a4 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  missing localization
2021-06-08 16:37:46 +03:00
Henry Jameson
a3b8e7ad99 missing localization 2021-06-08 16:37:13 +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
0ae3985a52 bump limit to a saner one 2021-06-08 14:36:41 +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
73127f0e25 fix empty spaces again 2021-06-08 13:42:16 +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
0583a6b863 moved transparent button styles into button itself 2021-06-08 10:14:49 +03:00
Henry Jameson
421c7fe0a8 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  tweaking the spacings
2021-06-08 01:25:22 +03:00
Henry Jameson
6bc9886db4 tweaking the spacings 2021-06-08 01:25:03 +03:00
Henry Jameson
71068fae7e Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  remove weird vertical align
2021-06-08 01:22:15 +03:00
Henry Jameson
ccdf892483 remove weird vertical align 2021-06-08 01:21:45 +03:00
Henry Jameson
5081133d9d Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  faint @
2021-06-08 00:06:45 +03:00
Henry Jameson
5740a79dbd faint @ 2021-06-08 00:06:26 +03:00
Henry Jameson
e9117fe1f0 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  better modifier, no background for unhighlighted mentions
2021-06-08 00:04:51 +03:00
Henry Jameson
e6d5ddcbb6 better modifier, no background for unhighlighted mentions 2021-06-08 00:03:59 +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
4e528fc143 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  smaller mentions
  new mentions look
  fix tall emojis being cropped
2021-06-07 23:55:23 +03:00
Henry Jameson
59d046b163 fix theme selection not working 2021-06-07 23:48:46 +03:00
Henry Jameson
c3e122ff6f smaller mentions 2021-06-07 23:48:01 +03:00
Henry Jameson
7d6fc044fb new mentions look 2021-06-07 23:42:04 +03:00
Henry Jameson
6199788f28 fix tall emojis being cropped 2021-06-07 20:44:32 +03:00
Henry Jameson
d6821c003e Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  localization
2021-06-07 20:26:17 +03:00
Henry Jameson
8045d1866e localization 2021-06-07 20:25:31 +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
6090327236 moved some post styles into status body since they inferfere with usernames 2021-06-07 20:02:09 +03:00
Henry Jameson
5e83672274 fixed some strange error 2021-06-07 20:01:57 +03:00
Henry Jameson
aa38223e87 lint 2021-06-07 19:51:04 +03:00
Henry Jameson
8e9f5d7580 renamed StatusText to StatusBody for clarity, fixed chats 2021-06-07 19:50:38 +03:00
Henry Jameson
50aa379038 new component - StatusText, to separate post's text from its attachments 2021-06-07 18:41:55 +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
aec05686d0 lint, fix warnings 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
22c8f71945 mention link 2021-06-07 18:41:47 +03:00
Henry Jameson
1923ed84d4 more tests 2021-06-07 18:41:47 +03:00
Henry Jameson
a2459c2187 move styles to richcontent 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
35dedf8416 lint 2021-06-07 18:41:47 +03:00
Henry Jameson
5970ddf9ac fix escaped apostrophes 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
9f24faaa94 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Remove unused shoutbox channel state from side drawer
  This setting didn't actually do anything
  Use old value to discover if Shoutbox is available until we ship a new release that's declaring the feature as "shout"
  Keep channel name the same for backwards compatibility
  Rename legacy PleromaFE Chat functionality to "Shout"
2021-06-04 12:13:22 +03:00
HJ
2725a0c639 Merge branch 'chore/rename-chat' into 'develop'
Rename legacy PleromaFE Chat functionality to "Shout"

See merge request pleroma/pleroma-fe!1207
2021-06-03 20:16:48 +00:00
Mark Felder
bd98ecb3f0 Remove unused shoutbox channel state from side drawer 2021-06-03 15:07:02 -05:00
Henry Jameson
9e46b13169 Merge branch 'fix-favico-badge-chrome' into shigusegubu
* fix-favico-badge-chrome:
  handle multiple favicons (different sizes)
2021-06-02 12:49:30 +03:00
Henry Jameson
2a2483f4c9 handle multiple favicons (different sizes) 2021-06-02 12:47:54 +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