Shpuld Shpludson
09736691ea
Merge branch '420-redo-user-card-content' into 'develop'
...
Re-do UserCardContent Component CSS
Closes #420
See merge request pleroma/pleroma-fe!642
2019-03-07 16:38:45 +00:00
taehoon
37acb51df4
Update classname
2019-03-05 21:48:07 -05:00
taehoon
7bceabb5bd
Rename UserCardContent to UserCard
2019-03-05 14:01:49 -05:00
Henry Jameson
68b2d9ef56
compatibility with upcoming changes
2019-03-05 20:15:18 +02:00
taehoon
e0a66b989d
Re-do UserCardContent css
2019-03-05 10:46:03 -05:00
Henry Jameson
6841f516fc
fix broken statuses
2019-03-02 20:39:04 +02:00
Shpuld Shpludson
c4f8426349
Re-do status header a bit, add more consistent spacing to status
2019-03-02 16:35:38 +00:00
Shpuld Shpludson
95fb768b5a
Fix #399 Make max attachments configurable
2019-02-27 14:38:58 +00:00
Shpuld Shpludson
ed3c318be0
Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'
...
Fix followers/follows UI, fix #343 fix #340
Closes #340 and #343
See merge request pleroma/pleroma-fe!590
2019-02-19 14:47:32 +00:00
Edijs
5d0e51cae3
Fix styling
2019-02-12 09:00:09 -07:00
jared
4d930c7c26
345 - fix long username issue in repeat status
2019-02-11 23:03:51 -05:00
Edijs
dd1b256005
Fix typo
2019-02-11 11:08:25 -07:00
Edijs
9f3f1ee7cb
Fix UI of followers list
2019-02-11 11:03:01 -07:00
Edijs
f3d2e41a9b
Fix return
2019-02-11 07:45:22 -07:00
Edijs
9959c311a9
Fix clicking link - open new tab unless tag or mention
2019-02-11 07:38:12 -07:00
Edijs
fc26f1852e
Merge branch 'develop' into fix/hashtag-opening
2019-02-10 11:59:19 -07:00
Shpuld Shpludson
4bea3c525f
Merge branch 'fix/subject-copying-composition-bug' into 'develop'
...
#326 Subject copying composition bug
See merge request pleroma/pleroma-fe!550
2019-02-09 20:47:29 +00:00
jasper
0a43546564
Switch into Lodash
2019-02-09 04:18:52 -08:00
jasper
f75ec48a80
Switch into Lodash
2019-02-09 04:13:52 -08:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
jasper
e90e7ce2db
Subject copying composition bug
2019-02-08 08:25:53 -08:00
jasper
7818d6786b
Add option to hide filtered statuses
2019-02-08 05:17:20 -08:00
jasper
10c7365451
Add option to hide filtered statuses
2019-02-08 04:31:44 -08:00
Edijs
d39e2643f5
Fix lint warning
2019-02-07 14:56:00 -07:00
Edijs
e44d8ad71e
Extract tag name from href and open in same tab
2019-02-07 14:54:49 -07:00
Edijs
a215f6856d
Always open tag in same instance
2019-02-06 21:26:32 -07:00
shpuld
4dbc6a3c56
Fix repeater html not showing properly
2019-02-06 22:17:06 +02:00
Edijs
a12397cf38
Hashtag opens in same tab
2019-02-06 11:34:21 -07:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
Shpuld Shpludson
3cd1deb133
Merge branch 'issue-154-shorten-cw-subject' into 'develop'
...
Issue #154 shorten subject
Closes #154
See merge request pleroma/pleroma-fe!520
2019-02-04 17:29:58 +00:00
dave
9d72c7e1bd
#154 - update long subject determine logic, meaningful variable names
2019-02-04 09:28:14 -05:00
dave
887f1def2e
handle poster attachment with tall subjects
2019-02-04 03:16:55 -05:00
dave
06cf8628e5
shorten incredibly long content warning or subject
2019-02-03 23:47:26 -05:00
Shpuld Shpludson
bb335ea71b
Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop'
...
#307 - replace user links with router links in repeats
See merge request pleroma/pleroma-fe!516
2019-02-04 04:22:33 +00:00
Shpuld Shpludson
d6ee6e8394
Merge branch '275-avatar-placeholder' into 'develop'
...
Support avatar placeholder
Closes #275
See merge request pleroma/pleroma-fe!511
2019-02-04 04:17:11 +00:00
Xiaofeng An
abf53838e2
#307 - replace user links with router links in repeats
2019-02-03 14:08:04 -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
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
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
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
95b735ff72
Show placeholder image if avatar image url is broken
2019-02-02 14:11:36 -05:00
Joshua Burch
7d93beb96d
fix #157 show screen_name when name is empty in retweet
2019-02-01 17:40:06 -05:00
shpuld
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
shpuld
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02: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
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
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
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
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
Henry Jameson
416424d048
review
2019-01-24 20:27:20 +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
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
shpuld
8761e039d0
Merge dev fix conflicts
2019-01-20 15:52:35 +02:00
Henry Jameson
6c70e9950c
some more post fields
2019-01-17 23:57:24 +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
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
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
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
16c7bd0199
merge develop, fix conflicts, fix logged out bug
2018-12-29 16:25:45 +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
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 Shpludson
67c2a607aa
Feature/bigger icons for mobile / #211
2018-12-18 18:26:14 +00:00
Maxim Filippov
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
Maxim Filippov
828b1c78f9
Implement user_profile.spec.js
2018-12-15 06:16:44 +03:00
Maxim Filippov
e4a34cc4d4
Use 'userProfileLink' to generate user-profile link
2018-12-13 19:57:11 +03:00
Henry Jameson
ff36d34186
fix timeago font
2018-12-13 17:20:31 +03:00
ValD
7556efa04f
added router-links to all relavent links
2018-12-12 23:34:22 +05:30
ValD
1623dcb417
added activatePanel onclick for timeago button
2018-12-12 23:34:22 +05:30
Maxim Filippov
eb4cd64152
Fix avatar styles
2018-12-06 22:09:54 +03:00
Maxim Filippov
6532462b95
Move old routes to /p, use /nickname for user profiles
2018-12-06 22:09:54 +03:00
Henry Jameson
51cf4dc298
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop:
Fix iOS Safari from making videos play fullscreen by default
added PR comments
resolved the lint
used the deleted data param as condition in status template
Switch to "timeline" when pressing user-settings
Added user setting tooltip
made links in user bio always open in new tabs
addressed PR comments
added tooltip
Add userId property to timelines so that we don't overwrite user timeline meant for another user
Added option to auto-hide subject field when it's empty.
removes hacks from notifications storage, adds api call to let server update is_seen attribute
fixes vimium not giving retweet button a hint
Do not use underscore at the beginning of the method
Logout user on password change
Route user to the correct profile URL
Typo
Fix filetype detection
Switch to settings when touching settings
Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
ValD
57366ff0cc
added PR comments
2018-12-05 00:38:53 +05:30
ValD
88aa0f1245
resolved the lint
2018-12-05 00:19:00 +05:30
ValD
da3adff5a8
used the deleted data param as condition in status template
2018-12-05 00:15:08 +05:30
ValD
c40bda7c2a
added tooltip
2018-12-04 00:45:31 +05:30
Henry Jameson
bee738c815
making inset shadows work on avatars again
2018-12-02 08:47:55 +03:00
Henry Jameson
77ac42d919
fix retweeter avatar not getting proper shadow
2018-12-01 14:59:22 +03:00
Henry Jameson
406df4399b
avatars shadows, also allows drop-shadow use
2018-11-30 16:39:53 +03:00
Henry Jameson
a806d43f05
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop: (60 commits)
whoops
whoops
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
remove deploy stage
remove deploy stage
updated and completed German translation
On logout switch to public timeline.
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Put oauth text into description.
Display OAuth login on login form button.
...
2018-11-26 05:21:58 +03:00
Henry Jameson
0ca42bd3d6
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop: (36 commits)
remove deploy stage
remove deploy stage
updated and completed German translation
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Count spoiler text in the character count. Fixes #135 .
Added Irish (Gaeilge) Language
Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
simplify code
adapt to destructive change of api
Adds Occitan locale
Updated italian translation
Update oc.json
Update oc.json
Update of the oc.json file Actualizacion del fichièr oc.json
Sort messages object by language code so that it's easier from the UI to browse them.
explicitly set collapseMessageWithSubject to undefined
Fall back to instance settings consistently
...
2018-11-26 04:33:41 +03:00
Henry Jameson
9a9dc47fc5
better preview, collateral fixes
2018-11-26 03:19:04 +03:00
Henry Jameson
d7eec4c30d
more styles
2018-11-26 00:23:07 +03:00
Henry Jameson
707441ffe6
more fonts
2018-11-25 22:06:49 +03:00
Henry Jameson
2f1070deb6
collateral fixes
2018-11-25 17:42:41 +03:00
Henry Jameson
621ab806e6
more default shadows, replaced original shadows with generated ones. maybe gotta
...
update fallbacks...
2018-11-21 21:23:07 +03:00
scarlett
d6ad08050a
Fall back to instance settings consistently
2018-10-21 18:04:23 +01:00
Henry Jameson
96804d42f0
Some themeing is working!!
2018-10-07 19:59:22 +03:00
Henry Jameson
d5e82625d3
lint fix
2018-09-25 15:21:47 +03:00
Henry Jameson
ef968d8e1e
now it actually works
2018-09-25 15:16:26 +03:00
shpuld
77e8933b2e
Fix mistakes
2018-08-31 16:13:43 +03:00
shpuld
384c80e238
Change styles a bit, make pre-formatted blocks not overflow but scroll
2018-08-31 16:04:52 +03:00
shpuld
f07e6b271c
Add styles for h1/2/3/4/5 tags in status html
2018-08-31 15:11:27 +03:00
Ekaterina Vaartis
d2640d4bb5
Add titles to source/expand buttons
2018-08-27 12:55:46 +03:00
Ekaterina Vaartis
14c1704ea1
Add titles to post visibility icons
2018-08-27 12:55:46 +03:00
scarlett
54ac0dfefd
Preserve subject in replies.
2018-08-26 01:50:11 +01:00
scarlett
52ce86ed57
Don't use nsfw clickthrough if the post is collapsed by default.
2018-08-26 00:21:54 +01:00
scarlett
d50440d802
When a post with a subject is collapsed, hide its attachments.
2018-08-25 20:33:44 +01:00
scarlett
da96294866
Don't hide replies when inConversation.
2018-08-24 21:46:45 +01:00
scarlett
60b115320f
Fix indentation
2018-08-24 20:19:22 +01:00
scarlett
50b3bd22e6
Remove old implementation of isReply.
2018-08-24 20:08:49 +01:00
scarlett
296ab54301
Add settings for changing the visibility of replies in the timeline.
2018-08-24 20:04:26 +01:00
ensra
3ec8e43a97
Rename expandCW to collapseMessageWithSubject.
...
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
ensra
671db023da
fix indent
2018-08-20 03:08:39 +01:00
ensra
1121f32c48
Add support for configurable CW clickthrough.
2018-08-20 02:59:06 +01:00
Henry Jameson
d94b77b863
fix for timeago being ass when post has replies. added hover colors for
...
clickable icons on the right side. Reverted line-height to its original value
2018-08-15 13:02:39 +03:00
Henry Jameson
d417cb35bb
fix potential stretched spurdo
2018-08-13 15:36:10 +03:00
Henry Jameson
4d112b70fd
fixed custom emoji in nickname. changed icons on right side to be more
...
streamlined. adjusted CSS so that all text in header of post is on same
baseline and all icons/images are middle-aligned.
2018-08-13 14:46:28 +03:00
Henry
27adde9887
Merge branch 'develop' into 'feature/accountHighlight'
...
# Conflicts:
# src/components/user_card_content/user_card_content.vue
2018-08-12 12:05:08 +00:00
lambda
01c5bae594
Merge branch 'feature/emoji-in-profiles' into 'develop'
...
Use serverside html rendering in usernames and bios if available.
See merge request pleroma/pleroma-fe!304
2018-08-12 10:40:57 +00:00
Toromino
895ef525d2
Update status.vue
2018-08-09 16:47:08 +00:00
eal
876f7633fe
Use serverside html rendering in usernames and bios if available.
2018-08-09 12:52:34 +03:00
Toromino
e60fde233b
Update status.vue
2018-08-08 14:39:22 +00:00
dtluna
5cfc247c6b
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
...
This reverts merge request !301
2018-08-06 09:08:50 +00:00
dtluna
da36cd11e8
Hide all status actions if not logged in
2018-08-06 11:57:27 +03:00
Henry Jameson
3d72c2b964
fixed lint
2018-08-05 05:44:02 +03:00
Henry Jameson
b04a9d1229
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
2018-08-05 05:41:37 +03:00
Henry Jameson
6a81aa2745
added ability to pick the style of highlighting
2018-08-05 05:18:04 +03:00
lambda
17f6eb18e7
Revert "Merge branch 'cw-clickthrough' into 'develop'"
...
This reverts merge request !291
2018-07-12 07:20:39 +00:00
Henry Jameson
8ccebbe156
both bugs fixed. it's reactive and no more conflicting cards
2018-07-06 20:12:09 +03:00
Henry Jameson
fa8c221f3a
moved style generator into separate file. notifications are highlighted too now.
2018-07-06 20:12:09 +03:00
Henry Jameson
f911182a2f
working, somewhat
2018-07-06 20:12:09 +03:00
Henry Jameson
148e691199
initial vers
2018-07-06 20:12:09 +03:00
Vivian Lim
158342fc39
Fix lint warnings
2018-06-29 00:10:17 -07:00
Vivian Lim
b0cf050797
Add configuration option to enable click-through content warnings
2018-06-28 23:39:55 -07:00
Vivian Lim
ab86e87e85
Also hide attachments behind clickthrough.
2018-06-28 23:39:01 -07:00
Vivian Lim
65edcaf4b9
Differentiate content warning block if it is on lightbg
2018-06-28 23:39:01 -07:00
Vivian Lim
b3e122d31f
Carry forward content warnings in replies
2018-06-28 23:39:01 -07:00
Vivian Lim
0554cac113
Add click-to-show content warnings on posts
2018-06-28 23:39:01 -07:00
Roger Braun
d4f5b3feec
Use parents scope if available.
2018-06-12 19:28:48 +02:00