aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-21
|\ | | | | | | feature/hash-routed
| * Merge branch 'feature/post-form-improvement' into 'develop' lambadalambda2017-04-17
| |\ | | | | | | | | | | | | Polish up post-status form See merge request !78
| | * Adjust attachment preview margins.Shpuld Shpuldson2017-04-17
| | |
| | * Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-17
| | |\ | | |/ | |/| | | | feature/post-form-improvement
| * | Merge branch 'fix/floating-attachment-remove-x' into 'develop' Shpuld Shpuldson2017-04-17
| |\ \ | | | | | | | | | | | | | | | | Fix the floating 'remove attachment' icon on post status form. See merge request !77
| | * | Make X icon parent position: relative; to prevent it from floating on its own.Shpuld Shpuldson2017-04-17
| |/ /
| | * Move attachments below buttons to prevent the buttons from shifting after ↵Shpuld Shpuldson2017-04-17
| |/ | | | | | | uploading.
| * Merge branch 'fix/add-explicit-lang-to-html' into 'develop' lambadalambda2017-04-15
| |\ | | | | | | | | | | | | Fix / add explicit lang="en" to html See merge request !75
| | * Add lang="en" to html to potentially fix font fall-back issues on some ↵Shpuld Shpuldson2017-04-14
| | | | | | | | | | | | language/font setups.
| * | Add missing route-link end tags.Roger Braun2017-04-14
| |/
| * Merge branch 'feature/reply-navigation' into 'develop' lambadalambda2017-04-14
| |\ | | | | | | | | | | | | Reply navigation fix for opening conversations in new tab See merge request !74
| | * Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-14
| | |\ | | |/ | |/| | | | feature/reply-navigation
| * | Merge branch 'feature/sidepanel-independent-scrolling' into 'develop' lambadalambda2017-04-14
| |\ \ | | | | | | | | | | | | | | | | Sidepanel independent scrolling See merge request !72
| | * | Tweak values to minimize distracting artifacting when scrollbars are smaller ↵Shpuld Shpuldson2017-04-13
| | | | | | | | | | | | | | | | or don't exist.
| | * | Fix login screen, (remove one duplicate line from user card css).Shpuld Shpuldson2017-04-13
| | | |
| | * | Fixed flex issue between 980 and 960 pixels widthShpuld Shpuldson2017-04-13
| | | |
| | * | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-13
| | |\ \ | | | | | | | | | | | | | | | feature/sidepanel-independent-scrolling
| | * | | Make sidepanel scroll independently from timeline, allows for seeing ↵Shpuld Shpuldson2017-04-13
| | | | | | | | | | | | | | | | | | | | notifications and posting new statuses even when scrolled deep down.
| * | | | Merge branch 'fix/remove-ghost-scrolling-mobile' into 'develop' lambadalambda2017-04-14
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Change attachments margin to not cause the element to overflow. See merge request !73
| | * | | Change attachments margin to not cause the element to overflow.Shpuld Shpuldson2017-04-14
| |/ / /
| * | | Merge branch 'feature/custom-default-styles' into 'develop' lambadalambda2017-04-13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | New default dark/light themes See merge request !71
| | * | | Updated README.md screenshot.Shpuld Shpuldson2017-04-13
| | |/ /
| | * | Potential new default dark and light themes added (base16-pleroma-dark, ↵Shpuld Shpuldson2017-04-13
| | | | | | | | | | | | | | | | base16-pleroma-light). The new dark one set as the default.
| * | | Merge branch 'feature/reply-navigation' into 'develop' lambadalambda2017-04-12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Reply navigation (up only) See merge request !70
| * \ \ \ Merge branch 'fix/daily-avg' into 'develop' lambadalambda2017-04-11
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Fix daily average on accounts younger than a day See merge request !69
| | * | | Fix daily average on accounts younger than a daywakarimasen2017-04-11
| |/ / /
| | | * Fix statusoid == undefined bug that prevented conversation opening in new tabs.Shpuld Shpuldson2017-04-14
| | |/
| | * another lint fixShpuld Shpuldson2017-04-12
| | |
| | * lint fixesShpuld Shpuldson2017-04-12
| | |
| | * Removed smooth scrolling, does not work in other browsers than FFShpuld Shpuldson2017-04-12
| | |
| | * Goto-original-arrow button now sets conversation highlight/focus even when ↵Shpuld Shpuldson2017-04-12
| |/ | | | | | | inline, setting focus now scrolls you to the focused post smoothly. Hide the arrow button when not expanded.
* | Merge branch 'develop' into feature/hash-routedRoger Braun2017-04-09
|\|
| * Merge branch 'feature/filtering' into 'develop' lambadalambda2017-04-09
| |\ | | | | | | | | | | | | Feature/filtering See merge request !68
| | * Remove completely empty words.Roger Braun2017-04-09
| | |
| | * Set state to loaded if it crashes while loading.Roger Braun2017-04-09
| | |
| | * Take unmuting out of expandable condition.Roger Braun2017-04-09
| | |
| | * Only persist state after we loaded one.Roger Braun2017-04-09
| | |
| | * Add word-based muting to settings / statuses.Roger Braun2017-04-09
| |/
| * Add chrome picture stretching fix back in.lambadalambda2017-04-09
| |
| * Merge branch 'fix/attachment-sizing' into 'develop' Shpuld Shpuldson2017-04-09
| |\ | | | | | | | | | | | | Fix/attachment sizing See merge request !67
| | * Revert nsfw image sizing, give attachments max-height to reduce scrollingShpuld Shpuldson2017-04-09
| | |
| | * Make muted notifications take much less space (handy for bot spam).Shpuld Shpuldson2017-03-30
| |/
| * Merge branch 'fix/small-buttons-chrome-tweak' into 'develop' Shpuld Shpuldson2017-03-11
| |\ | | | | | | | | | | | | Fix the appearance of 'Read'/'Show new' buttons on Chrome See merge request !65
| | * Change the small buttons (Read and Show new) to look better on chrome and ↵shpuld2017-03-11
| | | | | | | | | | | | other non-firefox browsers.
| * | Merge branch 'feature/daily-avg' into 'develop' Shpuld Shpuldson2017-03-11
| |\ \ | | | | | | | | | | | | | | | | Add a daily post average to the user card See merge request !63
| | * | Add a daily post average to the user cardwakarimasen2017-03-10
| | |/
| * | Merge branch 'fix/consistency-for-attachment-borders' into 'develop' Shpuld Shpuldson2017-03-10
| |\ \ | | |/ | |/| | | | | | | Give link attachments a rounded border, give images and links base03 border. See merge request !64
| | * Give link attachments a rounded border, give images and links base03 border.shpuld2017-03-10
| |/
| * Merge branch 'fix/make-nav-panel-not-so-bright' into 'develop'lambadalambda2017-03-10
| |\ | | | | | | | | | | | | Change the base16 colors used by the navpanel See merge request !61
| | * base01 -> base00, base02 -> base01shpuld2017-03-10
| | |