aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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. ...
| * | | fixed build speedHenry Jameson2019-04-28
| | | |
| * | | fix testsHenry Jameson2019-04-28
| | | |
| * | | attempt 2Henry Jameson2019-04-28
| | | |
| * | | 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
| | | | |
| * | | | karma stuff, still broken thoHenry Jameson2019-04-10
| | | | |
| * | | | more rulesHenry Jameson2019-04-10
| | | | |
| * | | | all the failing rulesHenry Jameson2019-04-10
| | | | |
| * | | | revert unnecessary changesHenry Jameson2019-04-10
| | | | |
| * | | | update nodeHenry Jameson2019-04-07
| | | | |
| * | | | fix obvious bugHenry Jameson2019-04-07
| | | | |
| * | | | Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New ↵Henry Jameson2019-04-07
| | | | | | | | | | | | | | | | | | | | linting.
* | | | | Merge branch 'feature/remove-hypenation' into 'develop'Shpuld Shpludson2019-05-20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove auto-hyphenation See merge request pleroma/pleroma-fe!800
| * | | | | Remove auto-hyphenationSenko-san2019-05-20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Auto-hyphenation has terrible heuristics on all browsers, disable it. Source: https://justmarkup.com/articles/2019-01-28-a-look-at-css-hyphenation-in-2019/
* | | | | Merge branch '540' into 'develop'HJ2019-05-19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong mouse pointer hot zone in the post status box Closes #540 See merge request pleroma/pleroma-fe!795
| * | | | | make staff label visibletaehoon2019-05-19
| | | | | |
| * | | | | move visibility-tray css in local scopetaehoon2019-05-19
| | | | | |
| * | | | | refactor csstaehoon2019-05-19
| | | | | |
| * | | | | make only screen name as linktaehoon2019-05-19
| | | | | |
| * | | | | refactor css for visibility traytaehoon2019-05-19
|/ / / / /
* | | | | Merge branch '542' into 'develop'HJ2019-05-19
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Hide three dot menu button if has no items Closes #542 See merge request pleroma/pleroma-fe!797