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

4680 Commits

Author SHA1 Message Date
Shpuld Shpuldson 38d8526660 change Show New text to Reload when flushing 2020-06-30 17:37:36 +03:00
Shpuld Shpuldson ea09bbecf8 Make use of backend reply filtering 2020-06-30 17:02:38 +03:00
Shpuld Shpuldson 3a79918b89 update changelog for reply-to strikethrough 2020-06-30 15:23:47 +03:00
Shpuld Shpuldson ee1364a167 add no-statusId support for status popover 2020-06-30 15:15:27 +03:00
Shpuld Shpuldson 6529f9fa34 add strikethrough when parent isn't visible 2020-06-30 15:04:16 +03:00
Shpuld Shpuldson 0ca3a6e63d fix gallery-videos being weirdly offset 2020-06-30 11:02:10 +03:00
Shpuld Shpludson a290f53694 Merge branch 'develop' into 'feat/rich-text-preview' 
# Conflicts:
#   src/i18n/en.json
 2020-06-29 13:20:53 +00:00
Shpuld Shpuldson a09709f71d update changelog with media-descriptions and the fixes 2020-06-29 15:37:46 +03:00
Shpuld Shpuldson 79011e02ef Merge branch 'develop' into xenofem/pleroma-fe-rebased-image-description-authoring 2020-06-29 15:19:41 +03:00
Shpuld Shpuldson 8c2335f84f conflict whem merging xenofem changes 2020-06-29 15:03:51 +03:00
Shpuld Shpuldson 96d2c86d3b change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component 2020-06-29 14:48:22 +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
xenofem 529d72c297 suppress enter key on media description input field 2020-06-28 16:05:22 -04: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 3c47036101 add automatic updating 2020-06-28 15:14:01 +03:00
lain d0c9aef668 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1158
 2020-06-28 12:00:23 +00:00
Shpuld Shpuldson 0287d5c07e update changelog with status previews 2020-06-28 13:29:07 +03:00
Shpuld Shpuldson 6e2de20367 show preview with plaintext too 2020-06-28 13:17:04 +03:00
Shpuld Shpuldson cecf3d4f89 remove unnecessary type=button 2020-06-28 13:03:25 +03:00
Shpuld Shpuldson 9d6f233202 fix preview attachments getting wrong styles 2020-06-28 12:48:17 +03:00
Shpuld Shpuldson 3d5da3caf9 update styles in preview heading 2020-06-28 12:35:05 +03:00
Shpuld Shpuldson 223fabfe90 add rich text preview 2020-06-28 12:16:41 +03:00
xenofem 03aa1f3154 fix vue style warnings 2020-06-28 02:31:57 -04:00
Fristi 195e83d0c8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (626 of 626 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
 2020-06-28 06:24:57 +00:00
xenofem 1ff55e17b1 fix invalid end tag on input element 2020-06-28 02:16:58 -04:00
William Pitcock 2c6ec37e6a media description support 2020-06-28 02:10:06 -04:00
lain 391f796cb4 Merge branch 'feat/preload-data-from-html' into 'develop' 
Add basic preloading for nodeinfo/config

See merge request pleroma/pleroma-fe!1155
 2020-06-27 10:21:06 +00:00
Shpuld Shpuldson 46cf50a4d6 rename variable requestJson when it's not actually json 2020-06-27 12:59:24 +03:00
Shpuld Shpuldson a8cb5e71d9 don't block ui with stickers or tos 2020-06-27 12:32:01 +03:00
Shpuld Shpuldson 5ab62c4cb8 make use of api/v1/instance 2020-06-27 12:26:19 +03:00
Shpuld Shpludson 4d52b8bf56 Merge branch 'remove-twitterapi-config' into 'develop' 
Remove StatusNet config endpoint usage

See merge request pleroma/pleroma-fe!1084
 2020-06-27 09:19:43 +00:00
Shpuld Shpuldson 58f9c1cc49 fix conflict in after_store 2020-06-27 12:10:02 +03:00
Shpuld Shpuldson 3113d904b9 update changelog with profile fields 2020-06-27 10:34:28 +03:00
Shpuld Shpludson c658f57abb Merge branch 'iss-149/profile-fields-setting' into 'develop' 
Profile fields setting

See merge request pleroma/pleroma-fe!997
 2020-06-27 07:32:59 +00:00
Shpuld Shpludson 8150899a73 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma-fe!1152
 2020-06-27 07:21:32 +00:00
translate 4528b31256 Translated using Weblate (Italian) 
Currently translated at 72.7% (452 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
 2020-06-27 07:21:32 +00: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 2eda3d687e Sync up key names properly 2020-06-26 17:02:17 -05: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
Mark Felder 5321415641 Update notification filters to reflect new settings 2020-06-26 16:56:31 -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
Shpuld Shpuldson a2c5175d14 add basic preloading for nodeinfo/config 2020-06-26 14:47:02 +03:00
Shpuld Shpuldson 44edb730c1 rip restyle subject, fix some issues with long subject 2020-06-26 14:07:39 +03:00
Mark Felder 8e1e7144fd Change notification settings keys to new names, remove the defunct non_follows key. 2020-06-25 15:34:48 -05:00
Mark Felder 199fc9351d Merge branch 'develop' into refactor/notification_settings 2020-06-25 15:28:17 -05:00
lain 504d48fc5a After Store: Remove last statusnet vestiges. 2020-06-24 17:54:35 +02:00
lain 143da55c56 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into remove-twitterapi-config 2020-06-24 17:50:05 +02:00
lain bbb91d8ae3 Merge branch 'feature/bot-flag' into 'develop' 
Add 'Bot' settings option and badge

Closes #832

See merge request pleroma/pleroma-fe!1153
 2020-06-22 12:51:51 +00:00