Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5754 commits 59 branches 16 tags 15 MiB
Commit graph

5754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
5ce298ead4 Merge branch 'feat/replace-generic-submit' into 'develop' 
Use more specific button titles instead of general.submit

See merge request pleroma/pleroma-fe!1375
 2021-03-15 10:38:04 +00: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
c682c1730f fix changelog 2021-03-15 11:05:00 +02: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
2da37f15ab Cleanup boolean/choice setting 2021-03-11 17:04:31 +02:00
Henry Jameson
8e88d8110b fix for filtering tab 2021-03-11 17:00:58 +02:00
Henry Jameson
1f0ac68fcd implement ChoiceSetting for settings modal similar to BooleanSetting 2021-03-11 16:55:14 +02:00
Henry Jameson
3870a30aea cleanup, fixes 2021-03-11 16:54:03 +02:00
Henry Jameson
5d3bf43fdc ghost styles for poll form 2021-03-11 16:54:03 +02:00
Henry Jameson
c6d4c20982 Made Select component to make using styled selects easier 2021-03-11 16:11:44 +02:00
Henry Jameson
5c064ccf55 fix some css problems + tiny bit cleaning up 2021-03-11 15:14:30 +02:00
Shpuld Shpludson
0475e1c61c Update CHANGELOG.md 2021-03-09 09:45:28 +00:00
Shpuld Shpludson
088683538d Update CHANGELOG.md 2021-03-09 09:45:14 +00:00
Shpuld Shpludson
badb2196a2 Merge branch 'develop' into 'feat/notification-quick-filters' 
# Conflicts:
#   CHANGELOG.md
 2021-03-09 09:43:01 +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
fada49768d extra protection to not write what we don't know 2021-03-08 21:14:03 +02:00
Henry Jameson
914b4eb593 lint 2021-03-08 21:03:55 +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
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
Henry Jameson
8a590f9269 Cleaned up panel-footer. No longer uses header styles since those look 
and work ugly.
 2021-03-08 19:18:43 +02:00
Shpuld Shpludson
6281241b92 Merge branch 'feat/user-highlight-localizable' into 'develop' 
Make it possible to localize user highlight options

See merge request pleroma/pleroma-fe!1369
 2021-03-04 20:02:57 +00:00
rinpatch
c14c144cc8 Apply 1 suggestion(s) to 1 file(s) 2021-03-04 19:46:03 +00:00
rinpatch
b4f5df9ce5 Make it possible to localize user highlight options 2021-03-04 22:24:17 +03:00
Shpuld Shpludson
fb183adc74 Merge branch 'fix/shoutbox-fixes' into 'develop' 
Remove vue-chat-scroll, fix up shoutbox header

See merge request pleroma/pleroma-fe!1368
 2021-03-03 15:07:10 +00:00
Shpuld Shpuldson
becacf0643 remove shoutbox test hacks 2021-03-03 16:47:59 +02:00
Shpuld Shpuldson
0673511fc2 fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack 2021-03-03 16:46:53 +02:00
Shpuld Shpludson
30057a4944 Merge branch 'chore/update-changelog' into 'develop' 
update changelog with 2.3.0

See merge request pleroma/pleroma-fe!1367
 2021-03-02 08:03:59 +00:00
Shpuld Shpuldson
d1ab424ebc update changelog with 2.3.0 2021-03-02 09:53:17 +02:00
Shpuld Shpludson
c3fcbbd918 Merge branch 'rc/2.3.0' into 'master' 
2.3.0 to MASTER

See merge request pleroma/pleroma-fe!1366
 2021-03-01 18:15:46 +00:00
Shpuld Shpludson
0ac34b3014 Merge branch 'master' into 'rc/2.3.0' 
# Conflicts:
#   CHANGELOG.md
 2021-03-01 18:06:55 +00:00
Shpuld Shpuldson
06cde8ad06 fix changelog entries in wrong places 2021-03-01 20:04:27 +02:00
Shpuld Shpuldson
434f9cdd7e changelog date 2021-03-01 19:59:57 +02:00
Shpuld Shpuldson
ae159f6ad8 ui never refers to them as likes 2021-03-01 16:30:10 +02:00
Shpuld Shpuldson
11a036d6d6 changelog 2021-03-01 16:27:24 +02:00
Shpuld Shpuldson
f6af4c43f6 add quick filters for notifications2 2021-03-01 16:21:35 +02:00
Shpuld Shpludson
6d7b5b157b Merge branch 'feat/timeline-quick-settings' into 'develop' 
close #1050 - add a quick settings menu to timeline header

Closes #1050

See merge request pleroma/pleroma-fe!1355
 2021-03-01 12:12:12 +00:00
Shpuld Shpuldson
fc5483f764 change icons around 2021-03-01 10:14:17 +02:00
Shpuld Shpuldson
35cde98d2c Merge branch 'fix/punycode-buggy' into rc/2.3.0 2021-03-01 09:27:19 +02:00
HJ
a90910be8f Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1363
 2021-03-01 00:10:45 +00:00
Ryo Ueno
846e58c3d2 Translated using Weblate (Japanese) 
Currently translated at 100.0% (686 of 686 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
 2021-03-01 00:00:58 +00:00
Shpuld Shpludson
91f93d4a55 Merge branch 'develop' into 'feat/timeline-quick-settings' 
# Conflicts:
#   CHANGELOG.md
 2021-02-28 15:37:39 +00:00
Shpuld Shpludson
670abd633f Update timeline_quick_settings.js 2021-02-28 15:36:51 +00:00
Shpuld Shpludson
b4782ad159 Merge branch 'feat/sensitive-by-default' into 'develop' 
close #1054 add sensitive by default option

Closes #1054

See merge request pleroma/pleroma-fe!1354
 2021-02-27 18:31:13 +00:00