aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fixSelectOptionStyling' into 'develop'lambda2018-08-12
|\ | | | | | | | | | | | | Fixes selects having unreadable text on some browsers/OSes. Closes #123 See merge request pleroma/pleroma-fe!296
| * Fixes selects having unreadable text on some browsers/OSes. Added bonus: themeHenry Jameson2018-08-05
| | | | | | | | | | switcher select now has styled options that show preview of what theme's bg/fg colors are
* | Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop'lambda2018-08-12
|\ \ | | | | | | | | | | | | Made it so that unfocused tab doesn't autostream posts when scrolled to the top See merge request pleroma/pleroma-fe!299
| * | Made it so that unfocused tab doesn't autostream posts when scrolled to the topHenry Jameson2018-08-06
| |/
* | Merge branch 'fixRelativeEmojis' into 'develop'lambda2018-08-12
|\ \ | | | | | | | | | | | | Fixes broken custom emoji in autocomplete when proxying to remote BE See merge request pleroma/pleroma-fe!300
| * | hopefully, fix linterHenry Jameson2018-08-06
| | |
| * | Fixes broken custom emoji in autocomplete when proxying to remote BEHenry Jameson2018-08-06
| |/
* | Merge branch 'feature/emoji-in-profiles' into 'develop'lambda2018-08-12
|\ \ | | | | | | | | | | | | Use serverside html rendering in usernames and bios if available. See merge request pleroma/pleroma-fe!304
| * | Use serverside html rendering in usernames and bios if available.eal2018-08-09
| | |
* | | Merge branch 'fix/remove-retweet-button-on-private-and-direct-posts' into ↵lambda2018-08-12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 'develop' Do not show retweet button if post is followers-only or a DM See merge request pleroma/pleroma-fe!303
| * | Update status.vueToromino2018-08-09
| | |
| * | Update retweet_button.jsToromino2018-08-09
| | |
| * | Update retweet_button.vueToromino2018-08-09
| | |
| * | Update status.vueToromino2018-08-08
| |/
* | Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into ↵dtluna2018-08-06
| | | | | | | | | | 'develop'" This reverts merge request !301
* | Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'dtluna2018-08-06
|\ \ | |/ |/| | | | | Hide all status actions if not logged in See merge request pleroma/pleroma-fe!301
| * Hide all status actions if not logged indtluna2018-08-06
|/
* Merge branch 'revert-88c9ab44' into 'develop'lambda2018-07-12
|\ | | | | | | | | Revert "Merge branch 'cw-clickthrough' into 'develop'" See merge request pleroma/pleroma-fe!292
| * Revert "Merge branch 'cw-clickthrough' into 'develop'"lambda2018-07-12
|/ | | This reverts merge request !291
* Merge branch 'cw-clickthrough' into 'develop'lambda2018-07-12
|\ | | | | | | | | Add click-to-show content warnings on posts See merge request pleroma/pleroma-fe!291
| * Fix lint warningsVivian Lim2018-06-29
| |
| * Add configuration option to enable click-through content warningsVivian Lim2018-06-28
| |
| * Also hide attachments behind clickthrough.Vivian Lim2018-06-28
| |
| * Differentiate content warning block if it is on lightbgVivian Lim2018-06-28
| |
| * Carry forward content warnings in repliesVivian Lim2018-06-28
| |
| * Add click-to-show content warnings on postsVivian Lim2018-06-28
|/
* Merge branch 'patch-1' into 'develop'lambda2018-06-25
|\ | | | | | | | | Update messages.js / tiny typofix in fr version See merge request pleroma/pleroma-fe!288
| * Update messages.js / tiny typofix in fr version goofy2018-06-24
| |
* | Merge branch 'feature/status-scope-improvements-translation' into 'develop'lambda2018-06-25
|\ \ | |/ |/| | | | | src/i18n/messages.js: French Translation for Post Scope UI tooltips See merge request pleroma/pleroma-fe!287
| * src/i18n/messages.js: French Translation for Post Scope UI tooltipsHaelwenn (lanodan) Monnier2018-06-24
|/ | | | Co-authored-by: goofy
* Merge branch 'feature/status-scope-improvements' into 'develop'lambda2018-06-24
|\ | | | | | | | | Improve Post Scope UI See merge request pleroma/pleroma-fe!286
| * Add warning/info text on appriopriate status scopesOle Bertram2018-06-23
| |
| * Add title text with description to scope iconsOle Bertram2018-06-23
|/
* Merge branch 'feature/unrepeats' into 'develop'lambda2018-06-19
|\ | | | | | | | | | | | | Add unretweet support Closes #103 See merge request pleroma/pleroma-fe!284
| * add unretweet action to statuses.jsFrancis Dinh2018-06-14
| |
| * Add unretweet supportFrancis Dinh2018-06-14
|/
* Use parents scope if available.Roger Braun2018-06-12
|
* Merge branch 'feature/update-de-translation' into 'develop'lambda2018-06-12
|\ | | | | | | | | updated german translation See merge request pleroma/pleroma-fe!269
| * corrected a typo and changed/shortend delete_account_error textSebastian Huebner2018-06-04
| |
| * updated german translationSebastian Huebner2018-05-25
| |
* | Merge branch 'feature/update-russian-translation' into 'develop'lambda2018-06-12
|\ \ | | | | | | | | | | | | Update Russian translation See merge request pleroma/pleroma-fe!270
| * | Update Russian translationdtluna2018-05-26
| |/
* | Merge branch 'improve-settings-ui' into 'develop'lambda2018-06-12
|\ \ | | | | | | | | | | | | Improve user settings ui See merge request pleroma/pleroma-fe!273
| * | Fix the height of file inputsUser2018-05-29
| | |
| * | Visually separate the settings itemsUser2018-05-29
| |/
* | Merge branch 'patch-1' into 'develop'lambda2018-06-12
|\ \ | | | | | | | | | | | | Hebrew Translation of "placeholder" See merge request pleroma/pleroma-fe!278
| * | Update messages.jsArtik Banana2018-06-08
| | |
* | | Merge branch 'feature/locked-accounts' into 'develop'lambda2018-06-12
|\ \ \ | | | | | | | | | | | | | | | | Feature/locked accounts See merge request pleroma/pleroma-fe!274
| * | | user card: show that the account is locked if it isWilliam Pitcock2018-06-07
| | | |
| * | | follow requests: refactor to properly leverage vuexWilliam Pitcock2018-06-07
| | | |