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
Syldexia
5ae7fb871e
Fix formatting
2018-05-21 23:01:33 +01:00
Roger Braun
f06fef26b1
Display visibility if available.
2018-05-20 18:28:01 +02:00
Henry Jameson
f1478935da
user card no longer uncomfortably close to user name in timeline
2018-05-12 15:19:53 +03:00
Henry Jameson
e23986e239
unnecessary styles removed (fixes transparent color userstyle)
2018-05-12 15:19:53 +03:00
shpuld
c3bea8dfd1
Fix rt heading alignment again
2018-04-14 14:28:20 +03:00
shpuld
424e9166d9
Fix alignment issues in status heading and repeat info
2018-04-14 14:24:05 +03:00
shpuld
96692454a0
change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally.
2018-04-14 10:19:09 +03:00
shpuld
121f7424dc
Fix overflowing long maes in statuses and repeats.
2018-04-14 07:44:59 +03:00
shpuld
dc0fd8177c
Fix status preview loader having different offset from the actual stats preview
2018-04-12 20:03:03 +03:00
shpuld
ee883d0f88
Remove some commented lines and logs
2018-04-11 19:40:59 +03:00
shpuld
a1f6ef1dca
Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein.
2018-04-11 19:34:40 +03:00
shpuld
896fea7dbd
Fixes from review
2018-04-10 22:12:59 +03:00
shpuld
da1a222cab
Add back the status animation
2018-04-10 19:58:25 +03:00
shpuld
6a5116c349
Fixes to notification style issues mostly
2018-04-10 19:25:24 +03:00
shpuld
8835c98529
Merge hj's css overhaul and fix conflicts
2018-04-10 00:28:24 +03:00
shpuld
ec2a719f0d
some cleanup
2018-04-09 19:45:42 +03:00
shpuld
f4f9b3fa26
small fixes
2018-04-09 19:43:31 +03:00
Henry Jameson
b23bd076c3
raddi customization UI
2018-04-08 02:39:39 +03:00
Henry Jameson
529643d35a
indents
2018-04-07 19:30:27 +03:00
Henry Jameson
94195024e6
another post-rebase fix
2018-04-07 16:55:51 +03:00
Henry Jameson
3df7c1977f
fixes
2018-04-07 16:40:08 +03:00
Henry Jameson
33b1d85921
border-radii moved to variables, made rgbo colors use theme data, customizable
...
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson
acdb5e5c7a
cleanup. added fallback mechanism for IE11 and unsupported browsers.
2018-04-07 16:36:35 +03:00
Henry Jameson
aa0564406a
getting rid of baseXX, some small fixes. Seems to be usable.
2018-04-07 16:34:11 +03:00
Henry Jameson
0c4dc26808
after nine years of development, hopefully, it has been worth the weight
2018-03-12 02:31:33 +03:00
Henry Jameson
3257991f41
unfinished fetch() version that doesn't work
2018-03-12 01:30:27 +03:00
eal
e647bb22bb
Add keys to all component lists.
2018-02-04 17:26:46 +02:00
shp
06265078d8
Fix typo in fav/rt fix
2018-02-03 10:18:53 +02:00
eal
f3f0155d60
Fix fav/RT buttons in notifications.
2018-02-02 12:27:31 +02:00
Shpuld Shpludson
f2f9343d2a
Merge branch 'fix/emoji-align' into 'develop'
...
Align custom emoji to middle of line.
See merge request pleroma/pleroma-fe!196
2018-02-02 05:38:57 +00:00
eal
664a55fc79
Show fav/RT counts even if not logged in.
2018-02-02 00:45:29 +02:00
eal
fe2e5ba6f0
Align custom emoji to middle of line
2018-02-01 17:18:51 +02:00
shpuld
f02229fed2
Add specifity to active classes to make them override theme colors.
2017-11-24 23:55:46 +02:00
shpuld
10be553910
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
2017-11-22 01:00:25 +02:00
shpuld
95cbd19254
Unhide completions, strengthen shadows a bit, force the 0.1 shade to always span the full height, make usercard use correct borders.
2017-11-20 13:03:02 +02:00
shpuld
dc4755f2ff
Make goto-check use the correct property to make it work again
2017-11-14 08:55:21 +02:00
lambda
55c4818084
Merge branch 'fix/scrollbar-for-taller-posts' into 'develop'
...
Better handling of taller posts
Closes #40
See merge request pleroma/pleroma-fe!158
2017-11-13 18:17:50 +00:00
shpuld
e19a617de1
Add a scrollbar for tall spammy posts.
2017-11-13 18:39:27 +02:00
shpuld
ab1d1b3dd0
Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading.
2017-11-13 16:33:54 +02:00
lambda
d6478068f8
Merge branch 'feature/streaming-posts' into 'develop'
...
Streaming posts
See merge request pleroma/pleroma-fe!151
2017-11-13 09:10:44 +00:00
Henry Jameson
764331c80b
fix white line below buttons in notifications
2017-11-13 08:28:21 +03:00
shpuld
46f23b7de7
Add an option to automatically show new posts when scrolled to the top, also add fade-in animation for posts.
2017-11-13 01:06:48 +02:00
Henry Jameson
46765d5c1a
some fixes towards how conversations appear
2017-11-13 01:26:43 +03:00
Henry Jameson
ec55d49b88
kiinteät venytetyt tunteet
2017-11-13 00:57:41 +03:00
Shpuld Shpuldson
acde0b316c
Changes inside status html: restrict image/video sizes, make blockquotes waste less space.
2017-11-07 12:22:33 +02: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
ccfc2e57d0
Add follower and following views
2017-08-23 19:14:06 +03: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
Shpuld Shpuldson
dcd7d52eb5
lint fix
2017-06-07 18:13:24 +03:00
Shpuld Shpuldson
f915ae174d
Add floating status-previews on reply-link mouseover in conversations and make them optional in the settings, fix a small visual inconsistency in muted statuses while editing the file already..
2017-06-07 17:58:24 +03:00
Shpuld Shpuldson
64a7db1d8b
Change replies element flex to cover more width if needed.
2017-06-05 12:03:32 +03:00
Shpuld Shpuldson
12000536aa
remove commented lines, make linter happy
2017-06-05 00:02:14 +03:00
Shpuld Shpuldson
4fabeda3ec
Add list of replies under the name/links in conversation statuses, clicking them will highlight the statuses and scroll you to them, expanding a status will scroll you to that status once the conversation has opened.
2017-06-04 23:58:15 +03:00
Shpuld Shpuldson
24b7d7d9d4
Add mouseover tooltips for names in notif headings and timeline repeats, make the timeline repeat name into a link to the repeater profile and use the word 'repeat' instead of 'retweet'.
2017-06-02 13:05:03 +03:00
Shpuld Shpuldson
c149330e50
Fix bugginess with heading links overlapping icons on the right.
2017-06-01 17:50:09 +03:00
Shpuld Shpuldson
52e6b470be
Revert some of those mobile optimizations, breaks mention notifs.
2017-06-01 17:43:37 +03:00
Shpuld Shpuldson
d063607b9d
Mobile optimizations.
2017-06-01 17:35:00 +03:00
Shpuld Shpuldson
807c0d1464
Remove silly opacity from timestamp, make unmute icon line up with the rest better.
2017-06-01 01:11:57 +03:00
Shpuld Shpuldson
ea8a700796
Move a bunch of status-related styles from App to status component, alter status header layout for better user experience hopefully, make status actions placing more consistent, adjust margins.
2017-06-01 01:02:04 +03:00
Shpuld Shpuldson
1b79ae09e0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/notification-improvements
2017-05-31 11:58:32 +03:00
Shpuld Shpuldson
5ad4d043e7
Enable reply/rt/fav for mention notifications by using a barebones status in place of plain notification content.
2017-05-31 11:47:18 +03:00
Roger Braun
d389d3a763
Copy cool retweet look.
2017-05-22 13:50:10 +02:00
Shpuld Shpuldson
d8a01454dc
another lint fix
2017-04-12 19:10:38 +03:00
Shpuld Shpuldson
c989170321
lint fixes
2017-04-12 19:07:55 +03:00
Shpuld Shpuldson
3f477986cf
Removed smooth scrolling, does not work in other browsers than FF
2017-04-12 18:47:47 +03:00
Shpuld Shpuldson
a675cfbb3e
Goto-original-arrow button now sets conversation highlight/focus even when inline, setting focus now scrolls you to the focused post smoothly. Hide the arrow button when not expanded.
2017-04-12 18:25:19 +03:00
Roger Braun
1ea19dcf1d
Take unmuting out of expandable condition.
2017-04-09 16:39:19 +02:00
Roger Braun
a53555254a
Add word-based muting to settings / statuses.
2017-04-09 15:53:23 +02:00
Shpuld Shpuldson
39a6867557
Make muted notifications take much less space (handy for bot spam).
2017-03-30 15:11:32 +03:00
wakarimasen
896de016ad
Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop
2017-03-10 12:38:47 +01:00
shpuld
3bb5f86d0d
Use conditional class for reply icon color.
2017-03-10 00:49:22 +02:00
shpuld
df4dad1804
Separate reply form from inside status to make it resistant to hilighting, make the reply button light up when reply window is open.
2017-03-09 21:32:54 +02:00
shpuld
00531ad9df
lint fix
2017-03-09 12:48:43 +02:00
Roger Braun
2f52669380
Merge branch 'develop' into wakarimasen/pleroma-fe-develop
2017-03-09 09:19:40 +01:00
shpuld
6c8fc99d5a
Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses.
2017-03-09 01:09:23 +02:00
wakarimasen
9d56721533
Highlight original notice when expanding retweets
2017-03-06 16:21:11 +01:00
wakarimasen
42ae57dace
Remove unused import
2017-03-05 16:49:45 +01:00
wakarimasen
289326855c
Add focused prop to status
2017-03-05 16:31:01 +01:00
wakarimasen
c921662036
Add inConversation prop to status
2017-03-05 14:34:14 +01:00
wakarimasen
22e8258a56
Highlight current notice in conversation-page, add backlinks
2017-03-05 11:56:28 +01:00
wakarimasen
6bcbed38d0
Add option to only hide attachments on timeline
2017-03-04 21:25:59 +01:00
shpuld
9dfcf8a301
Align attachments with usercard, make buttons use theme colors, prettify login form, more border radii adjustment for consistency.
2017-02-24 17:32:41 +02:00
Roger Braun
b939f70d17
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
2017-02-23 00:26:52 +01:00
Roger Braun
74931dece7
Revert "Show actual status in notifications when mentioned."
...
This reverts commit 0e1ab69c33
.
2017-02-23 00:26:37 +01:00
lambadalambda
854faf905e
Merge branch 'feature/user-card-improvements' into 'develop'
...
User card visual improvements
See merge request !29
2017-02-22 18:09:54 -05:00
Roger Braun
7c0f3ea666
Add setting to hide all attachments.
2017-02-23 00:04:47 +01:00
Roger Braun
0e1ab69c33
Show actual status in notifications when mentioned.
2017-02-22 23:37:12 +01:00
shpuld
ede4d77cfd
Move profile picture to right side, make the names appear next to it, extend profile background pic further and fade it out with gradients, fix the crappy borders around the inline user card.
2017-02-22 23:08:14 +02:00
shpuld
3d69a91aba
cleanup/better naming
2017-02-21 10:22:04 +02:00
shpuld
c244067787
Use a red border for expanded statuses
2017-02-21 10:19:42 +02:00
Roger Braun
56e036b4de
Add special case for mastodon user links.
...
They have a span embedded in the link, so let's look at the parent, too.
2017-02-19 13:25:30 +01:00
Roger Braun
04c4ad9a65
Open clicked links the statusnet_html in a new window.
2017-02-19 12:58:25 +01:00
Roger Braun
5f74ae8de5
Revert "removed break-line for links because it didn't seem to make sense"
...
This reverts commit 2f4d811079
.
2017-02-19 12:13:56 +01:00
hakui
1ccc9dd629
wrap long urls while not breaking normal words. also practicing the new branch thing
2017-02-18 12:51:47 -06:00
hakui
2f4d811079
removed break-line for links because it didn't seem to make sense
2017-02-18 03:10:02 -06:00
hakui
734597b43f
hello world
2017-02-18 01:48:35 -06:00
Roger Braun
5481cf00a3
Make user profiles visible inline.
2017-02-16 15:58:49 +01:00
Roger Braun
340b21475d
Make temporarily unmuted posts hideable again.
2017-02-14 21:47:37 +01:00
Roger Braun
4c12de262f
Add muting to statuses.
2017-02-14 00:01:50 +01:00
Roger Braun
2269e815e1
Make status expandable into conversation.
2017-02-04 13:53:28 +01:00