aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | Merge branch 'fix/make-nav-panel-not-so-bright' into 'develop'lambadalambda2017-03-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | base01 -> base00, base02 -> base01shpuld2017-03-10
* | | | | | | | | | | | | | | | Add a border to conversation heading to add distinction between it and a hili...shpuld2017-03-10
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wak...wakarimasen2017-03-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use conditional class for reply icon color.shpuld2017-03-10
| * | | | | | | | | | | | | | | Separate reply form from inside status to make it resistant to hilighting, ma...shpuld2017-03-09
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'fix/no-border-on-last-notif' into 'develop' Shpuld Shpuldson2017-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix red border not appearing on the last notification.shpuld2017-03-09
| * | | | | | | | | | | | | | | Remove unused fetchMentions()wakarimasen2017-03-09
| * | | | | | | | | | | | | | | Let timeline component fetch mentionswakarimasen2017-03-09
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'feature/timeline-fetch-error' into 'develop' Shpuld Shpuldson2017-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Use one error variable for all timelineswakarimasen2017-03-09
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | lint fixshpuld2017-03-09
| * | | | | | | | | | | | | | Merged with changes in develop & fixed conflicts.shpuld2017-03-09
| |\| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add base03 border to timeline bottom fetcher too.shpuld2017-03-09
| * | | | | | | | | | | | | | Make style setter create an often used base03-border class, use that class in...shpuld2017-03-09
* | | | | | | | | | | | | | | Merge branch 'develop' into wakarimasen/pleroma-fe-developRoger Braun2017-03-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'feature/nav-panel-hover-state' into 'develop' lambadalambda2017-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | themeable hover states for nav-panelxj92017-03-08
| * | | | | | | | | | | | | | | Merge branch 'feature/animated-favorite-and-boost' into 'develop' lambadalambda2017-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | fix cursor stylexj92017-03-08
| | * | | | | | | | | | | | | | | add a spin animation to favorite and boost actionsxj92017-03-08
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'cleanups' into 'develop' lambadalambda2017-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove redirect on loginRoger Braun2017-03-09
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loa...Roger Braun2017-03-09
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'feature/failed-login-error' into 'develop' Shpuld Shpuldson2017-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Make the error into a div instead of a button to get rid of the hover effects.shpuld2017-03-09
| | | * | | | | | | | | | | | | | Fix typowakarimasen2017-03-08
| | | * | | | | | | | | | | | | | Give more specific reason for failed loginwakarimasen2017-03-08
| | | * | | | | | | | | | | | | | Clear username and password field on failed loginwakarimasen2017-03-08
| | | * | | | | | | | | | | | | | Show visual feedback on login error, redirect on successwakarimasen2017-03-08
| | * | | | | | | | | | | | | | | Merge branch 'feature/timeline-fetch-error' into 'develop' Shpuld Shpuldson2017-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Move rejection handlerwakarimasen2017-03-07
| | * | | | | | | | | | | | | | | Add caching system to statuses.Roger Braun2017-03-08
| | * | | | | | | | | | | | | | | Use user cache in users module.Roger Braun2017-03-08
| | * | | | | | | | | | | | | | | Use cache to quickly access users.Roger Braun2017-03-08
| | * | | | | | | | | | | | | | | eslint fixes.Roger Braun2017-03-08
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Don't redirect after login.Roger Braun2017-03-08
| | * | | | | | | | | | | | | | Merge branch 'feature/timeline-fetch-error' into 'develop' Shpuld Shpuldson2017-03-07
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Visual feedback on failure to fetch new statuseswakarimasen2017-03-07
| | * | | | | | | | | | | | | | Merge branch 'feature/more-visible-notifications' into 'develop' lambadalambda2017-03-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Put the number of notifications inside a red circle (kinda like qvitter and e...shpuld2017-03-07
| | * | | | | | | | | | | | | | | Put conversation 'Collapse' back on the same line with the rest of the heading.'shpuld2017-03-07
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'fix/highlight-expanded-retweets' into 'develop' lambadalambda2017-03-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Highlight original notice when expanding retweetswakarimasen2017-03-06
| | * | | | | | | | | | | | | | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun2017-03-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix overlapping styles in timeline and notifications that screwed up user-card.shpuld2017-03-06
| | * | | | | | | | | | | | | | | Switch to localforage to use indexeddb by default.Roger Braun2017-03-07
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Revert "Temporarily remove persistence."Roger Braun2017-03-06
| | * | | | | | | | | | | | | | Temporarily remove persistence.Roger Braun2017-03-06
| | |/ / / / / / / / / / / / /