Commit graph

2596 commits

Author SHA1 Message Date
eal
8a51bc6e22 Fix hide and cancel buttons on chromium 2017-09-10 13:33:02 +03:00
lambadalambda
9c7eb1de3c Merge branch 'feature/follow-notif-tests' into 'develop'
Add tests for follow notifications.

See merge request !115
2017-09-04 02:51:06 -04:00
lambadalambda
00f8857876 Merge branch 'fix/timeago-months' into 'develop'
Better specifier for months

See merge request !112
2017-09-03 19:00:42 -04:00
Shpuld Shpuldson
b35acf4628 Merge branch 'fix/usercard-css' into 'develop'
Fix/usercard css

See merge request !110
2017-09-03 01:20:46 -04:00
eal
298bf5cfca Revert "Include cookie in every request"
This reverts commit 00589a9af1.
Changing same-origin to the unsafer include did not fix the
bug it was supposed to.
2017-09-02 21:12:55 +03:00
Roger Braun
8b4f59e1f7 Try logging in with the existing cookie. 2017-09-02 19:50:02 +03:00
eal
00589a9af1 Include cookie in every request 2017-09-02 19:29:45 +03:00
eal
2b0811dddc Make sure options exists every time on fetch() 2017-09-02 19:29:16 +03:00
eal
522110c0bc Set cookies on fetch 2017-08-31 11:23:17 +03:00
eal
43f416297f Change better specifier for months. 2017-08-29 23:15:20 +03:00
eal
587cd7bcfa Fix 'Statuses' being different color 2017-08-27 13:10:25 +03:00
eal
ad6d0a1f0c Move the cog to avatar height 2017-08-25 14:59:55 +03:00
eal
04a3a44195 Add tests for follow notifications. 2017-08-25 14:07:31 +03:00
Shpuld Shpuldson
87b18da811 Merge branch 'fix/pleromabe-follow-notifs' into 'develop'
Add regex for follows from pleromabe

See merge request !109
2017-08-25 03:19:01 -04:00
eal
5bd6abc134 Add regex for follows from pleromabe 2017-08-24 21:53:31 +03:00
Shpuld Shpuldson
205024ba9d Merge branch 'feature/post-status-clear-error-message' into 'develop'
Feature/post status clear error message

See merge request !108
2017-08-24 09:34:09 -04:00
Shpuld Shpuldson
7061675e96 whoops lint 2017-08-24 16:25:26 +03:00
Shpuld Shpuldson
c6798864d4 Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments 2017-08-24 16:16:06 +03:00
Shpuld Shpuldson
8778270381 Merge branch 'fix/style-fixes-user-profile' into 'develop'
Style fixes in user profile

See merge request !107
2017-08-23 13:41:24 -04:00
Shpuld Shpuldson
bf61592b56 Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict. 2017-08-23 20:33:20 +03:00
Shpuld Shpuldson
2bc261afba Merge branch 'feature/follow-lists' into 'develop'
Feature/follow lists

See merge request !106
2017-08-23 12:40:39 -04:00
eal
e1ec01dc3e Appease linter. 2017-08-23 19:21:15 +03:00
eal
ccfc2e57d0 Add follower and following views 2017-08-23 19:14:06 +03:00
lambadalambda
5a1ad84092 Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop'
Add regex to check if you're the one being followed before adding notification.

See merge request !102
2017-08-22 06:18:41 -04:00
lambadalambda
e5d0965ff1 Merge branch 'fix/user-card-changes-and-fixes' into 'develop'
User card changes and fixes

See merge request !104
2017-08-22 06:13:10 -04:00
Shpuld Shpuldson
9ec4412894 Merge branch 'fix/double-post-with-ctrl-enter' into 'develop'
Don't allow posting again while previous hasn't returned

See merge request !103
2017-08-22 05:41:05 -04:00
Shpuld Shpuldson
6ad5052044 Make pic bigger and remove border and add shadow, make screen name white again, make cog appear only in sidepanel. 2017-08-22 12:38:12 +03:00
Shpuld Shpuldson
2ef915c9f1 Don't allow posting again while previous hasn't returned 2017-08-22 11:43:03 +03:00
Shpuld Shpuldson
863ea98acd Merge branch 'fix/profile-link-in-usercard' into 'develop'
Add link to profile on usercard avatar and @handle

See merge request !101
2017-08-22 04:35:44 -04:00
Shpuld Shpuldson
3d9d59915b Add regex to check if you're the one being followed before adding notification. 2017-08-21 23:31:38 +03:00
eal
4291263cec Add link to profile on usercard avatar and @handle 2017-08-21 23:14:05 +03:00
lambadalambda
cbe652f2d9 Merge branch 'fix/use-full-res-avatar-in-usercard' into 'develop'
Use _original profile pic instead of the 48x48 thumbnail in the user card content.

See merge request !100
2017-08-21 10:29:32 -04:00
Shpuld Shpuldson
b5e5a8d1e3 Use _original profile pic instead of the 48x48 thumbnail in the user card content. 2017-08-21 16:45:45 +03:00
lambadalambda
6e800d9912 Merge branch 'fix/lock-submit-until-post-returns' into 'develop'
fix/lock-submit-until-post-returns

See merge request !99
2017-08-21 08:57:50 -04:00
Shpuld Shpuldson
d3169b057c Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts. 2017-08-21 15:35:14 +03:00
lambadalambda
3ab9b477f8 Merge branch 'fix/avatar-clickable-areas' into 'develop'
Adjust the clickable areas around avatars

See merge request !98
2017-08-20 12:13:22 -04:00
Shpuld Shpuldson
dbf2f1621e Adjust the clickable area of notif avatar to not contain everything below it, adjust the status avatar to not have ghost border on top/right 2017-08-20 16:53:48 +03:00
lambadalambda
47ab2b51cf Merge branch 'feature/post-status-errors' into 'develop'
Add error message in post status form when failing to post

Closes #24

See merge request !97
2017-08-20 08:14:27 -04:00
Shpuld Shpuldson
42fb65e274 Add error message in post status form when failing to post and don't get rid of post/attachments when failing. 2017-08-20 13:16:41 +03:00
lambadalambda
fb3408d64f Merge branch 'feature/profile-editing' into 'develop'
Feature/profile editing

See merge request !95
2017-08-19 03:32:44 -04:00
lambadalambda
0c4f076765 Merge branch 'fix/pleromabe-favs-generate-notifs' into 'develop'
Pleroma BE favs generate notifs on GS

See merge request !96
2017-08-18 06:10:53 -04:00
Shpuld Shpuldson
1136db24cc Fix issue with trying to match() on undefined 2017-08-18 12:38:47 +03:00
Shpuld Shpuldson
052befa581 fix the very annoying thing where favs from pleromabe would not generate notifs when on GS 2017-08-18 12:26:07 +03:00
Shpuld Shpuldson
9503b8fa41 Remove the profile pic change from the old settings menu since it's in the new profile edit menu. 2017-08-18 12:00:59 +03:00
Shpuld Shpuldson
1526b4560c Clean up to have much less redundant code. 2017-08-18 11:51:17 +03:00
lambadalambda
0ece2f04fd Merge branch 'fix/user-finder-updates-user-timeline' into 'develop'
Force user profile timeline update when the user id changes

Closes #23

See merge request !94
2017-08-16 09:51:32 -04:00
Shpuld Shpuldson
2084c92dff Force user profile timeline update when the user id changes (like when another user has been searched/found). 2017-08-16 16:40:09 +03:00
Shpuld Shpuldson
6d7d173e4d Make linter happy. 2017-08-16 00:46:55 +03:00
Shpuld Shpuldson
c4920f2d86 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing 2017-08-16 00:15:00 +03:00
lambadalambda
dbad99cb4f Merge branch 'feature/follow-notifications' into 'develop'
Add follow notifications.

See merge request !92
2017-08-10 12:34:02 -04:00