aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into 'feature/accountHighlight'Henry2018-08-12
|\ | | | | | | # Conflicts: # src/components/user_card_content/user_card_content.vue
| * Merge branch 'feature/focus_reply_form' into 'develop'lambda2018-08-12
| |\ | | | | | | | | | | | | Focus textarea when clicking "reply" See merge request pleroma/pleroma-fe!298
| | * Remove trailing whitespaceToromino2018-08-05
| | |
| | * Textarea is now focused when replyingToromino2018-08-05
| | |
| * | 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
| |/
* | fixed lintHenry Jameson2018-08-05
| |
* | cleanup, fixed self-highlighting in notifications, fixed incorrect hex code ↵Henry Jameson2018-08-05
| | | | | | | | handling
* | added ability to pick the style of highlightingHenry Jameson2018-08-05
| |
* | post-rebase fix, backported d7d787b84cb8e36ad7f622054808f0e66c496309Henry Jameson2018-07-06
| |
* | notifs fixHenry Jameson2018-07-06
| |
* | maybe i should actually add myself to contributors list?Henry Jameson2018-07-06
| |
* | UI updateHenry Jameson2018-07-06
| |
* | fixed the UIHenry Jameson2018-07-06
| |
* | both bugs fixed. it's reactive and no more conflicting cardsHenry Jameson2018-07-06
| |
* | moved style generator into separate file. notifications are highlighted too now.Henry Jameson2018-07-06
| |
* | working, somewhatHenry Jameson2018-07-06
| |
* | initial versHenry Jameson2018-07-06
|/
* 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