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
scarlett
d6ad08050a
Fall back to instance settings consistently
2018-10-21 18:04:23 +01: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
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
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
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
eal
876f7633fe
Use serverside html rendering in usernames and bios if available.
2018-08-09 12:52:34 +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
0554cac113
Add click-to-show content warnings on posts
2018-06-28 23:39:01 -07: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
shpuld
8835c98529
Merge hj's css overhaul and fix conflicts
2018-04-10 00:28:24 +03:00
shpuld
f4f9b3fa26
small fixes
2018-04-09 19:43:31 +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
3257991f41
unfinished fetch() version that doesn't work
2018-03-12 01:30:27 +03:00
shpuld
dc4755f2ff
Make goto-check use the correct property to make it work again
2017-11-14 08:55:21 +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
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
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
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
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
a53555254a
Add word-based muting to settings / statuses.
2017-04-09 15:53:23 +02: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
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
