Commit graph

1219 commits

Author SHA1 Message Date
taehoon
e7f43d6bc3 Use an existing image served by backend instead 2019-02-03 13:30:54 -05:00
Shpuld Shpludson
7115584882 Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into 'develop'
#306 - fix conversation arrow smushed in notifications panel

See merge request pleroma/pleroma-fe!513
2019-02-03 15:10:19 +00:00
Xiaofeng An
6d3a7809be #306 - fix conversation arrow smushed in notifications panel 2019-02-03 09:59:32 -05:00
Xiaofeng An
965a578561 Revert "#306 - fix conversation arrow smushed in notifications panel"
This reverts commit 1e40e70efc.
2019-02-03 09:49:22 -05:00
Shpuld Shpludson
d4991d0162 Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
18ae7bd5f3 Combine friends/followers 2019-02-03 11:58:49 +02:00
shpuld
b614cb94e5 merge develop in 2019-02-03 10:13:09 +02:00
Shpuld Shpludson
c7ee2ed831 Merge branch '238-add-avatar-size-suggestion' into 'develop'
Add avatar size instruction notice

Closes #238

See merge request pleroma/pleroma-fe!512
2019-02-03 07:05:38 +00:00
Shpuld Shpludson
f0721ed83b Merge branch 'fix/default-inlined-videos' into 'develop'
Change video playing default without bothering making it an instance configurable

See merge request pleroma/pleroma-fe!505
2019-02-03 06:45:04 +00:00
Xiaofeng An
1e40e70efc #306 - fix conversation arrow smushed in notifications panel 2019-02-02 21:49:07 -05:00
taehoon
d8ad494081 Add avatar size instruction notice 2019-02-02 20:39:41 -05:00
taehoon
4833f79cc2 Fix class ordering issues related to avatar 2019-02-02 15:50:25 -05:00
taehoon
0b66a43a83 Improve reusability of UserAvatar component 2019-02-02 15:33:02 -05:00
shpuld
dbb16d56e2 follows/followers pagination ready for review 2019-02-02 22:29:10 +02:00
taehoon
89b9aed134 Move avatar css into a correct place 2019-02-02 14:33:13 -05:00
taehoon
d607e4195a Migrate StillImage to UserAvatar for avatars 2019-02-02 14:23:52 -05:00
taehoon
9c4092dbd5 Use a correct avatar placeholder image 2019-02-02 14:17:00 -05:00
taehoon
95b735ff72 Show placeholder image if avatar image url is broken 2019-02-02 14:11:36 -05:00
Shpuld Shpludson
0fba655cf0 Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into 'develop'
fix #157 show screen_name when name is empty in retweet

Closes #157

See merge request pleroma/pleroma-fe!508
2019-02-02 05:52:39 +00:00
Joshua Burch
7d93beb96d fix #157 show screen_name when name is empty in retweet 2019-02-01 17:40:06 -05:00
Joshua Burch
9eddaf6c3e fix #209 make name field length as wide as the bio field 2019-02-01 16:12:14 -05:00
Shpuld Shpludson
1a6207be1d Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop'
Fix #298 Add option to tab switcher to not render background tabs

Closes #298

See merge request pleroma/pleroma-fe!504
2019-01-31 19:21:49 +00:00
shpuld
a8c6b3f538 Change video playing default without bothering making it an instance configurable 2019-01-31 21:19:41 +02:00
shpuld
8ce513ed09 initial draft for follows/following pagination 2019-01-31 21:11:28 +02:00
Shpuld Shpludson
3e4c598af4 Merge branch 'fix/statistics' into 'develop'
Fix statistics label visibility via configuration

See merge request pleroma/pleroma-fe!503
2019-01-31 15:11:29 +00:00
shpuld
476bf0afe1 Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher 2019-01-31 17:00:31 +02:00
Edijs
6a8d10f0bb Fix statistics label visibility via configuration 2019-01-30 18:53:34 -07:00
3c4cf5ed11 Only generate mentions string if there are mentions
Otherwise, a user replying to themselves without mentioning anyone else will insert a space at the beginning of the reply text area, hiding the placeholder.
2019-01-31 00:50:19 +00:00
shpuld
aaa5f1a638 Adjust margins for attachments/previews 2019-01-30 21:41:07 +02:00
shpuld
c7cffbb6c7 Merge branch 'develop' into feat/media-modal 2019-01-30 20:49:24 +02:00
lambda
1717e70046 Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
fix #292 dont show "load more" when bottomed out

Closes #292

See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
lambda
0bd77149a0 Merge branch 'fix/tall-statuses-v2' into 'develop'
More tall status related fixes that I didn't know was borkd

See merge request pleroma/pleroma-fe!498
2019-01-30 17:47:46 +00:00
lambda
d0df98f99b Merge branch 'fix/reply-to-using-wrong-id' into 'develop'
Fix #295 reply-to link pointing to wrong id

Closes #295

See merge request pleroma/pleroma-fe!499
2019-01-30 17:46:52 +00:00
lambda
7b0e3dc471 Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'
Fix #289 Make more user links use internal routing

Closes #289

See merge request pleroma/pleroma-fe!500
2019-01-30 17:46:18 +00:00
shpuld
15603981f8 Capture clicks on statuses to hijack mention clicks, match mention href to user somehow 2019-01-30 19:24:47 +02:00
shpuld
16a5272726 Fix a simple typo 2019-01-30 16:57:19 +02:00
shpuld
0a39159fdf Adjust scrolling logic and document it, make sure to never show 'show less' if it's not a tall status 2019-01-30 16:38:28 +02:00
Maxim Filippov
298cea8f6d Split hide_network into hide_followers & hide_followings 2019-01-30 01:11:40 +03:00
shpuld
62e9525724 Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses 2019-01-29 21:04:52 +02:00
shpuld
0a0dffa793 Fix favs timeline fetching when opening profile via direct url 2019-01-29 19:12:47 +02:00
shpuld
1f3cf6d1fc add missing shadow to nav panel 2019-01-29 16:32:34 +02:00
lambda
4185452b52 Merge branch 'feature/link-preview' into 'develop'
link previews

See merge request pleroma/pleroma-fe!481
2019-01-29 14:12:18 +00:00
shpuld
c3a931610a remove log 2019-01-28 22:03:25 +02:00
shpuld
0460728a8c Fix tall status expanding needing extra clicks, make tall status expand automatically in conversation when focused 2019-01-28 21:59:17 +02:00
shpuld
51024a2c8a Merge branch 'develop' into feat/media-modal 2019-01-28 19:02:46 +02:00
lambda
bb2ee04f04 Merge branch 'fix/dont-fetch-favorites-for-others' into 'develop'
fix/don't fetch favs if the profile isnt current user

See merge request pleroma/pleroma-fe!484
2019-01-28 16:22:03 +00:00
shpuld
4d3907b86a Formatting 2019-01-28 17:48:00 +02:00
shpuld
1b76a5a9ea Add back that login error thing that someone removed 2019-01-28 17:43:51 +02:00
shpuld
82ef57cd59 dont fetch favs if profile isnt us 2019-01-28 16:59:01 +02:00
lambda
3b1cafc19f Merge branch 'fix/fix-warnings' into 'develop'
Fix annoying console warnings

See merge request pleroma/pleroma-fe!480
2019-01-28 10:52:24 +00:00
shpuld
96c36af731 refactor the FE parts 2019-01-28 05:50:12 +00:00
William Pitcock
2b86f6e883 status: only show link preview in main post view 2019-01-28 05:50:12 +00:00
William Pitcock
0924907c64 add link-preview component 2019-01-28 05:50:12 +00:00
shpuld
20f113e811 Remove logs 2019-01-27 11:35:29 +02:00
shpuld
ff5f5095df Fix replies to deleted posts/users pushing vue warnings 2019-01-27 11:31:23 +02:00
shpuld
2d94a49798 Fix registration path warning and translation warnings 2019-01-27 11:13:32 +02:00
shpuld
474fbf6bf4 use translate over margin animation (stupid me) 2019-01-27 08:27:41 +02:00
shpuld
676acdbf82 Add default config for new options, fix firefox inline playing 2019-01-26 17:59:59 +02:00
shpuld
0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
shpuld
3978aaef84 Redo everything in the MR 2019-01-26 17:45:03 +02:00
William Pitcock
7b296696a3 user profile: add media timeline 2019-01-26 13:49:24 +00:00
Henry Jameson
9f914824cb i should take it easy 2019-01-25 17:55:56 +03:00
Henry Jameson
eb33951186 hotfix 2019-01-25 16:24:41 +03:00
Henry Jameson
f48e3d0db8 quickfix 2019-01-25 01:39:19 +03:00
Henry Jameson
9d0d6b86c8 this attempts converting id to number to sort them numerically, since "99" >
"100" while 99 < 100
2019-01-25 01:08:08 +03:00
HJ
03ffa7e84e Merge branch 'fix-custom-nsfw-image' into 'develop'
fix custom nsfwCensorImage not working

See merge request pleroma/pleroma-fe!469
2019-01-24 18:13:07 +00:00
HJ
8b7faa8106 Merge branch 'favorites-fixes' into 'develop'
fix reply-to tooltip being somewhat unreliable

See merge request pleroma/pleroma-fe!473
2019-01-24 18:05:09 +00:00
Henry Jameson
416424d048 review 2019-01-24 20:27:20 +03:00
efa0c85ac0 Fix who to follow panel shuffling 2019-01-24 15:17:35 +00:00
Henry Jameson
ac64e90898 fix custom nsfwCensorImage not working 2019-01-23 00:15:24 +03:00
Henry Jameson
61c9ecd855 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:10:26 +03:00
HJ
c8caa477d7 Revert "fix reply-to tooltip being somewhat unreliable"
This reverts commit 66dc72deb2
2019-01-22 21:08:28 +00:00
Henry Jameson
66dc72deb2 fix reply-to tooltip being somewhat unreliable 2019-01-23 00:03:33 +03:00
Henry Jameson
8946ff9838 fix errors in console 2019-01-22 23:57:27 +03:00
HJ
3a3cf1d48a Merge branch 'favorites' into 'develop'
Add Favorites TL to user profile, add some initial support for MastoAPI

Closes #265 and #262

See merge request pleroma/pleroma-fe!462
2019-01-22 17:46:08 +00:00
Henry Jameson
92dedcd53e linting 2019-01-22 20:27:49 +03:00
shpuld
8761e039d0 Merge dev fix conflicts 2019-01-20 15:52:35 +02:00
shpuld
485a061287 Polish for videos, smaller sizes, remove gif-looping options 2019-01-20 12:46:11 +02:00
lain
0ed1828352 Linting. 2019-01-19 14:56:18 +01:00
lain
741ccfdc4a Don't use referrerpolicy with media proxy. 2019-01-19 14:45:56 +01:00
Henry Jameson
6c70e9950c some more post fields 2019-01-17 23:57:24 +03:00
Henry Jameson
80a7035154 removing unnecessary conversions since it should already be converted in normalizer 2019-01-17 23:57:24 +03:00
Henry Jameson
8172eeb1e0 fix indents 2019-01-17 23:05:58 +03:00
Henry Jameson
6e219c2961 add support for tab-switcher to automatically switch to first tab if asked index
is invalid
2019-01-17 22:46:41 +03:00
Henry Jameson
93cbb58212 fix login and favorites tab... 2019-01-17 22:11:51 +03:00
Henry Jameson
cab87744c8 Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not"
and some stuff to make favorites still work

This reverts commit 039a407400.
2019-01-17 21:46:03 +03:00
Henry Jameson
5251de317d Merge branch 'switch-to-string-ids' into favorites
with some changes/merge conflicts resolution

* switch-to-string-ids:
  fixx?????
  fix notifications?
  fix lint
  fix tests, removed one unused function, fix real problem that tests helped to surface
  added some more explicit to string conversion since BE seem to be sending numbers and it could cause an issue.
  Remove all explicit and implicit conversions of statusId to number, changed explicit ones so that they convert them to string
2019-01-17 19:16:45 +03:00
shpuld
e1c3691a72 Add escape button support 2019-01-16 17:27:23 +02:00
05ead45fb7 Show who to follow in the mobile view 2019-01-16 02:33:08 +00:00
lambda
502a76be0a Merge branch 'summary-html' into 'develop'
Sync with backend: Use summary_html.

See merge request pleroma/pleroma-fe!463
2019-01-15 20:16:11 +00:00
shpuld
17735943d5 Add media viewer module and media module component, modify attachment behavior 2019-01-14 19:23:13 +02:00
Henry Jameson
f9fb85ee42 Merge remote-tracking branch 'upstream/develop' into favorites
* upstream/develop:
  Add Korean translation
  Change emptlyTl to take userId
  better fix
  fixes #265 and also that thin line below gradient on chrome (UGH)
  fix #262 part of user profiles not being able to load previous posts
  Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-13 22:21:09 +03:00
Henry Jameson
519f49e29b separated normalization into a another file, removed catchall and added more stuff 2019-01-13 22:14:55 +03:00
scarlett
de8dfef252 Remove reply detection hack 2019-01-13 13:41:02 +00:00
scarlett
0fd7e7eb68 Sync with backend: Use summary_html. 2019-01-13 13:38:00 +00:00
Henry Jameson
039a407400 some initial work to make it possible to use "unregistered" timelines, i.e. not
reserving a timeline by name, instead just passing timeline object itself.
2019-01-12 23:33:45 +03:00
Henry Jameson
ef2585e32b Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
Shpuld Shpludson
a51167fa72 Merge branch 'fix-265-fix-user-profiles-again' into 'develop'
fixes #265 and also that thin line below gradient on chrome (UGH)

Closes #265

See merge request pleroma/pleroma-fe!456
2019-01-09 20:57:00 +00:00
Henry Jameson
f4b499b044 better fix 2019-01-09 16:31:53 +03:00
Henry Jameson
d13f36a2ad fixes #265 and also that thin line below gradient on chrome (UGH) 2019-01-09 15:36:09 +03:00
Henry Jameson
0b8f616af1 fix #262 part of user profiles not being able to load previous posts 2019-01-09 14:18:36 +03:00
a60fc390a0 Add instance information page for mobile 2019-01-07 17:26:47 +00:00
702f013225 [Debug] Avoid duplicates in the who to follow panel 2019-01-04 08:43:00 +00:00
rinpatch
c25cf29533 Fix translation typo in registration.vue 2019-01-03 19:42:43 +01:00
Shpuld Shpludson
76cfb15b3c Merge branch 'feature/replace-panel-switcher' into 'develop'
Mobile side drawer

See merge request pleroma/pleroma-fe!443
2018-12-31 17:35:31 +00:00
Shpuld Shpludson
fb8f774383 Fix profiles without statuses not loading 2018-12-31 01:57:22 +00:00
shpuld
354fd32e7b Fix conflicting styles 2018-12-30 22:41:31 +02:00
shpuld
16c7bd0199 merge develop, fix conflicts, fix logged out bug 2018-12-29 16:25:45 +02:00
lambda
1555a5fef3 Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
shpuld
747e4090ca Cleanup and remove divider element in side drawer 2018-12-29 12:44:21 +02:00
shpuld
650655709d fix conflict in user card content 2018-12-28 21:44:09 +02:00
shpuld
85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
Lambda
f35dbaf064 Treat reserved users like external users in the frontend. 2018-12-26 14:50:48 +01:00
HJ
fa8ecb1c39 User Card Content fixes and updates 2018-12-26 09:19:25 +00:00
Lambda
24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
HJ
a80c8fd24c Merge branch 'refactor-recommendations' into 'develop'
remove unneeded numbered variables who_to_follow

See merge request pleroma/pleroma-fe!436
2018-12-25 02:35:30 +00:00
Hannah Ward
ed2393c970
fix inconsistencies within who_to_follow_panel 2018-12-25 01:32:20 +00:00
HJ
698328dfbe Merge branch 'fix_textfields' into 'develop'
Fix textarea not resizing correctly and probably cursor position

Closes #230

See merge request pleroma/pleroma-fe!430
2018-12-25 01:29:18 +00:00
Henry Jameson
18d7684f32 fix for non-shrinking main post form 2018-12-25 04:25:19 +03:00
Hannah Ward
6fa993c122
remove unneeded numbered variables who_to_follow 2018-12-25 00:34:33 +00:00
shpuld
4752081818 Add closed-check for touchmove 2018-12-23 20:14:40 +02:00
shpuld
e46b560ead move closing logic to drawer, add swipe to close 2018-12-23 19:50:19 +02:00
shpuld
f72b1d048e Merge branch 'develop' into feature/replace-panel-switcher 2018-12-22 17:32:35 +02:00
shpuld
4836c8ac74 Add some more routes to side drawer 2018-12-22 17:32:07 +02:00
Ekaterina Vaartis
10642df528 Add a translation to the captcha strings in the registration form 2018-12-21 15:12:46 +03:00
Ekaterina Vaartis
661efc51b7 Small UI improvements for the CAPTCHA field 2018-12-21 00:25:36 +03:00
Ekaterina Vaartis
8470856045 Add encrypted captcha_answer_data for stateless captcha 2018-12-21 00:25:09 +03:00
shpuld
67263cde05 works but hacky 2018-12-20 22:20:04 +02:00
Henry Jameson
b7962a224c fixes many problems related to user profile 2018-12-20 07:54:55 +03:00
Henry Jameson
5970bf4e85 fixed incorrect height when empty text 2018-12-20 07:27:29 +03:00
Henry Jameson
afa2baec0c I suppose SOME browsers don't do this by default... 2018-12-20 07:17:54 +03:00
Henry Jameson
ae7b96abbf Fix resize not working properly for textareas 2018-12-20 07:17:54 +03:00
HJ
b65ac128c1 Merge branch 'remove_favorite_hacks' into 'develop'
no more "broken favorite"

Closes #218 and #145

See merge request pleroma/pleroma-fe!431
2018-12-19 14:57:25 +00:00
Shpuld Shpludson
c54b1fd0c5 Merge branch 'fix_defaults' into 'develop'
Fixed some settings not using defaults from instance config.

Closes #228

See merge request pleroma/pleroma-fe!429
2018-12-19 04:51:21 +00:00
Henry Jameson
5c2030e467 no more "broken favorite" 2018-12-19 01:55:53 +03:00
Henry Jameson
c7514be46f Fixed some settings not using defaults from instance config. Made some parts of
code more readable
2018-12-18 23:31:10 +03:00
shpuld
640a287892 Merge branch 'develop' into feature/replace-panel-switcher 2018-12-18 22:09:27 +02:00
Henry Jameson
81c83566cd Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
* upstream/develop: (24 commits)
  Feature/bigger icons for mobile / #211
  Fix oauth url
  Make user profile page cleaner
  Redirect to /main/all
  Move userProfile link to methods
  Fix user profile test
  Add temporary redirects
  Add local profile test
  Implement user_profile.spec.js
  Use babel polyfill in karma
  Use 'userProfileLink' to generate user-profile link
  Rollback disableDotRule
  Use "-1" in indexOf
  Add generateProfileLink
  Use "~" as a route namespace symbol
  Disable dot rule
  Pass userName instead of userId
  Typo in tests
  Fix redirect paths
  Fix typo
  ...
2018-12-18 22:43:26 +03:00
Shpuld Shpludson
67c2a607aa Feature/bigger icons for mobile / #211 2018-12-18 18:26:14 +00:00
lambda
2f28bf95fd Merge branch 'feature/new-user-routes' into 'develop'
Make domain.com/username routes work

Closes pleroma#395

See merge request pleroma/pleroma-fe!392
2018-12-18 15:26:00 +00:00
Henry Jameson
485a531d57 clean up the unused stuff 2018-12-17 21:02:16 +03:00
Henry Jameson
be27494ca1 Make user profile page cleaner 2018-12-17 20:42:14 +03:00
Henry Jameson
56fdbf18c5 missing string and unification with counters (order) 2018-12-17 19:21:05 +03:00
Henry Jameson
bf805361d0 collateral fix for tab display 2018-12-17 19:18:57 +03:00
Henry Jameson
292ac59d08 Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
* upstream/develop:
  Fix style
  Add a way to get new captcha on click
  Fix style
  Separate captcha into the backendInteractor
  more visual fixes
  changed bottom-shadow hiding method to be more compatible with overflow
  small fix for overflowing tab-switcher
  Support disabling captcha
  Base support for CAPTCHA (kocaptcha)
2018-12-17 19:18:35 +03:00
Henry Jameson
23d434c40c collateral fixes for user-card: use still-image, styles for custom emoji 2018-12-17 19:17:03 +03:00
Henry Jameson
8f255fbad4 Refactor follower/friends out of statuses/timeline into user_profile where it
belongs. Changed display of profile to single panel with tabs.
2018-12-17 19:14:38 +03:00
Shpuld Shpludson
b124dbf44e Merge branch 'captcha' into 'develop'
Captcha

See merge request pleroma/pleroma-fe!424
2018-12-17 13:36:56 +00:00
Maxim Filippov
ea6977cd4d Move userProfile link to methods 2018-12-17 02:52:27 +03:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00