Commit Graph

3171 Commits

Author SHA1 Message Date
HJ 9df99c5205 Merge branch 'masto-login-fixes' into 'develop'
MastoAPI login

See merge request pleroma/pleroma-fe!805
2019-06-12 19:42:25 +00:00
HJ a7b0b07e6f Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js 2019-06-12 11:44:14 +00:00
Henry Jameson a05fd042df fix small annoyance 2019-06-12 10:56:08 +03:00
Henry Jameson 0535d2c14c fixed some bugs i found, also cleaned up some stuff + documentation 2019-06-11 21:18:09 +03:00
HJ 855080b896 Merge branch 'update-japanese-translation' into 'develop'
i18n/Update Japanese translation

See merge request pleroma/pleroma-fe!815
2019-06-11 12:10:47 +00:00
Hakaba Hitoyo 322c9fbfb6 i18n/Update Japanese translation 2019-06-11 12:10:47 +00:00
shpuld d7b75ba037 combine the 2 poll components, do the footer 2019-06-10 22:35:33 +03:00
Henry Jameson 41eeaf35d9 self-review 2019-06-10 18:57:53 +03:00
shpuld 6bc1d10ae9 Fix poll crash 2019-06-09 22:41:39 +03:00
Henry Jameson e536a56250 Linting 2019-06-09 22:40:38 +03:00
shpuld 1a989d0661 polish the poll form 2019-06-09 22:33:25 +03:00
Henry Jameson 4d12cd617a fix textarea not resizing properly 2019-06-09 21:23:56 +03:00
Henry Jameson 8a02647de4 more bugfixes related to keybinds and nonworking stuff 2019-06-09 21:17:24 +03:00
Henry Jameson 20923d590c Some comments, added sorting for emojis 2019-06-09 20:41:12 +03:00
Henry Jameson 76b9a66e98 fixed several bugs 2019-06-09 20:40:46 +03:00
shpuld e2dc0d85fc replace vue-timeago with custom timeago 2019-06-09 14:07:54 +03:00
kaniini 33554e8d1d Merge branch '547' into 'develop'
Fix "Delete account modal partially hidden" issue

Closes #547

See merge request pleroma/pleroma-fe!803
2019-06-08 17:40:15 +00:00
Henry Jameson a3cc8cc5d8 sorting 2019-06-08 17:15:48 +03:00
Henry Jameson 0a778160cc styles 2019-06-08 17:15:42 +03:00
Henry Jameson 8872b4802e standartized autocomplete panel suggesions format, fixed some bugs 2019-06-08 16:23:58 +03:00
Henry Jameson ca3140fd3e Merge remote-tracking branch 'upstream/develop' into refactor-emoji-input
* upstream/develop:
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
2019-06-08 14:31:49 +03:00
shpuld 88c3103755 make poll form state local instead of vuex 2019-06-07 19:09:38 +03:00
Henry Jameson 96f31716f9 slot-based emoji input/autocomplete component 2019-06-07 00:17:49 +03:00
taehoon 9c8af14908 render modal at the root level using portal 2019-06-06 13:37:27 -04:00
taehoon 5740123ee6 install portal vue 2019-06-06 13:37:26 -04:00
shpuld 70ba232ce3 fix refreshing 2019-06-06 07:33:00 +03:00
shpuld 080921e977 make poll voting update status, making it reactive, fix multiple choice voting 2019-06-05 22:19:13 +03:00
HJ 0ecf23881d Merge branch 'small-improve-of-who-to-follow-panel-layout' into 'develop'
Small improve of the who to follow panel layout

See merge request pleroma/pleroma-fe!821
2019-06-05 17:43:35 +00:00
Hakaba Hitoyo 5b274364ce Small improve of the who to follow panel layout 2019-06-05 17:43:35 +00:00
shpuld 82802c6a8d merge develop in, fix lots of things 2019-06-04 22:27:58 +03:00
HJ e9e7b36c69 Merge branch 'fix/avatars-in-who-to-follow-page-are-missing' into 'develop'
Fix/Small fix in the who to follow page

See merge request pleroma/pleroma-fe!820
2019-06-04 08:04:47 +00:00
Hakaba Hitoyo 809d872b2d Fix/Small fix in the who to follow page 2019-06-04 08:04:47 +00:00
Shpuld Shpludson 7ce9b7be07 Merge branch 'fix/remove-notifications-console-spam' into 'develop'
fix: Remove some console spam

See merge request pleroma/pleroma-fe!818
2019-06-01 09:15:53 +00:00
shpuld 4526939dae remove console spam 2019-06-01 12:10:00 +03:00
kaniini b4796ccbf6 Merge branch 'feature/notification-controls' into 'develop'
wire up notification settings

See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
feld 9c0ec9b794 Merge branch 'fix/interactions-i18n' into 'develop'
Interactions i18n

See merge request pleroma/pleroma-fe!817
2019-05-31 15:19:10 +00:00
Mark Felder f67f14495b i18n 2019-05-31 10:13:06 -05:00
Shpuld Shpludson 50618b81c8 Merge branch '543' into 'develop'
Fix "stale user settings shown after save"

Closes #543

See merge request pleroma/pleroma-fe!813
2019-05-29 17:08:27 +00:00
Shpuld Shpludson 6045708a5d Merge branch 'fix-dropdown' into 'develop'
move drowdown menu to popper

Closes #559

See merge request pleroma/pleroma-fe!814
2019-05-29 16:55:28 +00:00
taehoon 0532995847 wire up user.description with masto api data 2019-05-29 12:32:14 -04:00
HJ 152617e20d Merge branch 'i18n/add-pedantic-japanese-2' into 'develop'
i18n/Add Japanese with kanji (2)

Closes #522

See merge request pleroma/pleroma-fe!816
2019-05-29 05:31:03 +00:00
Hakaba Hitoyo 443794b000 i18n/Add Japanese with kanji (2) 2019-05-29 05:31:03 +00:00
Henry Jameson 6c7eeb93fe move drowdown menu to popper 2019-05-27 00:13:08 +03:00
William Pitcock 855566f887 notification controls: redesign entirely 2019-05-25 23:44:36 +00:00
William Pitcock ac97cd3e46 entity normalizer: collapse data.pleroma if blocks 2019-05-25 22:59:04 +00:00
William Pitcock 28ca504576 wire up notification settings 2019-05-25 07:34:59 +00:00
HJ ab34a75bcf Merge branch '556' into 'develop'
Fix User links/mentions opening in new tab issue

Closes #556

See merge request pleroma/pleroma-fe!808
2019-05-23 05:34:15 +00:00
taehoon 2af35b8404 do not miss statusnet_profile_url of mentions 2019-05-22 23:47:20 -04:00
HJ 45961331b6 Merge branch 'update-hebrew-transalation' into 'develop'
Update he.json

See merge request pleroma/pleroma-fe!807
2019-05-22 18:50:32 +00:00
j1t 4249a2fd6f Translation to Hebrew of everything other than theme_helpers and style. 2019-05-22 21:33:05 +03:00