aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'feature/in-reply-to-preview-on-timeline' into 'develop'lambda2017-11-13
|\ | | | | | | | | In-reply-to previews for posts on timeline See merge request pleroma/pleroma-fe!157
| * Move previews from conversation to status, put the reply preview arrow back ↵shpuld2017-11-13
| | | | | | | | on timeline statuses, add a spinner when the preview is still loading.
* | Merge branch 'french-update' into 'develop'lambda2017-11-13
|\ \ | | | | | | | | | | | | Update french translation. See merge request pleroma/pleroma-fe!146
| * | Update messages.jslambda2017-11-13
| | |
| * | Update french translation.Roger Braun2017-11-10
| | |
* | | Merge branch 'fix/replace-sidepanel-scroll-js-with-css' into 'develop'lambda2017-11-13
|\ \ \ | | | | | | | | | | | | | | | | Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue. See merge request pleroma/pleroma-fe!156
| * | | Get rid of the js to scale sidepanel, add an additional div and a css class ↵shpuld2017-11-13
| | |/ | |/| | | | | | | to fix the same issue.
* | | Merge branch 'fix/persisted-stream-setting' into 'develop'Shpuld Shpludson2017-11-13
|\ \ \ | | | | | | | | | | | | | | | | Persist streaming setting between sessions. See merge request pleroma/pleroma-fe!155
| * | | Persist streaming setting between sessions.eal2017-11-13
| |/ /
* | | Merge branch 'fix/css-fixes-attachments-timeline-bottom' into 'develop'lambda2017-11-13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | CSS fixes Closes #39 See merge request pleroma/pleroma-fe!154
| * | Make oembeds behave properly, hide empty html attachments, hide overflowing ↵shpuld2017-11-13
| | | | | | | | | | | | timeline background.
* | | Merge branch 'fix/sidepanel-gap-consistency-fix' into 'develop'lambda2017-11-13
|\ \ \ | | | | | | | | | | | | | | | | Fix sidepanel gap See merge request pleroma/pleroma-fe!148
| * | | please the lintershpuld2017-11-12
| | | |
| * | | Add a hack to a hack to make it look much less hacky.shpuld2017-11-12
| | | |
* | | | Merge branch 'feature/streaming-posts' into 'develop'lambda2017-11-13
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Streaming posts See merge request pleroma/pleroma-fe!151
| * | | Add an option to automatically show new posts when scrolled to the top, also ↵shpuld2017-11-13
| | | | | | | | | | | | | | | | add fade-in animation for posts.
| * | | Don't add notification on self mention, (and fix that pesky pleroma vs gs ↵shpuld2017-11-12
| |/ / | | | | | | | | | delete bug)
* | | Merge branch 'fix-css-notif-button' into 'develop'Shpuld Shpludson2017-11-13
|\ \ \ | | | | | | | | | | | | | | | | Fix white line below buttons in notifications See merge request pleroma/pleroma-fe!153
| * | | fix white line below buttons in notificationsHenry Jameson2017-11-13
|/ / /
* | | Merge branch 'web-notifs' into 'develop'Shpuld Shpludson2017-11-12
|\ \ \ | | | | | | | | | | | | | | | | Web Notifications See merge request pleroma/pleroma-fe!149
| * | | moved notification asking from page load to login event. Added image inHenry Jameson2017-11-13
| | | | | | | | | | | | | | | | notifications support (doesn't work for native KDE notifications for me tho)
| * | | initial implementation for desktop notificationsHenry Jameson2017-11-12
| |/ /
* | | Merge branch 'css-fixes-and-updates' into 'develop'Shpuld Shpludson2017-11-12
|\ \ \ | |/ / |/| | | | | | | | Css fixes and updates See merge request pleroma/pleroma-fe!150
| * | imo this looks ugly, compared to general timeline appearanceHenry Jameson2017-11-13
| | |
| * | some fixes towards how conversations appearHenry Jameson2017-11-13
| | |
| * | small shadows + show placeholder for empty panel bodyHenry Jameson2017-11-13
| | |
| * | kiinteät venytetyt tunteetHenry Jameson2017-11-13
| | |
| * | fixes fullscreen video having borders and border-radius in firefoxHenry Jameson2017-11-13
|/ /
* | Merge branch 'develop' into 'develop'Shpuld Shpludson2017-11-11
|\ \ | |/ |/| | | | | Adds Portuguese translation See merge request pleroma/pleroma-fe!147
| * Adds Portuguese translationAka2017-11-11
|/
* Merge branch 'fix/dont-show-block-when-logged-out' into 'develop'lambda2017-11-09
|\ | | | | | | | | Check if logged-in when rendering the block button. See merge request pleroma/pleroma-fe!145
| * Check if logged-in when rendering the block button.shpuld2017-11-09
|/
* Merge branch 'fix/pleromabe-is-other-user' into 'develop'Shpuld Shpludson2017-11-09
|\ | | | | | | | | Fix isOtherUser on pleroma-be See merge request pleroma/pleroma-fe!137
| * Fix isOtherUser on pleroma-beeal2017-11-08
| |
* | Merge branch 'feature/timeago-locales' into 'develop'lambda2017-11-09
|\ \ | | | | | | | | | | | | Revert to English timeago for latin script languages. See merge request pleroma/pleroma-fe!144
| * | Revert to English timeago for latin script languages.eal2017-11-09
| | |
* | | Merge branch 'fix/dont-show-rts-more-than-once' into 'develop'lambda2017-11-09
|\ \ \ | | | | | | | | | | | | | | | | Don't show repeats that have been shown already. See merge request pleroma/pleroma-fe!143
| * | | Don't show repeats that have been shown already.shpuld2017-11-09
|/ / /
* | | Merge branch 'ro-translation' into 'develop'lambda2017-11-09
|\ \ \ | | | | | | | | | | | | | | | | Romanian translation See merge request pleroma/pleroma-fe!142
| * | | Corrected the const en to const ro for romanianTibike2017-11-09
| | | |
| * | | Added romanian translationsTibike2017-11-09
| | | |
| * | | Added missing hungarinan translationsTibike2017-11-09
| | | |
* | | | Add spanish translation.Roger Braun2017-11-09
|/ / / | | | | | | | | | Thanks, Aemon!
* | | Merge branch 'fix/i18n-mentions-timeline-title' into 'develop'lambda2017-11-08
|\ \ \ | | | | | | | | | | | | | | | | Make mentions-timeline use i18n. See merge request pleroma/pleroma-fe!141
| * | | Make mentions-timeline use i18n.Shpuld Shpludson2017-11-08
| | | |
* | | | Merge branch 'feature/timeago-locales' into 'develop'lambda2017-11-08
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Add timeago locales. See merge request pleroma/pleroma-fe!140
| * / Add timeago locales.eal2017-11-08
| |/
* | Merge branch 'develop' into 'develop'lambda2017-11-08
|\ \ | | | | | | | | | | | | Update Estonian translation See merge request pleroma/pleroma-fe!138
| * | Update Estonian translationobrez2017-11-08
| |/
* | Merge branch 'fix/attachment-fixes' into 'develop'lambda2017-11-08
|\ \ | |/ |/| | | | | | | | | Fix #38 and video CSS Closes #38 See merge request pleroma/pleroma-fe!136