Henry Jameson
b948234aec
whoops
2018-11-26 04:44:54 +03:00
Henry Jameson
e06717fd0d
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
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
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
2018-11-26 04:38:44 +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
572c874f5c
theme separation
2018-11-26 02:29:08 +03:00
Henry Jameson
d7eec4c30d
more styles
2018-11-26 00:23:07 +03:00
Henry Jameson
94b481fa9c
cosmetic fixes
2018-11-26 00:19:28 +03:00
Henry Jameson
1087741b0d
font control args to allow passing an option list of fonts, for future use
2018-11-25 22:39:06 +03:00
Henry Jameson
707441ffe6
more fonts
2018-11-25 22:06:49 +03:00
Henry Jameson
1a65895bfd
initial font support
2018-11-25 21:48:16 +03:00
eal
668087a29e
Switch to timeline on nav panel actions
2018-11-25 19:00:24 +02:00
Henry Jameson
e8536f3d95
clean up
2018-11-25 19:15:54 +03:00
Henry Jameson
883a76147a
validity checks, no longer exploding when something is invalid
2018-11-25 19:12:38 +03:00
Henry Jameson
2f1070deb6
collateral fixes
2018-11-25 17:42:41 +03:00
Henry Jameson
698ebf7003
fixed indentation
2018-11-25 17:24:58 +03:00
Henry Jameson
1a8d24d649
some help strings
2018-11-25 17:21:53 +03:00
Henry Jameson
b07d7d7229
reset buttons, better disabled for shadows
2018-11-23 11:36:36 +03:00
Henry Jameson
26b9f787bb
added "keep opacity" option, fixed opacity loading, fixed missing shadows not
...
affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
2018-11-23 10:17:01 +03:00
Henry Jameson
1059d9b602
radii v1 fixes
2018-11-23 09:02:10 +03:00
Henry Jameson
754d71ec19
added checkboxes to keep current roundness and shadows, also cleaned up how
...
shadows/roundness are reset when switching themes
2018-11-23 08:24:55 +03:00
Henry Jameson
91ea9b7b0e
checkbox radius
2018-11-23 07:28:53 +03:00
Henry Jameson
d2f3b6d244
more styles, temporarily in one file, fix for panel header box-shadow affecting
...
the user-card one
2018-11-23 01:45:08 +03:00
Henry Jameson
29082e9aee
fixed checkbox styles, optimized default shadows
2018-11-23 00:24:16 +03:00
Henry Jameson
d6f7cb469c
small tab-switcher tweak
2018-11-22 05:13:09 +03:00
Henry Jameson
631b8433c0
bundling v2 themes works
2018-11-22 04:37:49 +03:00
Henry Jameson
324aadb7c1
fix
2018-11-22 04:25:15 +03:00
Henry Jameson
379144f4ab
fix for zero-state for shadow-control
2018-11-22 03:55:45 +03:00
Henry Jameson
cd6c5b3e33
fix for tab-switcher
2018-11-21 23:30:47 +03:00
Henry Jameson
b8b5dbf63e
fix
2018-11-21 22:08:27 +03:00
Henry Jameson
92afd6af12
layout fixes
2018-11-21 22:01:34 +03:00
Henry Jameson
18e0828ee7
last shadow override i wanted to make for now. also small tweak
2018-11-21 21:40:45 +03:00
Henry Jameson
de88cfb94d
compensate tab-switcher for fake borders
2018-11-21 21:28:22 +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
Henry Jameson
3bdcdefc9b
better tooltips, localized, too
2018-11-21 20:18:49 +03:00
Henry Jameson
dc3df7bc4e
fixes
2018-11-21 18:22:05 +03:00
Henry Jameson
acf414e451
changed the way tab-switcher works to avoid removing/adding nodes since that
...
seems to cause issues, instead hiding nodes with css.
2018-11-21 07:38:00 +03:00
Henry Jameson
50562eb6b7
fix lint, for shadows, it's now possible to refer css variables as colors
2018-11-21 04:26:45 +03:00
Henry Jameson
a79d9d9774
attempted fix^W workaround for tab-switcher bug
2018-11-21 04:14:10 +03:00
Henry Jameson
c3d8ff65bd
fix notification unseen display rendering underneath the highlight
2018-11-21 03:52:12 +03:00
Henry Jameson
aa93664fd6
fix coldboot
2018-11-21 03:51:57 +03:00
Henry Jameson
73a9370710
fixed and updated roundness tab
2018-11-21 03:14:59 +03:00
Henry Jameson
0184d5fff0
whoops
2018-11-20 23:34:04 +03:00
Henry Jameson
d7af2c8419
mentioned bug in tab-switcher, made shadow-control work in zero-state
2018-11-20 23:25:38 +03:00
Henry Jameson
2609c0d0d2
unification of stylings
2018-11-20 22:14:49 +03:00
Henry Jameson
32132e225c
localization and small fixes
2018-11-20 20:58:20 +03:00
Henry Jameson
56fec664a9
cleanup and optimization
2018-11-19 20:22:46 +03:00
Henry Jameson
a8180d03be
it works, now to clean it up
2018-11-19 18:15:27 +03:00
Henry Jameson
a5b4f31c12
shadow control initial stuff. not done yet tho
2018-11-19 04:40:25 +03:00
Henry Jameson
edb429e307
cleanup and fixes
2018-11-15 17:17:20 +03:00
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01:00
Henry Jameson
2369f2e4cb
fixed webkit appearance of the UI
2018-11-14 22:20:42 +03:00
Henry Jameson
75f0c191dd
some initial work for user highlight v2
2018-11-14 21:53:51 +03:00
Henry Jameson
e7fe2dc9f9
collateral fixes, removed alpha control for alerts, added contrast text
...
generation for alerts, updated getTextColor to also have fallback to black/white
if resulting contrast isn't passable (only when inverting lightness!), updated
UI to use tabs.
2018-11-14 19:39:17 +03:00
Roger Braun
c7d469249e
Always show dm panel.
2018-11-13 22:30:00 +01:00
Roger Braun
b37a0f4f23
Add direct message tab.
2018-11-13 20:34:56 +01:00
Henry Jameson
1723f427f5
updates
2018-11-13 16:30:01 +03:00
Roger Braun
9f64c96721
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauth
2018-11-10 11:00:09 +01:00
Roger Braun
2c2c4452b9
Fix posting.
2018-11-08 19:34:59 +01:00
Roger Braun
1de382f026
Put oauth text into description.
2018-11-08 19:27:19 +01:00
Roger Braun
a04795d723
Display OAuth login on login form button.
2018-11-08 16:12:05 +01:00
Roger Braun
6f668df697
Count spoiler text in the character count. Fixes #135 .
2018-11-07 17:20:33 +01:00
Roger Braun
50264410f5
Add login form back in.
2018-11-07 16:56:12 +01:00
Roger Braun
bcbaf5d7ee
Linting.
2018-11-06 21:51:22 +01:00
Roger Braun
4d9680e797
Re-activate registration, use oauth password flow to fetch token.
2018-11-06 21:48:05 +01:00
Roger Braun
60b3e4f40f
Fix linting.
2018-10-26 15:20:39 +02:00
Roger Braun
9af204b293
Move login to oauth.
2018-10-26 15:16:23 +02:00
scarlett
d6ad08050a
Fall back to instance settings consistently
2018-10-21 18:04:23 +01:00
Henry Jameson
7b657fcccd
added contrasts for rgbo
2018-10-21 15:25:21 +03:00
scarlett
2bb663f0f6
satisfy lint
2018-10-16 14:15:04 +01:00
scarlett
4cc1ed6171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics
2018-10-16 14:09:29 +01:00
Henry Jameson
4b7b7d9905
cleanup, documentation, contrast taking alpha into account.
2018-10-10 05:39:02 +03:00
Henry Jameson
87e98772b0
initial contrast display support
2018-10-10 00:07:28 +03:00
Henry Jameson
4d77b0c86b
Transparency works without exploding now. All nice.
2018-10-07 22:03:34 +03:00
Henry Jameson
96804d42f0
Some themeing is working!!
2018-10-07 19:59:22 +03:00
Henry Jameson
5441766c3c
fix
2018-10-04 18:27:27 +03:00
Henry Jameson
0a4b07652a
trying to fix transition
2018-10-04 18:16:14 +03:00
Henry Jameson
fb29e7c73d
more workings and even less explosions.
2018-10-03 21:21:48 +03:00
Henry Jameson
f78a5158e1
something works without exploding and i'm tired already
2018-10-02 21:43:58 +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
Henry Jameson
455cd0d028
settings for scope/subject
2018-09-25 14:47:02 +03:00
William Pitcock
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00:00
Henry Jameson
a61ad0544a
small thing to display instance-provided default
2018-09-20 17:21:11 +03:00
Henry Jameson
394153380d
more missing stuff
2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f
translations
2018-09-17 17:51:39 +03:00
Henry Jameson
82fa5d08c4
more refactoring
2018-09-17 17:51:39 +03:00
Henry Jameson
2db991fc7f
some recategorization of options...
2018-09-17 17:51:39 +03:00
Henry Jameson
f1c16327b6
Initial version
2018-09-17 17:51:39 +03:00
kaniini
7887e42fca
Merge branch 'fixAutocomplete' into 'develop'
...
Fixes broken autocomplete for users
See merge request pleroma/pleroma-fe!344
2018-09-13 19:30:28 +00:00
Henry Jameson
89f9b3a468
fixed autocomplete
2018-09-12 11:46:02 +03:00
Hakaba Hitoyo
207c188c16
Debug
2018-09-09 15:22:55 +00:00
kaniini
ed6abeacad
Merge branch 'post-polish-fixes' into 'develop'
...
Post polish fixes
See merge request pleroma/pleroma-fe!333
2018-09-09 11:59:49 +00:00
kaniini
eb93034a40
Merge branch 'simplify-sensitivity-label' into 'develop'
...
Simplified image sensitivity label
See merge request pleroma/pleroma-fe!334
2018-09-09 11:55:49 +00:00
Hakaba Hitoyo
3a17252929
use prime number step for Who to follow panel
2018-09-09 14:34:51 +09:00
hakabahitoyo
8b94ea28ec
remove formatting options
2018-09-04 14:50:02 +09:00
Hakaba Hitoyo
49ab19c342
features panel i18n
2018-09-04 10:59:02 +09:00
Hakaba Hitoyo
65115bfc7f
features panes supports chat & gopher
2018-09-04 10:44:25 +09:00
scarlett
145929207e
Revert "Don't only include whitespace conditionally, to fix the fade."
...
This reverts commit 8dc85b057e
.
2018-09-04 02:00:12 +01:00
scarlett
8dc85b057e
Don't only include whitespace conditionally, to fix the fade.
2018-09-04 01:19:59 +01:00
scarlett
5a59eb4efa
Don't hide the bio.
2018-09-04 01:10:22 +01:00
scarlett
bdcbd110e4
Add option for hiding post statistics (e.g. repeats, favs)
2018-09-04 00:41:52 +01:00
scarlett
dcb7e1ecf4
Add option for disabling counts (followers, statuses) in user profiles.
2018-09-04 00:32:25 +01:00
Henry Jameson
dc0b47e8bd
fix collapse link being too small
2018-09-03 23:30:07 +03:00
Henry Jameson
f9eb9e0b70
small fix for non-square gif avatars
2018-09-03 22:49:46 +03:00
Henry Jameson
6e64324d37
Fixed collapseMessageWithSubjectLocal always using instance-provided config.
2018-09-03 22:40:45 +03:00
Henry Jameson
d4f9d21857
Fix last place with usercard having wrong width
2018-09-03 22:23:53 +03:00
Henry Jameson
a6047e0ad5
Kinda went back to using align-items: stretch. Fixed error message floating.
2018-09-03 22:12:18 +03:00
Henry Jameson
36101abc22
Simplified image sensitivity label
2018-09-03 18:52:07 +03:00
hakabahitoyo
38b683b30c
update
2018-09-03 15:57:22 +09:00
Hakaba Hitoyo
049e2397b1
update
2018-09-03 15:23:09 +09:00
Hakaba Hitoyo
52fe01e4d8
mock features panel
2018-09-03 14:43:10 +09:00
Shpuld Shpludson
20b0ffc0b9
Merge branch 'imvomitingasicodethisshit' into 'develop'
...
Made showing format selection optional and default to false
See merge request pleroma/pleroma-fe!329
2018-09-01 05:57:58 +00:00
Henry Jameson
d6240c25cf
small fix
2018-08-31 17:24:46 +03:00
Henry Jameson
17f30190e0
Made showing format selection optional and default to false
2018-08-31 17:00:41 +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
William Pitcock
f9bfe2ea37
post status form: styling fixes for content-type selector, align icons with selector
2018-08-31 04:23:06 +00:00
kaniini
958acbab8d
Merge branch 'polish' into 'develop'
...
Another one of those MR that fixes many many small-to-medium things
Closes #92 , #75 , #122 , #52 , #72 , and #87
See merge request pleroma/pleroma-fe!324
2018-08-31 04:10:17 +00:00
kaniini
e71b0411aa
Merge branch 'post-button-labels' into 'develop'
...
Add labels to post buttons
See merge request pleroma/pleroma-fe!323
2018-08-31 04:04:44 +00:00
William Pitcock
cabcb5c81b
i18n: make "plain text" translatable
2018-08-31 03:42:12 +00:00
William Pitcock
9a43ba73e6
add the ability to select a post's content type
2018-08-31 03:42:11 +00:00
Henry Jameson
8c07e63f77
fix
2018-08-31 04:39:07 +03:00
Henry Jameson
46d8b55d44
Merge remote-tracking branch 'upstream/develop' into polish
...
* upstream/develop:
i18n: make "plain text" translatable
add the ability to select a post's content type
2018-08-31 04:20:40 +03:00
William Pitcock
20a67e6809
i18n: make "plain text" translatable
2018-08-31 00:44:25 +00:00
William Pitcock
38e3c2493d
add the ability to select a post's content type
2018-08-31 00:42:42 +00:00
Henry Jameson
63fdad8703
fix
2018-08-30 22:59:52 +03:00
Henry Jameson
065d1c7f49
fix
2018-08-30 20:16:36 +03:00
Henry Jameson
3b9cb1384a
fix
2018-08-30 19:53:13 +03:00
Henry Jameson
fa1116249d
fixup! panel styling cleanup
2018-08-30 17:13:54 +03:00
Henry Jameson
1246463f96
fixes broken nsfw hider in notifications
2018-08-30 16:21:10 +03:00
Henry Jameson
fb7f65481e
restored "progress" cursor indicator for loading nsfw images
2018-08-30 16:11:31 +03:00
Henry Jameson
e58221fb87
fixed #72
2018-08-30 16:02:53 +03:00
Henry Jameson
b0e0686c7f
Added ability to hide certain types of notifications
2018-08-28 21:21:29 +03:00
Henry Jameson
66a22762c2
fixup! Separated tab-switcher into a reusable component. This depends on JSX addition
2018-08-28 16:22:49 +03:00
Henry Jameson
da362b2b88
minor style tweaks
2018-08-28 16:20:04 +03:00
Henry Jameson
330288b4cd
panel styling cleanup
2018-08-28 16:14:32 +03:00
Henry Jameson
c3b27ab4c2
moved replies filtering to "filter" category in settings, made it more consistent
2018-08-28 15:47:42 +03:00
Henry Jameson
cff4177bf3
settings page update
2018-08-28 15:38:07 +03:00
Henry Jameson
b48a3210a3
tabs for settings
2018-08-28 14:28:05 +03:00
Henry Jameson
8e560676f1
allow multiple file upload
2018-08-28 14:05:03 +03:00
Henry Jameson
68d15f665e
Show lock icon instead of hiding repeat button, tusky-style. Added hint
...
explaining what's going on. Fixes favorite button jumping left and right
depending on post visibility
2018-08-28 13:42:44 +03:00
Henry Jameson
fd604dfd2a
fixed still-image not preserving original aspect ratio and resolution.
2018-08-27 22:40:30 +03:00
Henry Jameson
eacbd9b500
Separated tab-switcher into a reusable component. This depends on JSX addition
2018-08-27 22:22:25 +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
74a6df8a55
Match users using startsWith instead of match.
2018-08-26 13:51:21 +01:00
scarlett
b68ebf3056
Match emoji using startsWith instead of match.
2018-08-26 13:50:36 +01:00
scarlett
54ac0dfefd
Preserve subject in replies.
2018-08-26 01:50:11 +01:00
kaniini
a7c6007d54
Merge branch 'attachment-collapse' into 'develop'
...
When a post with a subject is collapsed, hide its attachments.
See merge request pleroma/pleroma-fe!316
2018-08-26 00:02:32 +00:00
kaniini
5bb5ef43ef
Merge branch 'language-override' into 'develop'
...
Make interface language configurable from settings
Closes #36
See merge request pleroma/pleroma-fe!315
2018-08-26 00:01:33 +00:00
scarlett
52ce86ed57
Don't use nsfw clickthrough if the post is collapsed by default.
2018-08-26 00:21:54 +01:00
scarlett
a7811e7bd9
Add a checkbox for marking a post's attachments as NSFW
2018-08-25 22:18:43 +01:00
scarlett
d50440d802
When a post with a subject is collapsed, hide its attachments.
2018-08-25 20:33:44 +01:00
Ekaterina Vaartis
c1e4bfa90f
Make interface language configurable from settings
...
The locale can now be configured in settings and is stored in
Vuex. The changes are applied immidiately after selection. The list of
languages is taken from the messages file, which contains all the
available locales (and a new value, `interfaceLanguage`, to control
the translation of this option in the options menu)
Closes #36
2018-08-25 13:29:49 +03:00
William Pitcock
30a6b7be5b
attachment: add support for rendering alt text on images
2018-08-25 00:32:10 +00:00
kaniini
fe906cc3f0
Merge branch 'develop' into 'notifications'
...
# Conflicts:
# src/main.js
2018-08-24 23:00:56 +00: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
kaniini
14db3f279d
Merge branch 'feature/who-to-follow-panel-uses-suggestions-api' into 'develop'
...
Who to follow panel uses suggestions api
See merge request pleroma/pleroma-fe!294
2018-08-24 18:46:23 +00:00
kaniini
0429963e63
Merge branch 'easy-japanese' into 'develop'
...
Easy Japanese translation
See merge request pleroma/pleroma-fe!305
2018-08-24 18:45:22 +00:00
kaniini
b0568ca5c3
Merge branch 'center-bios' into 'develop'
...
Centre-align profile bios.
See merge request pleroma/pleroma-fe!311
2018-08-24 18:42:09 +00:00
tsukada-ecsec
0647c1bb72
debug
2018-08-22 15:15:15 +09:00
tsukada-ecsec
54166c3ad3
update settings
2018-08-22 11:47:36 +09:00
scarlett
2596f22814
Centre-align profile bios.
2018-08-21 19:16:03 +01:00
William Pitcock
95e6bccec5
Revert "Unify button styles and use min-width"
...
This reverts commit 8f79193883
.
2018-08-20 18:06:29 +00:00
Henry Jameson
b97db4912d
error display
2018-08-20 20:45:54 +03:00
Henry Jameson
f9b0a95969
removed style for rounding bottom part of notifications because there's now
...
always "load more" footer
2018-08-20 20:08:21 +03:00
Henry Jameson
3ccea3442e
fix custom emoji in username, fix gif avatar not being animated when hovering on
...
the notification
2018-08-20 20:05:12 +03:00
Henry Jameson
35b912bce4
Merge remote-tracking branch 'upstream/develop' into notifications
...
* upstream/develop: (23 commits)
Rename expandCW to collapseMessageWithSubject.
fix indent
Add support for configurable CW clickthrough.
Merge upstream
fix lint issues
allow default visibility scope to be configured
Revert "storing entire config instead of each separate thing of it, so that future"
fixes hella ton of annoyances with file upload display
using custom ascend value as suggested here: https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
disable hinting because it breaks alignment on some icons (namely - locks)
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
Configurable video looping, option to not to loop silent videos. Updated localization strings.
added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
Made pausing TL updating configurable. Added styles for disabled checkboxes. Shuffled settings a bit b/c all the settings are in "Attachments" section depsite the fact not all of them are attachments-related.
storing entire config instead of each separate thing of it, so that future options won't be lost during reloads because developer forgot to update that list of settings to be persisted
fix potential stretched spurdo
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.
Add validation of the imported theme and the corresponding warning message
Unify button styles and use min-width
Add German localization for theme import/export
...
2018-08-20 20:04:54 +03: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
kaniini
9982376f9a
Merge branch 'feature/theme-export-import' into 'develop'
...
Theme import & export
Closes #119
See merge request pleroma/pleroma-fe!290
2018-08-20 00:03:35 +00:00
kaniini
702dfcec10
Merge branch 'develop' into 'fixes-and-tweaks'
...
# Conflicts:
# src/i18n/messages.js
2018-08-19 23:59:15 +00:00
Foxhkron
56ddeec8f3
Merge upstream
2018-08-19 01:23:03 +02:00
William Pitcock
fe06beae18
fix lint issues
2018-08-18 17:06:07 +00:00
William Pitcock
61d40f40ae
allow default visibility scope to be configured
2018-08-18 17:06:06 +00:00
Henry Jameson
6454837ea4
Merge remote-tracking branch 'upstream/develop' into notifications
...
* upstream/develop: (26 commits)
Update status.vue
Update retweet_button.js
Update retweet_button.vue
Use serverside html rendering in usernames and bios if available.
Update status.vue
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
Hide all status actions if not logged in
hopefully, fix linter
Fixes broken custom emoji in autocomplete when proxying to remote BE
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
Remove trailing whitespace
Textarea is now focused when replying
the missing piece for invites system
Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are
fixed lint
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
added ability to pick the style of highlighting
post-rebase fix, backported d7d787b84c
notifs fix
maybe i should actually add myself to contributors list?
...
2018-08-16 13:59:01 +03:00
Henry Jameson
decc209fdc
fix lint
2018-08-16 13:57:16 +03:00
Henry Jameson
693eb4b717
cleanup, updated broken favorites look + localization strings
2018-08-16 13:41:45 +03:00
Henry Jameson
627e227076
fixes hella ton of annoyances with file upload display
2018-08-15 14:53:40 +03: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
0e5b74e3dd
Configurable video looping, option to not to loop silent videos. Updated
...
localization strings.
2018-08-15 12:51:21 +03:00
Henry Jameson
d2ec70c323
added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
2018-08-15 11:20:40 +03:00
Henry Jameson
87eee191b8
Made pausing TL updating configurable. Added styles for disabled checkboxes.
...
Shuffled settings a bit b/c all the settings are in "Attachments" section
depsite the fact not all of them are attachments-related.
2018-08-13 17:07:45 +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 Jameson
ef515056b5
missing files and a plug for bad favs
2018-08-13 13:17:10 +03:00
lambda
ce88f351f7
Merge branch 'invites' into 'develop'
...
FE part of invites system
See merge request pleroma/pleroma-fe!297
2018-08-12 16:15:27 +00: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
Henry Jameson
63650aec29
Added support for qvitter api fetching of notifications
2018-08-12 14:14:34 +03:00
lambda
db6ff4824a
Merge branch 'feature/focus_reply_form' into 'develop'
...
Focus textarea when clicking "reply"
See merge request pleroma/pleroma-fe!298
2018-08-12 10:48:08 +00:00
lambda
a64fbe661f
Merge branch 'fixSelectOptionStyling' into 'develop'
...
Fixes selects having unreadable text on some browsers/OSes.
Closes #123
See merge request pleroma/pleroma-fe!296
2018-08-12 10:47:19 +00:00
lambda
e21f78e519
Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop'
...
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
See merge request pleroma/pleroma-fe!299
2018-08-12 10:45:36 +00:00
lambda
eeddceee6b
Merge branch 'fixRelativeEmojis' into 'develop'
...
Fixes broken custom emoji in autocomplete when proxying to remote BE
See merge request pleroma/pleroma-fe!300
2018-08-12 10:44:39 +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
Hakaba Hitoyo
d1b3d7e90f
debug
2018-08-11 14:54:30 +09:00