aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* fixHenry Jameson2019-06-13
|
* fix logged out post-updateHenry Jameson2019-06-13
|
* fixHenry Jameson2019-06-13
|
* Merge remote-tracking branch 'upstream/develop' into masto-register-app-secretHenry Jameson2019-06-13
|\ | | | | | | | | * upstream/develop: Revert "add TOTP/Recovery Form for mobile version"
| * Revert "add TOTP/Recovery Form for mobile version"Maksim2019-06-12
| | | | | | | | This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
* | AMERICAHenry Jameson2019-06-13
| |
* | commentsHenry Jameson2019-06-13
| |
* | No longer sending extra data, renamed some propertiesHenry Jameson2019-06-13
| |
* | Merge remote-tracking branch 'upstream/develop' into masto-register-app-secretHenry Jameson2019-06-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js i18n/Update Japanese translation render modal at the root level using portal install portal vue Small improve of the who to follow panel layout Fix/Small fix in the who to follow page remove console spam i18n wire up user.description with masto api data i18n/Add Japanese with kanji (2) move drowdown menu to popper notification controls: redesign entirely entity normalizer: collapse data.pleroma if blocks wire up notification settings do not miss statusnet_profile_url of mentions Translation to Hebrew of everything other than theme_helpers and style. Translate up to settings. mastoapi login works
| * 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
| | |
| * | i18n/Update Japanese translationHakaba Hitoyo2019-06-11
| | |
| * | render modal at the root level using portaltaehoon2019-06-06
| | |
| * | install portal vuetaehoon2019-06-06
| | |
| * | Small improve of the who to follow panel layoutHakaba Hitoyo2019-06-05
| | |
| * | Fix/Small fix in the who to follow pageHakaba Hitoyo2019-06-04
| | |
| * | 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
| | | |
| * | | 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
| | |/ /
| * / / i18n/Add Japanese with kanji (2)Hakaba Hitoyo2019-05-29
| |/ /
| * | do not miss statusnet_profile_url of mentionstaehoon2019-05-22
| | |
| * | Translation to Hebrew of everything other than theme_helpers and style.j1t2019-05-22
| | |
| * | Translate up to settings.j1t2019-05-22
| |/
* / Proper clientId/secret/token caching, MastoAPI registrationHenry Jameson2019-05-22
|/
* 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. ...
| * | | Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sassHenry Jameson2019-04-27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (126 commits) entity normalizer: hook up in_reply_to_account_acct add BBCode strings fix follow button not updating bug in follow-card refer searched user objects from the global user rep set max-width of textarea in settings page Remove space in the timeline setting copy user_card.vue: Fix .emoji to apply to img Update oc.json Update oc.json Update oc.json Update oc.json replace pencil with wrench icon rebuild fontello with wrench icon added fetch all friends using pagination stop fetching user relationship when user is unauthorized Revert "recover border between basic-user-card using list component" remove extra spacing code readability fix typos clean up ...
| * | | | firefoxHenry Jameson2019-04-24
| | | | |
| * | | | attempt at making it workHenry Jameson2019-04-13
| | | | |
| * | | | revert unnecessary changesHenry Jameson2019-04-10
| | | | |
| * | | | fix obvious bugHenry Jameson2019-04-07
| | | | |