aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'hotfix-user-background' into 'develop'HJ2019-06-12
|\ | | | | | | | | fix user banner See merge request pleroma/pleroma-fe!828
| * fix user bannerHenry Jameson2019-06-13
|/
* Merge branch 'feature/2fa' into 'develop'HJ2019-06-12
|\ | | | | | | | | adds 2FA/two_factor_authentication support See merge request pleroma/pleroma-fe!556
| * Revert "add TOTP/Recovery Form for mobile version"Maksim2019-06-12
|/ | | | This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
* Merge branch 'masto-login-fixes' into 'develop'HJ2019-06-12
|\ | | | | | | | | MastoAPI login See merge request pleroma/pleroma-fe!805
| * Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.jsHJ2019-06-12
| |
| * mastoapi login worksHenry Jameson2019-05-21
| |
* | Merge branch 'update-japanese-translation' into 'develop'HJ2019-06-11
|\ \ | | | | | | | | | | | | i18n/Update Japanese translation See merge request pleroma/pleroma-fe!815
| * | i18n/Update Japanese translationHakaba Hitoyo2019-06-11
|/ /
* | Merge branch '547' into 'develop'kaniini2019-06-08
|\ \ | | | | | | | | | | | | | | | | | | Fix "Delete account modal partially hidden" issue Closes #547 See merge request pleroma/pleroma-fe!803
| * | render modal at the root level using portaltaehoon2019-06-06
| | |
| * | install portal vuetaehoon2019-06-06
|/ /
* | Merge branch 'small-improve-of-who-to-follow-panel-layout' into 'develop'HJ2019-06-05
|\ \ | | | | | | | | | | | | Small improve of the who to follow panel layout See merge request pleroma/pleroma-fe!821
| * | Small improve of the who to follow panel layoutHakaba Hitoyo2019-06-05
|/ /
* | Merge branch 'fix/avatars-in-who-to-follow-page-are-missing' into 'develop'HJ2019-06-04
|\ \ | | | | | | | | | | | | Fix/Small fix in the who to follow page See merge request pleroma/pleroma-fe!820
| * | Fix/Small fix in the who to follow pageHakaba Hitoyo2019-06-04
|/ /
* | Merge branch 'fix/remove-notifications-console-spam' into 'develop'Shpuld Shpludson2019-06-01
|\ \ | | | | | | | | | | | | fix: Remove some console spam See merge request pleroma/pleroma-fe!818
| * | remove console spamshpuld2019-06-01
|/ /
* | Merge branch 'feature/notification-controls' into 'develop'kaniini2019-06-01
|\ \ | | | | | | | | | | | | wire up notification settings See merge request pleroma/pleroma-fe!809
| * | notification controls: redesign entirelyWilliam Pitcock2019-05-25
| | |
| * | entity normalizer: collapse data.pleroma if blocksWilliam Pitcock2019-05-25
| | |
| * | wire up notification settingsWilliam Pitcock2019-05-25
| | |
* | | Merge branch 'fix/interactions-i18n' into 'develop'feld2019-05-31
|\ \ \ | | | | | | | | | | | | | | | | Interactions i18n See merge request pleroma/pleroma-fe!817
| * | | i18nMark Felder2019-05-31
|/ / /
* | | Merge branch '543' into 'develop'Shpuld Shpludson2019-05-29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix "stale user settings shown after save" Closes #543 See merge request pleroma/pleroma-fe!813
| * | | wire up user.description with masto api datataehoon2019-05-29
| | | |
* | | | Merge branch 'fix-dropdown' into 'develop'Shpuld Shpludson2019-05-29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | move drowdown menu to popper Closes #559 See merge request pleroma/pleroma-fe!814
| * | | move drowdown menu to popperHenry Jameson2019-05-27
| |/ /
* | | Merge branch 'i18n/add-pedantic-japanese-2' into 'develop'HJ2019-05-29
|\ \ \ | |/ / |/| | | | | | | | | | | | | | i18n/Add Japanese with kanji (2) Closes #522 See merge request pleroma/pleroma-fe!816
| * | i18n/Add Japanese with kanji (2)Hakaba Hitoyo2019-05-29
|/ /
* | Merge branch '556' into 'develop'HJ2019-05-23
|\ \ | | | | | | | | | | | | | | | | | | Fix User links/mentions opening in new tab issue Closes #556 See merge request pleroma/pleroma-fe!808
| * | do not miss statusnet_profile_url of mentionstaehoon2019-05-22
|/ /
* | Merge branch 'update-hebrew-transalation' into 'develop'HJ2019-05-22
|\ \ | |/ |/| | | | | Update he.json See merge request pleroma/pleroma-fe!807
| * Translation to Hebrew of everything other than theme_helpers and style.j1t2019-05-22
| |
| * Translate up to settings.j1t2019-05-22
|/
* Merge branch 'fix-pipelines' into 'develop'HJ2019-05-21
|\ | | | | | | | | Fix pipelines and clean up console output See merge request pleroma/pleroma-fe!804
| * Fix pipelines and clean up console outputHenry Jameson2019-05-21
|/
* Merge branch 'fetags' into 'develop'HJ2019-05-20
|\ | | | | | | | | add tags to data and to status component See merge request pleroma/pleroma-fe!801
| * switch from method to computed propertyMoonman2019-05-20
| |
| * formattingMoonman2019-05-20
| |
| * add tags to data and to status componentMoonman2019-05-20
| |
* | Merge branch 'masto-remains' into 'develop'HJ2019-05-20
|\ \ | | | | | | | | | | | | Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that See merge request pleroma/pleroma-fe!792
| * | fix lintHenry Jameson2019-05-15
| | |
| * | Cleanup, little documentation, localizationHenry Jameson2019-05-15
| | |
| * | removed unused masto api, added initial version of interactions timelineHenry Jameson2019-05-14
| | |
* | | Merge branch 'webpack-4-dart-sass' into 'develop'HJ2019-05-20
|\ \ \ | | | | | | | | | | | | | | | | Massive update for dependencies See merge request pleroma/pleroma-fe!734
| * | | moved setting styles into common to avoid bug with shared stylesHenry Jameson2019-05-19
| | | |
| * | | get rid of reply-left, we decided it should go long time agoHenry Jameson2019-05-14
| | | |
| * | | fix prod buildHenry Jameson2019-05-13
| | | |
| * | | Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sassHenry Jameson2019-05-13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (116 commits) Fix small mistake in Polish translation link interaction avatars to the user profile Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice. use backendInteractor refactor api service functions using new helper clean up update favorite number earlier update status interaction upon retweet action response sync up favoritedBy with favorite/unfavorite action do not regenerate status object reduce needless calculation Move scope visibility notice to the status form, make it dismissible Revert "eliminate expandable prop in favor of inConversation" status attention doesn’t have relationship entities make it short fix wrong inlineExpanded expanded is always false, eliminate it eliminate expandable prop in favor of inConversation fix conversationId comparision bug using integer format Display additional scope description above the status form for mobile users. ...