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
Hakaba Hitoyo
e2dae87772
update
2018-08-11 14:50:40 +09:00
Toromino
895ef525d2
Update status.vue
2018-08-09 16:47:08 +00:00
Toromino
01652fc252
Update retweet_button.js
2018-08-09 16:46:18 +00:00
Toromino
316692ee85
Update retweet_button.vue
2018-08-09 16:45:52 +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
d5efa10946
hopefully, fix linter
2018-08-06 09:52:07 +03:00
Henry Jameson
976444064f
Fixes broken custom emoji in autocomplete when proxying to remote BE
2018-08-06 09:45:22 +03:00
Henry Jameson
d3d5a84868
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
2018-08-06 07:58:34 +03:00
Toromino
88a81406e3
Remove trailing whitespace
2018-08-05 19:41:34 +00:00
Toromino
fd484a1a62
Textarea is now focused when replying
2018-08-05 19:17:11 +00:00
Henry Jameson
9cebb00faa
the missing piece for invites system
2018-08-05 10:01:38 +03:00
Henry Jameson
3373d28701
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
2018-08-05 09:18:04 +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
hakabahitoyo
5e47c59615
debug
2018-08-02 19:16:48 +09:00
Hakaba Hitoyo
19e310fc67
lint
2018-08-02 18:38:43 +09:00
Hakaba Hitoyo
5900bccff3
debug
2018-08-02 18:34:12 +09:00
Hakaba Hitoyo
bcd499c372
who to follow panel uses /api/v1/suggestions
2018-08-02 17:57:00 +09: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
d886ab752c
post-rebase fix, backported d7d787b84c
2018-07-06 20:19:02 +03:00
Henry Jameson
38d5226ad1
notifs fix
2018-07-06 20:14:39 +03:00
Henry Jameson
0714391aba
UI update
2018-07-06 20:14:36 +03:00
Henry Jameson
398eaaf79b
fixed the UI
2018-07-06 20:12:09 +03: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
Ole Bertram
2a87e29180
Add validation of the imported theme and the corresponding warning message
2018-07-04 14:25:40 +02:00
Ole Bertram
8f79193883
Unify button styles and use min-width
...
This seemed to be the same across multiple components anyway.
Switched to min-width to allow for buttons with longer text, e.g.
from other languages.
2018-07-04 13:49:31 +02: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
Ole Bertram
d2b79856c6
Add theme import feature
2018-06-28 03:28:23 +02:00
Ole Bertram
f36984c4a4
Refactor theme settings state initialization
2018-06-28 02:07:50 +02:00
Ole Bertram
29f69de240
Add theme export feature
2018-06-28 01:23:19 +02:00
Ole Bertram
44428e8b09
Add warning/info text on appriopriate status scopes
2018-06-23 22:10:15 +02:00
Ole Bertram
05bc6fa8e8
Add title text with description to scope icons
2018-06-23 22:09:13 +02:00
Francis Dinh
556eb4b8a3
add unretweet action to statuses.js
2018-06-14 17:17:36 -04:00
Francis Dinh
d05fcfa1a8
Add unretweet support
2018-06-14 05:00:11 -04:00
Roger Braun
d4f5b3feec
Use parents scope if available.
2018-06-12 19:28:48 +02:00
lambda
97ae186aaa
Merge branch 'improve-settings-ui' into 'develop'
...
Improve user settings ui
See merge request pleroma/pleroma-fe!273
2018-06-12 17:01:35 +00:00
lambda
6ea5cfe71e
Merge branch 'feature/locked-accounts' into 'develop'
...
Feature/locked accounts
See merge request pleroma/pleroma-fe!274
2018-06-12 16:57:18 +00:00
lambda
71dcf120ed
Merge branch 'tr-fix' into 'develop'
...
Translate username input placeholder
See merge request pleroma/pleroma-fe!275
2018-06-08 13:34:07 +00:00
Roger Braun
d64293506c
Make scope options optional, refactoring.
2018-06-08 15:25:48 +02:00
Astra
d62e702994
should resolve a 3/4 things
2018-06-07 17:31:43 -04:00
Astra
a759378b4d
more lint fixes
2018-06-07 05:18:54 -04:00
Astra
f49229974a
correct linter problems
2018-06-07 05:08:39 -04:00
Astra
92a8ca0011
crt's compose box changes
2018-06-07 05:03:50 -04:00
riking
da1112297a
fix: enable translating login form placeholder
2018-06-06 23:44:11 -07:00
William Pitcock
d7d787b84c
user card: show that the account is locked if it is
2018-06-07 02:16:30 +00:00
William Pitcock
7389f07115
follow requests: refactor to properly leverage vuex
2018-06-07 01:24:31 +00:00
William Pitcock
f3a27764aa
add follow requests UI
2018-06-07 00:58:44 +00:00
User
32d7646db1
Fix the height of file inputs
2018-05-29 21:44:45 +02:00
User
890312a0dc
Visually separate the settings items
2018-05-29 21:34:19 +02:00
William Pitcock
7a08ba43e2
user settings: enable locking/unlocking an account
2018-05-29 14:19:28 +00:00
Syldexia
5ae7fb871e
Fix formatting
2018-05-21 23:01:33 +01:00
Syldexia
e0ba6a5876
Added change password to user settings
2018-05-21 23:01:09 +01:00
Roger Braun
f06fef26b1
Display visibility if available.
2018-05-20 18:28:01 +02:00
Roger Braun
959b2d9d66
Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion
2018-05-20 13:16:49 +02:00
chip
fcc1ab1d85
Pass the "Collapse" label throught the translation function
2018-05-19 20:35:14 +02:00
lambda
5da881e98d
Merge branch 'develop' into 'develop'
...
use es6 notation for exportFollows
See merge request pleroma/pleroma-fe!263
2018-05-18 10:45:08 +00:00
aka
3c525d6a3b
use es6 notation for exportFollows
2018-05-18 07:34:36 -03:00
lambda
166d9294c4
Merge branch 'feature/follows-export' into 'develop'
...
Adds an option to export follows (fixed)
See merge request pleroma/pleroma-fe!261
2018-05-18 07:51:00 +00:00
aka
fed8781583
fix linting
2018-05-16 19:51:52 -03:00
aka
fae7a40aeb
Adds an option to export follows
2018-05-13 20:47:08 -03:00
Syldexia
327b6fb5dc
Added delete account section to user settings
2018-05-13 15:24:42 +01:00
Henry Jameson
dc33c0aaac
alternate usercard
2018-05-12 16:17:04 +03:00
Henry Jameson
4c3d62da04
fixed autocomplete lacking highlight
2018-05-12 15:19:53 +03:00
Henry Jameson
55aeb5b4b2
fix
2018-05-12 15:19:53 +03:00
Henry Jameson
e93ce99198
small fix + white color for user-card + opaque outline for text
2018-05-12 15:19:53 +03:00
Henry Jameson
fc1283da83
fixed nsfw hider having very small height, some border-radii for consistency
2018-05-12 15:19:53 +03:00
Henry Jameson
57e91bc783
fix jumping inputbox's height
2018-05-12 15:19:53 +03:00
Henry Jameson
15a7151ade
Entire area around user counters are clickable now, not just the header-link
2018-05-12 15:19:53 +03: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
bc85e5f0c1
Further usercard readibility. Made it visible which "tab" is actiavated - should
...
be enough to hint user that you can click "following" / "followers". Fixes #77
2018-05-12 15:19:53 +03:00
Henry Jameson
a6fa913f45
Input fields separate radii
2018-05-12 15:19:53 +03:00
Henry Jameson
008b36dc24
gave text some shadow-outline to make it more readable on white backgrounds +
...
fixed weird layout (WHY)
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
Henry Jameson
c46795c692
use semi-transparent faint color + fix
2018-05-12 15:19:53 +03:00
hakabahitoyo
36b1c09831
add space
2018-05-06 11:33:53 +09:00
Hakaba Hitoyo
d9d6a497d9
debug
2018-05-05 01:02:39 +09:00
Hakaba Hitoyo
2471b71aab
osa-compatible who to follow provider
2018-05-05 00:53:40 +09:00
hakabahitoyo
0691af1367
debug
2018-05-05 00:43:18 +09:00
Hakaba Hitoyo
2ade177d5a
configurable who to follow panel
2018-05-05 00:20:19 +09:00
Hakaba Hitoyo
77ffa89464
Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable
2018-05-04 23:50:14 +09:00
Roger Braun
462eeb90b9
Add message preset functionality.
2018-04-29 16:44:08 +02:00
Roger Braun
3ffb17c0ae
Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading
2018-04-27 09:59:31 +02:00
Hakaba Hitoyo
bb92798b74
Collapse chat by default
2018-04-24 07:48:30 +00:00
lambda
9557ec59a8
Update timeline.js
2018-04-22 20:16:28 +00:00
csaurus
59f98aecd9
Stop blink from loading more statuses with every scroll.
2018-04-22 16:12:34 -04:00
Hakaba Hitoyo
033170212f
merge
2018-04-22 00:48:06 +09:00
shpuld
ce0b551c59
some ugly hack to prevent the jump in form height when you input first character
2018-04-16 17:52:43 +03:00
Henry Jameson
e9e37a034c
fml
2018-04-15 20:30:06 +03:00
Henry Jameson
e1dce2c5af
better approach
2018-04-15 19:05:16 +03:00
Henry Jameson
600b2d5bbd
Added resizing inputbox on focus so that replying to The Discourse™ is less painful
2018-04-15 18:38:10 +03:00
shpuld
fa8fa2d330
Force oembeds to use 100% width
2018-04-14 15:45:38 +03:00
shpuld
c3bea8dfd1
Fix rt heading alignment again
2018-04-14 14:28:20 +03:00
shpuld
1a2bd28f53
Merge branch 'develop' into fix/status-heading-alignment-issues
2018-04-14 14:26:07 +03:00
shpuld
424e9166d9
Fix alignment issues in status heading and repeat info
2018-04-14 14:24:05 +03:00
Shpuld Shpludson
9587c6dac1
Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'
...
Fix/better timeline min max id behavior
See merge request pleroma/pleroma-fe!233
2018-04-14 09:52:54 +00:00
shpuld
3153bb5b05
Also fix wrong color in user card
2018-04-14 10:24:39 +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
1db9b1e1ad
Fix long names in notifications too
2018-04-14 08:59:55 +03:00
shpuld
121f7424dc
Fix overflowing long maes in statuses and repeats.
2018-04-14 07:44:59 +03:00
shpuld
ab2546ab38
Fix timeline error not using correct styling while at it
2018-04-13 23:04:31 +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
8db70ffa85
Fix missing border radii and read button text color
2018-04-12 19:51:33 +03:00
shpuld
974702efc6
aha, found another bug in oembed text
2018-04-11 19:47: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
Francis Dinh
52d72599ee
Forgot to fix other tabs
2018-04-11 04:29:46 -04:00
Francis Dinh
11a89ee06d
Replace tab indentation with spaces
2018-04-11 04:28:27 -04:00
Francis Dinh
3d8d941d89
Make autocomplete case insensitive
2018-04-11 04:23:13 -04:00
Shpuld Shpludson
748e01d3e9
Merge branch 'feature/chat-styling-and-hiding' into 'develop'
...
Feature/chat styling and hiding
See merge request pleroma/pleroma-fe!224
2018-04-11 03:37:42 +00:00
Shpuld Shpludson
020d2f83f9
Merge branch 'feature/rewrite-status-and-notifications-and-preview' into 'develop'
...
Rewrite status and notifications and preview, graceful handling of linkless attachments
See merge request pleroma/pleroma-fe!223
2018-04-11 03:37:25 +00:00
Shpuld Shpludson
daa018aecf
Merge branch 'feature/link-to-remote-user-profile-page' into 'develop'
...
Add link to original (remote) user profile page
See merge request pleroma/pleroma-fe!219
2018-04-11 03:35:13 +00:00
shpuld
2258c9c1e7
Make collapsed-state hide chat and not the wrong way around
2018-04-11 00:20:42 +03:00
shpuld
49aa2d5fb7
cleanup
2018-04-11 00:19:28 +03:00