aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add emoji completion.eal2017-09-19
|
* Merge branch 'feature/tag-timelines' into 'develop'lambadalambda2017-09-17
|\ | | | | | | | | Add tag timeline view. See merge request !121
| * Remove another cache file.eal2017-09-17
| |
| * Remove cache file.eal2017-09-17
| |
| * Add tag timeline view.eal2017-09-17
|/
* Merge branch 'fix/set-cookie' into 'develop'lambadalambda2017-09-13
|\ | | | | | | | | Set cookies on fetch See merge request !114
| * Revert "Include cookie in every request"eal2017-09-02
| | | | | | | | | | | | This reverts commit 00589a9af153bad4d8e7f14669c1497443f5221b. Changing same-origin to the unsafer include did not fix the bug it was supposed to.
| * Include cookie in every requesteal2017-09-02
| |
| * Make sure options exists every time on fetch()eal2017-09-02
| |
| * Set cookies on fetcheal2017-08-31
| |
* | Merge branch 'feature/login-with-cookie' into 'develop'lambadalambda2017-09-13
|\ \ | | | | | | | | | | | | Try logging in with the existing cookie. See merge request !116
| * | Try logging in with the existing cookie.Roger Braun2017-09-02
| |/
* | Merge branch 'fix/upload-buttons-clickable' into 'develop'lambadalambda2017-09-13
|\ \ | | | | | | | | | | | | Fix hide and cancel buttons on chromium See merge request !119
| * | Fix hide and cancel buttons on chromiumeal2017-09-10
| | |
* | | Merge branch 'fix/responsive-user-search' into 'develop'lambadalambda2017-09-13
|\ \ \ | |/ / |/| | | | | | | | Make user finder more pleasant. See merge request !120
| * | Make user finder more pleasant.eal2017-09-10
|/ /
* | Merge branch 'feature/follow-notif-tests' into 'develop'lambadalambda2017-09-04
|\ \ | | | | | | | | | | | | Add tests for follow notifications. See merge request !115
| * | Add tests for follow notifications.eal2017-08-25
| |/
* | Merge branch 'fix/timeago-months' into 'develop'lambadalambda2017-09-03
|\ \ | | | | | | | | | | | | Better specifier for months See merge request !112
| * | Change better specifier for months.eal2017-08-29
| |/
* | Merge branch 'fix/usercard-css' into 'develop'Shpuld Shpuldson2017-09-03
|\ \ | |/ |/| | | | | Fix/usercard css See merge request !110
| * Fix 'Statuses' being different coloreal2017-08-27
| |
| * Move the cog to avatar heighteal2017-08-25
|/
* Merge branch 'fix/pleromabe-follow-notifs' into 'develop'Shpuld Shpuldson2017-08-25
|\ | | | | | | | | Add regex for follows from pleromabe See merge request !109
| * Add regex for follows from pleromabeeal2017-08-24
| |
* | Merge branch 'feature/post-status-clear-error-message' into 'develop'Shpuld Shpuldson2017-08-24
|\ \ | |/ |/| | | | | Feature/post status clear error message See merge request !108
| * whoops lintShpuld Shpuldson2017-08-24
| |
| * Add an X icon to clear error message from post status form, hack to allow ↵Shpuld Shpuldson2017-08-24
|/ | | | posting empty statuses if they have attachments
* Merge branch 'fix/style-fixes-user-profile' into 'develop'Shpuld Shpuldson2017-08-23
|\ | | | | | | | | Style fixes in user profile See merge request !107
| * Round the edge of the user profile user card, make sure 'follows you' stays ↵Shpuld Shpuldson2017-08-23
|/ | | | in the right, fix avatar class conflict.
* Merge branch 'feature/follow-lists' into 'develop'Shpuld Shpuldson2017-08-23
|\ | | | | | | | | Feature/follow lists See merge request !106
| * Appease linter.eal2017-08-23
| |
| * Add follower and following viewseal2017-08-23
| |
* | Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop'lambadalambda2017-08-22
|\ \ | | | | | | | | | | | | Add regex to check if you're the one being followed before adding notification. See merge request !102
| * | Add regex to check if you're the one being followed before adding notification.Shpuld Shpuldson2017-08-21
| | |
* | | Merge branch 'fix/user-card-changes-and-fixes' into 'develop'lambadalambda2017-08-22
|\ \ \ | | | | | | | | | | | | | | | | User card changes and fixes See merge request !104
| * | | Make pic bigger and remove border and add shadow, make screen name white ↵Shpuld Shpuldson2017-08-22
| | | | | | | | | | | | | | | | again, make cog appear only in sidepanel.
* | | | Merge branch 'fix/double-post-with-ctrl-enter' into 'develop'Shpuld Shpuldson2017-08-22
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Don't allow posting again while previous hasn't returned See merge request !103
| * | | Don't allow posting again while previous hasn't returnedShpuld Shpuldson2017-08-22
|/ / /
* | | Merge branch 'fix/profile-link-in-usercard' into 'develop'Shpuld Shpuldson2017-08-22
|\ \ \ | |/ / |/| | | | | | | | Add link to profile on usercard avatar and @handle See merge request !101
| * | Add link to profile on usercard avatar and @handleeal2017-08-21
|/ /
* | Merge branch 'fix/use-full-res-avatar-in-usercard' into 'develop'lambadalambda2017-08-21
|\ \ | | | | | | | | | | | | Use _original profile pic instead of the 48x48 thumbnail in the user card content. See merge request !100
| * | Use _original profile pic instead of the 48x48 thumbnail in the user card ↵Shpuld Shpuldson2017-08-21
|/ / | | | | | | content.
* | Merge branch 'fix/lock-submit-until-post-returns' into 'develop'lambadalambda2017-08-21
|\ \ | | | | | | | | | | | | fix/lock-submit-until-post-returns See merge request !99
| * | Visual indicator for when posting is happening, as well as disabling the ↵Shpuld Shpuldson2017-08-21
|/ / | | | | | | button to prevent double-posts.
* | Merge branch 'fix/avatar-clickable-areas' into 'develop'lambadalambda2017-08-20
|\ \ | | | | | | | | | | | | Adjust the clickable areas around avatars See merge request !98
| * | Adjust the clickable area of notif avatar to not contain everything below ↵Shpuld Shpuldson2017-08-20
|/ / | | | | | | it, adjust the status avatar to not have ghost border on top/right
* | Merge branch 'feature/post-status-errors' into 'develop'lambadalambda2017-08-20
|\ \ | | | | | | | | | | | | | | | | | | Add error message in post status form when failing to post Closes #24 See merge request !97
| * | Add error message in post status form when failing to post and don't get rid ↵Shpuld Shpuldson2017-08-20
|/ / | | | | | | of post/attachments when failing.
* | Merge branch 'feature/profile-editing' into 'develop'lambadalambda2017-08-19
|\ \ | | | | | | | | | | | | Feature/profile editing See merge request !95