aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Make linter happy.Roger Braun2017-03-15
|
* Add basic mention completion.Roger Braun2017-03-15
|
* Remove tributejs.Roger Braun2017-03-15
|
* Add autowatching test running task.Roger Braun2017-03-15
|
* Basic word position and completion service.Roger Braun2017-03-15
|
* 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
| |
* | Merge branch 'fix/conversation-heading-border' into 'develop'lambadalambda2017-03-10
|\ \ | | | | | | | | | | | | Separate conversation heading and posts with a border. See merge request !62
| * | Add a border to conversation heading to add distinction between it and a ↵shpuld2017-03-10
|/ / | | | | | | hilighted post. (TODO: add the same base03-border to all headings for consistency's sake if it looks alright?)
* | Merge branch 'wakarimasen/pleroma-fe-develop' into 'develop' Shpuld Shpuldson2017-03-10
|\ \ | | | | | | | | | | | | Wakarimasen/pleroma fe develop See merge request !55
| * \ Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into ↵wakarimasen2017-03-10
| |\ \ | |/ / |/| | | | | wakarimasen/pleroma-fe-develop
* | | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun2017-03-10
|\ \ \
| * \ \ Merge branch 'feature/separate-reply-form-from-inside-status' into 'develop' lambadalambda2017-03-10
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Make reply window not part of the inner status. See merge request !60
| | * | Use conditional class for reply icon color.shpuld2017-03-10
| | | |
| | * | Separate reply form from inside status to make it resistant to hilighting, ↵shpuld2017-03-09
| |/ / | | | | | | | | | make the reply button light up when reply window is open.
| * | Merge branch 'fix/no-border-on-last-notif' into 'develop' Shpuld Shpuldson2017-03-09
| |\ \ | | | | | | | | | | | | | | | | Fix red border not appearing on the last notification. See merge request !59
| | * | Fix red border not appearing on the last notification.shpuld2017-03-09
| | | |
| * | | Merge branch 'fix/mentions-timeline' into 'develop' Shpuld Shpuldson2017-03-09
| |\ \ \ | | |/ / | |/| | | | | | | | | | Fix/mentions timeline See merge request !58
| | * | Remove unused fetchMentions()wakarimasen2017-03-09
| | | |
| | * | Let timeline component fetch mentionswakarimasen2017-03-09
| |/ /
* / / Fix localforage warning.Roger Braun2017-03-10
|/ /
* | Merge branch 'feature/timeline-fetch-error' into 'develop' Shpuld Shpuldson2017-03-09
|\ \ | | | | | | | | | | | | Use one error variable for all timelines See merge request !57
| * | Use one error variable for all timelineswakarimasen2017-03-09
| | |
* | | Merge branch 'feature/borders-pleasing-to-the-eye' into 'develop' lambadalambda2017-03-09
|\ \ \ | |/ / |/| | | | | | | | Feature/borders pleasing to the eye See merge request !56
| * | 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 ↵shpuld2017-03-09
| | | | | | | | | | | | in notifications, navpanel and statuses.
| | * 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-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
| | | | |