aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix/style-fixes-again' into 'develop'lambda2017-11-20
|\ | | | | | | | | More style fixes See merge request pleroma/pleroma-fe!167
| * give nav-bar a shadowshpuld2017-11-20
| |
| * Unhide completions, strengthen shadows a bit, force the 0.1 shade to always ↵shpuld2017-11-20
| | | | | | | | span the full height, make usercard use correct borders.
* | Fix mention timeline.Roger Braun2017-11-20
|/
* Merge branch 'update-de-translation' into 'develop'Shpuld Shpludson2017-11-19
|\ | | | | | | | | updated ger translation See merge request pleroma/pleroma-fe!166
| * updated ger translationSebastian Huebner2017-11-19
|/
* Merge branch 'feature/custom-theme' into 'develop'lambda2017-11-19
|\ | | | | | | | | | | | | Customizable themes Closes #41 See merge request pleroma/pleroma-fe!165
| * Fix color inputs to wrap on mobile, fix timeline background color to not ↵shpuld2017-11-18
| | | | | | | | clash with panel headings.
| * Make defaulting to pleroma-dark work when config.json has an invalid theme. ↵shpuld2017-11-18
| | | | | | | | Remove logging.
| * Clean up, use translations, persist theme, add more presets.shpuld2017-11-18
| |
| * Move custom theming from settings to style-switcher, remove usage of custom ↵shpuld2017-11-17
| | | | | | | | .css files, use styles.json instead.
| * Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵shpuld2017-11-17
| |\ | |/ |/| | | feature/custom-theme
* | Merge branch 'fix/timeline-softlock' into 'develop'lambda2017-11-16
|\ \ | | | | | | | | | | | | Fix timeline softlock when switching from a loading timeline See merge request pleroma/pleroma-fe!164
| * | Fix timeline softlock when switching from a loading timelineeal2017-11-16
| | |
* | | Merge branch 'feature/update-de-translation' into 'develop'Shpuld Shpludson2017-11-15
|\ \ \ | |/ / |/| | | | | | | | Updated german translation See merge request pleroma/pleroma-fe!163
| * | updated german translationSebastian Huebner2017-11-15
|/ /
* | Merge branch 'fix/user-view-without-posts' into 'develop'Shpuld Shpludson2017-11-14
|\ \ | | | | | | | | | | | | Use state object for user view instead of timeline. See merge request pleroma/pleroma-fe!161
| * | Use state object for user view instead of timeline.eal2017-11-14
| | | | | | | | | | | | Also fetch user if not in the state already.
* | | Update README.md with a more modern picture.Shpuld Shpludson2017-11-14
| | |
* | | Merge branch 'fix/user-finder-leading-@' into 'develop'Shpuld Shpludson2017-11-14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove leading @ in user search. Closes pleroma#71 See merge request pleroma/pleroma-fe!160
| * | | Remove leading @ in user search.eal2017-11-14
| |/ /
* | | Merge branch 'fix/hotfix-for-reply-navigation' into 'develop'Shpuld Shpludson2017-11-14
|\ \ \ | |/ / |/| | | | | | | | Unbreak reply navigation See merge request pleroma/pleroma-fe!159
| * | Make goto-check use the correct property to make it work againshpuld2017-11-14
|/ /
* | Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'lambda2017-11-13
|\ \ | | | | | | | | | | | | | | | | | | Better handling of taller posts Closes #40 See merge request pleroma/pleroma-fe!158
* \ \ 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.
| | | * Update theme editor to have 4 colors, rewrite the color setter, change a LOT ↵shpuld2017-11-17
| | | | | | | | | | | | | | | | of base16 assignments for better consistency.
| | | * First version with naive color extrapolation.shpuld2017-11-14
| | |/
| | * Give tall notifications either a scrollbar (mentions), or just cap them and ↵shpuld2017-11-13
| | | | | | | | | | | | use a cool hider (fav/rt).
| | * Add a scrollbar for tall spammy posts.shpuld2017-11-13
| |/ |/|
* | 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
| |/ /