Shpuld Shpuldson
|
bfb1b3f10b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/stop-inappropriate-scroll-auto-fetch
|
2017-11-02 16:48:01 +02:00 |
|
Shpuld Shpuldson
|
10bc83018c
|
Deregister scroll listener properly, only fetch more if timeline is visible.
|
2017-11-02 16:26:17 +02:00 |
|
lambda
|
6e611f4039
|
Update .gitlab-ci.yml
|
2017-11-02 14:20:00 +00:00 |
|
lambadalambda
|
63473964f8
|
Merge branch 'feature/emoji-completion' into 'develop'
Add emoji completion
See merge request lambadalambda/pleroma-fe!122
|
2017-10-25 10:00:28 -04:00 |
|
eal
|
ba9b04a8ba
|
Use the API endpoint for emoji completion.
|
2017-10-19 23:39:21 +03:00 |
|
eal
|
447ec91176
|
Actually actually fix image url.
|
2017-09-19 22:58:15 +03:00 |
|
eal
|
f4b1319eff
|
Actually fix image url.
|
2017-09-19 22:54:54 +03:00 |
|
eal
|
70d66c48ad
|
Fix image url.
|
2017-09-19 22:50:08 +03:00 |
|
eal
|
2162ef20b0
|
Add emoji completion.
|
2017-09-19 22:43:20 +03:00 |
|
lambadalambda
|
91991e2ac1
|
Merge branch 'feature/tag-timelines' into 'develop'
Add tag timeline view.
See merge request !121
|
2017-09-17 07:58:05 -04:00 |
|
eal
|
c96a7b582b
|
Remove another cache file.
|
2017-09-17 14:42:04 +03:00 |
|
eal
|
59f07c0704
|
Remove cache file.
|
2017-09-17 14:37:48 +03:00 |
|
eal
|
9abfcb34ef
|
Add tag timeline view.
|
2017-09-17 14:26:35 +03:00 |
|
lambadalambda
|
3eaaa4c16d
|
Merge branch 'fix/set-cookie' into 'develop'
Set cookies on fetch
See merge request !114
|
2017-09-13 04:47:23 -04:00 |
|
lambadalambda
|
7abcb13ec0
|
Merge branch 'feature/login-with-cookie' into 'develop'
Try logging in with the existing cookie.
See merge request !116
|
2017-09-13 04:47:03 -04:00 |
|
lambadalambda
|
c6b909570a
|
Merge branch 'fix/upload-buttons-clickable' into 'develop'
Fix hide and cancel buttons on chromium
See merge request !119
|
2017-09-13 04:46:24 -04:00 |
|
lambadalambda
|
e7691bff82
|
Merge branch 'fix/responsive-user-search' into 'develop'
Make user finder more pleasant.
See merge request !120
|
2017-09-13 04:46:06 -04:00 |
|
eal
|
5e6ffc0e45
|
Make user finder more pleasant.
|
2017-09-10 20:46:42 +03:00 |
|
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 |
|