aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merged with changes in develop & fixed conflicts.shpuld2017-03-09
|\
| * Merge branch 'feature/nav-panel-hover-state' into 'develop' lambadalambda2017-03-09
| |\ | | | | | | | | | | | | themeable hover states for nav-panel See merge request !53
| | * themeable hover states for nav-panelxj92017-03-08
| | |
| * | Merge branch 'feature/animated-favorite-and-boost' into 'develop' lambadalambda2017-03-09
| |\ \ | | | | | | | | | | | | | | | | add a spin animation to favorite and boost actions See merge request !52
| | * | fix cursor stylexj92017-03-08
| | | |
| | * | add a spin animation to favorite and boost actionsxj92017-03-08
| | |/
| * | Merge branch 'cleanups' into 'develop' lambadalambda2017-03-09
| |\ \ | | | | | | | | | | | | | | | | Cleanups See merge request !54
| | * | Add linter.Roger Braun2017-03-09
| | | |
| | * | Remove redirect on loginRoger Braun2017-03-09
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to enable this workflow: 1. Open conversation in new tab 2. Login 3. Interact with the conversation We can add this again once we have persistent logins.
| * | Merge branch 'xj9/pleroma-fe-feature/even-better-nsfw-image-loading' into ↵Roger Braun2017-03-09
| |\ \ | | |/ | |/| | | | develop
| | * Merge branch 'develop' into ↵Roger Braun2017-03-09
| | |\ | | |/ | |/| | | | xj9/pleroma-fe-feature/even-better-nsfw-image-loading
| * | Merge branch 'feature/failed-login-error' into 'develop' Shpuld Shpuldson2017-03-08
| |\ \ | | | | | | | | | | | | | | | | Visual feedback on failed login See merge request !49
| | * | 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 handler See merge request !48
| | * | | Move rejection handlerwakarimasen2017-03-07
| | | | |
| | | | * improvements on fature/better-nsfw-image-loadingxj92017-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - loading indicator - avoid hitting the cache if we already know the image was loaded - more responsive toggle
* | | | | Add base03 border to timeline bottom fetcher too.shpuld2017-03-09
| | | | |
* | | | | Make style setter create an often used base03-border class, use that class ↵shpuld2017-03-09
|/ / / / | | | | | | | | | | | | in notifications, navpanel and statuses.
* | | | Merge branch 'feature/performance' into 'develop' lambadalambda2017-03-08
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Feature/performance See merge request !50
| * | | 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 statuses See merge request !47
| * | Visual feedback on failure to fetch new statuseswakarimasen2017-03-07
| | |
* | | Merge branch 'feature/more-visible-notifications' into 'develop' lambadalambda2017-03-07
|\ \ \ | | | | | | | | | | | | | | | | Notifications inside a red circle and the red line more visible See merge request !46
| * | | Put the number of notifications inside a red circle (kinda like qvitter and ↵shpuld2017-03-07
| | | | | | | | | | | | | | | | everyone else does), make the red notification line slightly less transparent.
* | | | Merge branch 'fix/collapse-on-same-line' into 'develop' lambadalambda2017-03-07
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Put conversation 'Collapse' back on the same line with the rest of the heading.' See merge request !45
| * | | 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 retweets See merge request !43
| * | Highlight original notice when expanding retweetswakarimasen2017-03-06
| | |
* | | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun2017-03-07
|\ \ \
| * \ \ Merge branch 'fix/overlapping-styles-user-card' into 'develop' Shpuld Shpuldson2017-03-06
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix overlapping styles in timeline and notifications that screwed up user-card. See merge request !44
| | * | | 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
| | | | | | | | | | | | This reverts commit 0bb1ec30d0ccba0fded1c6555d75297a6d9c83d2.
* | | Temporarily remove persistence.Roger Braun2017-03-06
|/ /
* | Merge branch 'feature/load-new-statuses-in-heading' into 'develop' lambadalambda2017-03-06
|\ \ | | | | | | | | | | | | Improvements in loading statuses interface See merge request !42
| * \ Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵shpuld2017-03-06
| |\ \ | |/ / |/| | | | | feature/load-new-statuses-in-heading
* | | Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop' lambadalambda2017-03-05
|\ \ \ | |_|/ |/| | | | | | | | Wakarimasen/pleroma fe highlight notice See merge request !41
| * | Style fixes.Roger Braun2017-03-05
| | |
| * | Remove unused importwakarimasen2017-03-05
| | |
| * | Add focused prop to statuswakarimasen2017-03-05
| | |
| * | Highlight current notice in conversation-page, add backlinkswakarimasen2017-03-05
|/ /
| * Merged from develop, made 'new notices' into a 'show new' button placed on ↵shpuld2017-03-05
| |\ | |/ |/| | | the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else.