sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
6,370 Commits 159 Branches 3 Tags 443 MiB
Commit Graph

125 Commits

Author SHA1 Message Date
Your New SJW Waifu fd07a52a89 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-02-03 08:04:30 -06: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 d55bed41bf Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-09-09 10:48:20 -05: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
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
Your New SJW Waifu 930a63b938 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-06-23 10:08:13 -05: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 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
Henry Jameson 63c22ad131 Fixed mergedConfig misbehaving on first boot 2021-06-14 10:58:32 +03:00
Your New SJW Waifu f2f8b2d7bc needs to be more bigger 2021-06-10 14:40:17 -05: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
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
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
Henry Jameson 3d95ea6acb cleanup + fix 2021-03-08 21:56:20 +02:00
Henry Jameson fada49768d extra protection to not write what we don't know 2021-03-08 21:14:03 +02:00
Henry Jameson dda95543e8 implemented import/export for themes 2021-03-08 19:53:30 +02:00
Shpuld Shpuldson f6af4c43f6 add quick filters for notifications2 2021-03-01 16:21:35 +02: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 255db1f7b5 more better attachment limit 2021-02-25 16:05:56 -06:00
Shpuld Shpuldson ecb211606c change config comment to be consistent 2021-02-23 10:06:45 +02:00
Shpuld Shpuldson 3f23aecd10 add sensitive by default option 2021-02-23 10:00:23 +02:00
Your New SJW Waifu 59b7980e7c Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-05 07:53:23 -06:00
Henry Jameson 66f3e72b54 update branch with recent develop changes (FA, added settings) 2021-02-01 20:08:36 +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
Your New SJW Waifu 35c3753cc3 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-18 09:07:23 -06:00
Henry Jameson c197756767 Basic no-wallpaper support 2020-12-16 18:25:07 +02:00
Henry Jameson 29ff0be92c Merge remote-tracking branch 'origin/develop' into settings-changed 
* origin/develop: (48 commits)
  fix/leftover-emoji-checkboxes-in-settings
  Apply 1 suggestion(s) to 1 file(s)
  Translated using Weblate (Spanish)
  Translated using Weblate (Persian)
  Translated using Weblate (Persian)
  Translated using Weblate (Polish)
  update changelog
  Stop click propagation when unhiding nsfw
  Fix Follow Requests title style
  Translated using Weblate (Persian)
  Translated using Weblate (Persian)
  Translated using Weblate (French)
  Added translation using Weblate (Persian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (English)
  Translated using Weblate (English)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  ...
 2020-10-17 19:24:07 +03:00
Your New SJW Waifu 671186c73c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-10-05 14:31:54 -05:00
Henry Jameson a463959a36 Initial work on highlighting changed settings. Some refactoring to 
simplify addition of new settings
 2020-10-01 01:43:07 +03:00
Shpuld Shpludson f174f289a9 Timeline virtual scrolling 2020-09-29 10:18:37 +00:00
Your New SJW Waifu 23f9ad5cfa Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-16 16:17:19 -05:00
Shpuld Shpuldson b8c1b25397 remove most of reply preview and autoload related stuff 2020-07-14 15:08:04 +03:00
Your New SJW Waifu 646a4f6d50 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-12 12:47:52 -05:00
eugenijm aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Your New SJW Waifu b0043749a6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-09 11:53:42 -05:00
Your New SJW Waifu 916cefc15e Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-08 10:51:11 -05:00
lain 99eaec8547 Messages: Load languages asynchronously. 
Reduces the size of the initial app bundle by about half.
 2020-06-08 17:22:07 +02:00
Your New SJW Waifu 7ea2472f0c fixes 2020-06-03 20:01:22 -05:00
Henry Jameson 5187b37aca moved multiChoiceProperties where it fits better 2020-05-26 22:50:37 +03:00
Your New SJW Waifu 0361a4b308 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-02 10:56:17 -05:00
eugenijm 01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Your New SJW Waifu d7d897037c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-05 17:07:26 -06:00
Henry Jameson 0702934f4f fix trasparency problems in some cases (purple headers) 2020-03-04 00:23:14 +02:00