aboutsummaryrefslogtreecommitdiff
path: root/src/i18n
Commit message (Collapse)AuthorAge
* 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. ...
| * Fix small mistake in Polish translationMarcin Mikołajczak2019-05-10
| |
| * Merge branch 'mobile-scope' into 'develop'HJ2019-05-09
| |\ | | | | | | | | | | | | | | | | | | Display additional scope description above the status form for mobile users. Closes #505 See merge request pleroma/pleroma-fe!767
| | * Use more clear explanation in the scope notice, make sure the hide button ↵eugenijm2019-05-08
| | | | | | | | | | | | doesn't overlap with text in notice.
| | * Move scope visibility notice to the status form, make it dismissibleeugenijm2019-05-07
| | |
| * | Merge branch 'fix/floating-button' into 'develop'HJ2019-05-07
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Mobile Post button fix Closes #506 See merge request pleroma/pleroma-fe!769
| | * | Make floating post button configurableeugenijm2019-04-29
| | | |
| * | | Update es.jsontarteka2019-05-06
| | |/ | |/|
| * | update copytaehoon2019-05-03
| | |
| * | update generic error messagetaehoon2019-05-03
| | |
| * | add translationstaehoon2019-05-03
| | |
| * | add user reporting modaltaehoon2019-05-03
| | |
| * | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-05-03
| |\ \ | | | | | | | | | | | | | | | | [i18n]Update oc.json See merge request pleroma/pleroma-fe!777
| | * | Update oc.jsonExilat2019-05-01
| | | |
| * | | Update es.jsontarteka2019-05-03
| |/ /
| * | Merge branch 'develop' into ↵Shpuld Shpludson2019-04-30
| |\ \ | | | | | | | | | | | | | | | | | | | | 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' # Conflicts: # src/services/api/api.service.js
| | * | add “export blocks” featuretaehoon2019-04-27
| | | |
| | * | make reusable Exporter componenttaehoon2019-04-27
| | | |
| | * | add “block import” featuretaehoon2019-04-27
| | | |
| | * | make Importer component reusabletaehoon2019-04-27
| | | |
| * | | fix i18nshpuld2019-04-22
| | |/ | |/|
* | | 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 ...
| * | add BBCode stringsWilliam Pitcock2019-04-26
| |/
| * Update oc.jsonExilat2019-04-20
| |
| * Update oc.jsonExilat2019-04-20
| |
| * Update oc.jsonExilat2019-04-20
| |
| * Update oc.jsonExilat2019-04-20
| |
| * support i18ntaehoon2019-04-17
| |
| * support i18ntaehoon2019-04-14
| |
| * Merge branch 'moderation-menu' into 'develop'Shpuld Shpludson2019-04-08
| |\ | | | | | | | | | | | | Moderation menu #310 See merge request pleroma/pleroma-fe!595
| | * Added moderation menueugenijm2019-04-01
| | |
* | | firefoxHenry Jameson2019-04-24
| | |
* | | attempt at making it workHenry Jameson2019-04-13
|/ /
* | #469 - update text copydave2019-04-02
| |
* | #469 - update behavior of safe_dmdave2019-04-02
|/
* Merge branch 'develop' into 'develop'Shpuld Shpludson2019-04-01
|\ | | | | | | | | [i18n] Update oc.json for !611 and !691 See merge request pleroma/pleroma-fe!712
| * Update oc.json for !611 and !691Exilat2019-03-27
| |
* | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-04-01
|\ \ | | | | | | | | | | | | Update Polish translation See merge request pleroma/pleroma-fe!719
| * | Update Polish translationMarcin Mikołajczak2019-03-31
| |/
* | Merge branch 'minimal-scopes-mode' into 'develop'HJ2019-04-01
|\ \ | | | | | | | | | | | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode See merge request pleroma/pleroma-fe!633
| * | Merge remote-tracking branch 'upstream/develop' into minimal-scopes-modeHenry Jameson2019-03-30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (173 commits) Fix: Change condition fix typo update store according to retweeted status #433 - update sort by for conversation display replies_count right after reply icon expose replies_count from mastodon api Apparently, MastoAPI gives status in ancestors if you try opening a repeat... make side drawer use gesture service and fix its animations review/remove error hiding errata review #433 - sort conversation for retweets and clean up Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' Remove console log Fix warnings in user profile routing Add tests for gesture service, fix bug with perpendicular directions #255 - clean up autocomplete form #255 - clean up user settings page with self-closing html tags ...
| * | Initial work on deprecating scopeModesEnabled in favor of minimalScopeModeHenry Jameson2019-03-03
| | |
* | | #470 - update button text capitalizationjared2019-04-01
| | |
* | | #470 - update i18njared2019-04-01
| |/ |/|
* | Merge branch 'issue-442-placeholder-fix' into 'develop'HJ2019-03-25
|\ \ | | | | | | | | | | | | | | | | | | #442 - clean up Bio placeholder text Closes #442 See merge request pleroma/pleroma-fe!689
| * | #442 - update placeholder linebreakdave2019-03-18
| | |
| * | #442 - clean up Bio placeholder textdave2019-03-17
| | |
* | | Add hideMutedPosts setting and wire up to post-returning endpointstaehoon2019-03-21
| | |
* | | Merge branch 'feature/bypass-avatar-cropper' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #443 Add button to save without cropping Closes #443 See merge request pleroma/pleroma-fe!691
| * | | Add button to save without croppingjasper2019-03-18
| |/ /