Henry Jameson
06c84a9cf3
fix MFA crashing on user-settings page
2019-06-16 20:36:21 +03:00
Henry Jameson
6744396f82
getting and setting user background via MastoAPI
2019-06-16 20:17:59 +03:00
Henry Jameson
e3638af031
Removed formattingOptionsEnabled in favor of relying on BE-provided list of
...
accepted formatting options
2019-06-16 20:16:52 +03:00
HJ
1db3c785d8
Merge branch 'masto-register-app-secret' into 'develop'
...
Proper clientId/secret/token caching, MastoAPI registration
Closes #554
See merge request pleroma/pleroma-fe!806
2019-06-16 11:18:21 +00:00
taehoon
de2504ad6c
fix typo
2019-06-13 15:00:13 -04:00
Henry Jameson
acbeea59ff
rename mutations according to actual property names
2019-06-13 10:11:17 +03:00
Henry Jameson
f9c3aabea4
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
fix user banner
2019-06-13 10:05:53 +03:00
Henry Jameson
0988065f50
fix
2019-06-13 10:05:22 +03:00
Henry Jameson
dba8d8910c
fix
2019-06-13 10:00:06 +03:00
Henry Jameson
d551b39859
fix logged out post-update
2019-06-13 09:48:43 +03:00
Henry Jameson
d1fd3e3a1c
fix user banner
2019-06-13 01:48:41 +03:00
Henry Jameson
edb24da016
fix
2019-06-13 01:02:08 +03:00
Henry Jameson
c8a57ad32e
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
Revert "add TOTP/Recovery Form for mobile version"
2019-06-13 00:51:14 +03:00
Henry Jameson
1e94aecbc9
AMERICA
2019-06-13 00:47:06 +03:00
Henry Jameson
6cd4546873
comments
2019-06-13 00:44:25 +03:00
Henry Jameson
af75c6d1ea
No longer sending extra data, renamed some properties
2019-06-13 00:39:51 +03:00
Henry Jameson
77511a5338
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
...
* upstream/develop:
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
i18n/Update Japanese translation
render modal at the root level using portal
install portal vue
Small improve of the who to follow panel layout
Fix/Small fix in the who to follow page
remove console spam
i18n
wire up user.description with masto api data
i18n/Add Japanese with kanji (2)
move drowdown menu to popper
notification controls: redesign entirely
entity normalizer: collapse data.pleroma if blocks
wire up notification settings
do not miss statusnet_profile_url of mentions
Translation to Hebrew of everything other than theme_helpers and style.
Translate up to settings.
mastoapi login works
2019-06-13 00:07:28 +03:00
Maksim
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
HJ
9df99c5205
Merge branch 'masto-login-fixes' into 'develop'
...
MastoAPI login
See merge request pleroma/pleroma-fe!805
2019-06-12 19:42:25 +00:00
HJ
a7b0b07e6f
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
2019-06-12 11:44:14 +00:00
Henry Jameson
a05fd042df
fix small annoyance
2019-06-12 10:56:08 +03:00
Henry Jameson
0535d2c14c
fixed some bugs i found, also cleaned up some stuff + documentation
2019-06-11 21:18:09 +03:00
322c9fbfb6
i18n/Update Japanese translation
2019-06-11 12:10:47 +00:00
Henry Jameson
41eeaf35d9
self-review
2019-06-10 18:57:53 +03:00
Henry Jameson
e536a56250
Linting
2019-06-09 22:40:38 +03:00
Henry Jameson
4d12cd617a
fix textarea not resizing properly
2019-06-09 21:23:56 +03:00
Henry Jameson
8a02647de4
more bugfixes related to keybinds and nonworking stuff
2019-06-09 21:17:24 +03:00
Henry Jameson
20923d590c
Some comments, added sorting for emojis
2019-06-09 20:41:12 +03:00
Henry Jameson
76b9a66e98
fixed several bugs
2019-06-09 20:40:46 +03:00
Henry Jameson
a3cc8cc5d8
sorting
2019-06-08 17:15:48 +03:00
Henry Jameson
0a778160cc
styles
2019-06-08 17:15:42 +03:00
Henry Jameson
8872b4802e
standartized autocomplete panel suggesions format, fixed some bugs
2019-06-08 16:23:58 +03:00
Henry Jameson
ca3140fd3e
Merge remote-tracking branch 'upstream/develop' into refactor-emoji-input
...
* upstream/develop:
Small improve of the who to follow panel layout
Fix/Small fix in the who to follow page
2019-06-08 14:31:49 +03:00
Henry Jameson
96f31716f9
slot-based emoji input/autocomplete component
2019-06-07 00:17:49 +03:00
taehoon
9c8af14908
render modal at the root level using portal
2019-06-06 13:37:27 -04:00
taehoon
5740123ee6
install portal vue
2019-06-06 13:37:26 -04:00
5b274364ce
Small improve of the who to follow panel layout
2019-06-05 17:43:35 +00:00
809d872b2d
Fix/Small fix in the who to follow page
2019-06-04 08:04:47 +00:00
shpuld
4526939dae
remove console spam
2019-06-01 12:10:00 +03:00
kaniini
b4796ccbf6
Merge branch 'feature/notification-controls' into 'develop'
...
wire up notification settings
See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
Mark Felder
f67f14495b
i18n
2019-05-31 10:13:06 -05:00
Shpuld Shpludson
50618b81c8
Merge branch '543' into 'develop'
...
Fix "stale user settings shown after save"
Closes #543
See merge request pleroma/pleroma-fe!813
2019-05-29 17:08:27 +00:00
Shpuld Shpludson
6045708a5d
Merge branch 'fix-dropdown' into 'develop'
...
move drowdown menu to popper
Closes #559
See merge request pleroma/pleroma-fe!814
2019-05-29 16:55:28 +00:00
taehoon
0532995847
wire up user.description with masto api data
2019-05-29 12:32:14 -04:00
443794b000
i18n/Add Japanese with kanji (2)
2019-05-29 05:31:03 +00:00
Henry Jameson
6c7eeb93fe
move drowdown menu to popper
2019-05-27 00:13:08 +03:00
William Pitcock
855566f887
notification controls: redesign entirely
2019-05-25 23:44:36 +00:00
William Pitcock
ac97cd3e46
entity normalizer: collapse data.pleroma if blocks
2019-05-25 22:59:04 +00:00
William Pitcock
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
taehoon
2af35b8404
do not miss statusnet_profile_url of mentions
2019-05-22 23:47:20 -04:00
j1t
4249a2fd6f
Translation to Hebrew of everything other than theme_helpers and style.
2019-05-22 21:33:05 +03:00
Henry Jameson
e7a2a7267d
Proper clientId/secret/token caching, MastoAPI registration
2019-05-22 19:13:41 +03:00
j1t
3b3e4ffc54
Translate up to settings.
2019-05-22 01:46:08 +03:00
Henry Jameson
fc12b63fcc
mastoapi login works
2019-05-21 23:35:40 +03:00
HJ
0fc7cbfa24
Merge branch 'fetags' into 'develop'
...
add tags to data and to status component
See merge request pleroma/pleroma-fe!801
2019-05-20 21:02:29 +00:00
HJ
b78ad8998d
Merge branch 'masto-remains' into 'develop'
...
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that
See merge request pleroma/pleroma-fe!792
2019-05-20 20:54:05 +00:00
Moonman
0f824ff311
switch from method to computed property
2019-05-20 15:23:36 -04:00
HJ
b436e0dd12
Merge branch 'webpack-4-dart-sass' into 'develop'
...
Massive update for dependencies
See merge request pleroma/pleroma-fe!734
2019-05-20 18:09:14 +00:00
Moonman
f6600a35a5
formatting
2019-05-20 00:15:58 -04:00
Moonman
fc9acf8fb6
add tags to data and to status component
2019-05-20 00:03:50 -04:00
Senko-san
229c65959e
Remove auto-hyphenation
...
Auto-hyphenation has terrible heuristics on all browsers, disable it.
Source: https://justmarkup.com/articles/2019-01-28-a-look-at-css-hyphenation-in-2019/
2019-05-20 00:43:35 +01:00
taehoon
205a9821e6
make staff label visible
2019-05-19 14:28:29 -04:00
taehoon
e01ffc67c6
move visibility-tray css in local scope
2019-05-19 14:28:29 -04:00
taehoon
34ffcb028a
refactor css
2019-05-19 14:28:29 -04:00
taehoon
9adbc2c17f
make only screen name as link
2019-05-19 14:28:29 -04:00
taehoon
9e6a91e755
refactor css for visibility tray
2019-05-19 14:28:29 -04:00
Henry Jameson
15b3651a30
moved setting styles into common to avoid bug with shared styles
2019-05-19 20:42:44 +03:00
taehoon
07d0143bda
hide three dot menu button if has no items
2019-05-19 09:16:47 -04:00
William Pitcock
00ad97fcfa
entity normalizer: add tooltip text to emojis
2019-05-17 20:10:50 +00:00
taehoon
2457dd9b91
rename for consistency's sake
2019-05-16 14:02:37 -04:00
taehoon
b6731bd9af
update admin api urls in accordance with new docs
2019-05-16 13:21:14 -04:00
Shpuld Shpludson
81278651d9
Line up rich text format picker with the status form
2019-05-15 19:53:33 +00:00
Henry Jameson
aa24ac7ea6
fix lint
2019-05-15 20:49:46 +03:00
Henry Jameson
7976d118ca
Cleanup, little documentation, localization
2019-05-15 20:44:35 +03:00
taehoon
2ce0186327
update api service functions
2019-05-15 12:04:26 -04:00
taehoon
daba688f46
remove needless importing
2019-05-15 12:04:26 -04:00
taehoon
f68653d0dd
show pinned state only in the user timeline
2019-05-15 12:04:26 -04:00
taehoon
110c9d3b26
improve performance by caching pinned status ids into user object
2019-05-15 12:04:26 -04:00
taehoon
87de130ee5
apply status normalizer
2019-05-15 12:04:26 -04:00
taehoon
2af088969a
improve error handling logic
2019-05-15 12:04:26 -04:00
taehoon
12f8269f01
make sure to have rights property of user object
2019-05-15 12:04:26 -04:00
taehoon
1747cd8771
use text color instead
2019-05-15 12:04:26 -04:00
taehoon
19e79895bb
revert unnecessary changes
2019-05-15 12:04:26 -04:00
taehoon
beaf512573
add translation
2019-05-15 12:04:26 -04:00
taehoon
d76bd0044f
fix typo
2019-05-15 12:04:26 -04:00
taehoon
32be0e15d1
use pinned property from status directly
2019-05-15 12:04:26 -04:00
taehoon
f8186bfc74
show immediately pinned statuses
2019-05-15 12:04:26 -04:00
taehoon
a601337a20
clean up
2019-05-15 12:04:26 -04:00
taehoon
93e9bc019e
clean up fetchPinnedStatuses api service
2019-05-15 12:04:26 -04:00
taehoon
8308315038
revert removeStatus changes
2019-05-15 12:04:26 -04:00
taehoon
1229622fed
refactor error handling of pinStatus
2019-05-15 12:04:25 -04:00
taehoon
ce1d19136d
refactor pin/unpin status logic
2019-05-15 12:04:25 -04:00
taehoon
e8abe1273b
filter pinned statuses based on pinned entity instead of a separate user entity
2019-05-15 12:04:25 -04:00
taehoon
cd0a7afa06
remove pinned timeline, instead, use simple entity of user object
2019-05-15 12:04:25 -04:00
taehoon
9e22d6212a
revert pinned timeline polling logic
2019-05-15 12:04:25 -04:00
dave
8095ce8f62
#468 - hide status menu after action button is clicked
2019-05-15 12:04:25 -04:00
dave
075ddc34f1
#468 - shwo pin button for valid statuses (public & unlisted)
2019-05-15 12:04:25 -04:00
dave
9fc997500e
#468 - add extra buttons for status actions
2019-05-15 12:04:25 -04:00
dave
006bf1ce63
#468 - fix plus button size issue, use scss variable properly
2019-05-15 12:04:25 -04:00
dave
e6268c492e
#468 - clean up
2019-05-15 12:04:25 -04:00
dave
5ab0e71500
#468 - show pin status API error
2019-05-15 12:04:24 -04:00
dave
df207593e9
#468 - update pinned status after actions(remove, add)
2019-05-15 12:04:24 -04:00
dave
f1ff48ffd6
#468 - remove unpinned status from timeline
2019-05-15 12:04:24 -04:00
dave
2c89d49a3d
#468 - show pinned timeline and add pinned label to the status
2019-05-15 12:04:24 -04:00
dave
e28b19645a
#468 - show pin for own statuses only
2019-05-15 12:04:24 -04:00
dave
1aa0e8d7e0
#468 - pin/unpin status
2019-05-15 12:04:24 -04:00
dave
affbe8700e
#468 - integrate endpoints
2019-05-15 12:04:24 -04:00
tarteka
bacbfc1154
Update es.json
2019-05-15 09:16:49 +00:00
taehoon
5e0235fa63
make reply icon not hoverable if disabled
2019-05-14 22:45:57 -04:00
taehoon
731ad0a48b
show reply button and count when logged out as well
2019-05-14 22:44:56 -04:00
Henry Jameson
543604fd2d
removed unused masto api, added initial version of interactions timeline
2019-05-14 22:48:44 +03:00
Henry Jameson
04fa2aefb3
get rid of reply-left, we decided it should go long time ago
2019-05-14 19:49:03 +03:00
Henry Jameson
addeb85220
fix prod build
2019-05-13 21:54:25 +03:00
Henry Jameson
750dca4a10
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (116 commits)
Fix small mistake in Polish translation
link interaction avatars to the user profile
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
use backendInteractor
refactor api service functions using new helper
clean up
update favorite number earlier
update status interaction upon retweet action response
sync up favoritedBy with favorite/unfavorite action
do not regenerate status object
reduce needless calculation
Move scope visibility notice to the status form, make it dismissible
Revert "eliminate expandable prop in favor of inConversation"
status attention doesn’t have relationship entities
make it short
fix wrong inlineExpanded
expanded is always false, eliminate it
eliminate expandable prop in favor of inConversation
fix conversationId comparision bug using integer format
Display additional scope description above the status form for mobile users.
...
2019-05-13 20:38:54 +03:00
Marcin Mikołajczak
caf9e627a7
Fix small mistake in Polish translation
2019-05-10 06:52:01 +00:00
HJ
cd67b1f496
Merge branch '527' into 'develop'
...
Fix "Liking/reprööting posts while post is highlighted in conversation fails to update the liked/reprööted status"
Closes #527
See merge request pleroma/pleroma-fe!787
2019-05-09 17:17:26 +00:00
HJ
177e53cf6a
Merge branch 'mobile-scope' into 'develop'
...
Display additional scope description above the status form for mobile users.
Closes #505
See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
taehoon
31e14cd45d
link interaction avatars to the user profile
2019-05-08 12:04:33 -04:00
eugenijm
a89010843d
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
2019-05-08 16:50:39 +03:00
taehoon
7d60ab322e
use backendInteractor
2019-05-07 23:36:35 -04:00
taehoon
26131266a9
refactor api service functions using new helper
2019-05-07 23:27:22 -04:00
taehoon
a54cf47ba5
clean up
2019-05-07 23:21:19 -04:00
taehoon
28c2a700e1
update favorite number earlier
2019-05-07 23:19:46 -04:00
taehoon
ff3a7e8b5b
update status interaction upon retweet action response
2019-05-07 23:17:52 -04:00
taehoon
f75e40e462
sync up favoritedBy with favorite/unfavorite action
2019-05-07 16:43:54 -04:00
taehoon
78a4ab98af
do not regenerate status object
2019-05-07 16:20:24 -04:00
taehoon
9a9d66dca1
reduce needless calculation
2019-05-07 15:54:49 -04:00
HJ
157d4e601e
Merge branch 'fix/floating-button' into 'develop'
...
Mobile Post button fix
Closes #506
See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
Shpuld Shpludson
496ccd0bb3
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!784
2019-05-07 17:35:28 +00:00
eugenijm
4af343374a
Move scope visibility notice to the status form, make it dismissible
2019-05-07 19:13:45 +03:00
taehoon
917e82e8ee
Revert "eliminate expandable prop in favor of inConversation"
...
This reverts commit 1455e1f9d5
.
2019-05-06 21:36:55 -04:00
taehoon
134b1894d6
status attention doesn’t have relationship entities
2019-05-06 16:41:12 -04:00
taehoon
44a18eb838
make it short
2019-05-06 16:17:29 -04:00
taehoon
1a3799bfac
fix wrong inlineExpanded
2019-05-06 16:16:43 -04:00
taehoon
3adfbc0357
expanded is always false, eliminate it
2019-05-06 15:30:36 -04:00
taehoon
1455e1f9d5
eliminate expandable prop in favor of inConversation
2019-05-06 15:29:24 -04:00
taehoon
a27a2f78ac
fix conversationId comparision bug using integer format
2019-05-06 13:24:11 -04:00
eugenijm
befaa477a3
Display additional scope description above the status form for mobile users.
2019-05-06 18:10:58 +03:00
tarteka
bfd25a5c3f
Update es.json
2019-05-06 08:38:24 +00:00
taehoon
489927bdc9
toggle showing new status form instead of toggle mouting
2019-05-05 23:00:45 -04:00
taehoon
bc41a7b305
make sure media modal to be above reporting modal
2019-05-05 13:48:25 -04:00
taehoon
9787d99672
update api services
2019-05-03 11:40:06 -04:00
taehoon
220a7e89d5
use native scrollbar
2019-05-03 11:40:06 -04:00
taehoon
abad528dd4
refactor using List component
2019-05-03 11:40:06 -04:00
taehoon
8561bf6612
remove transition css
2019-05-03 11:40:06 -04:00
taehoon
19a0476985
update api endpoint url
2019-05-03 11:40:06 -04:00
taehoon
ddc7c870f4
rewrite checkbox component
2019-05-03 11:40:06 -04:00
taehoon
58a420f2b3
fix panel title overflow issue in mobile
2019-05-03 11:40:06 -04:00
taehoon
0bb8247822
fix double scrollbar display bug in mobile
2019-05-03 11:40:06 -04:00
taehoon
e97f8a4728
prevent parent scroll
2019-05-03 11:40:06 -04:00
taehoon
6b1e305a18
use custom scrollbar
2019-05-03 11:40:06 -04:00
taehoon
01cc7e4480
modal style improvements
2019-05-03 11:40:06 -04:00
taehoon
2e6eab51b8
Update promisedRequest helper to support json payload
2019-05-03 11:40:06 -04:00
taehoon
f364068e10
Improve mobile layout
2019-05-03 11:40:06 -04:00
taehoon
91502a25a4
Add a css class to the checkbox indicator
2019-05-03 11:40:06 -04:00
taehoon
cf72ebb407
update copy
2019-05-03 11:40:05 -04:00
taehoon
5d0bae5569
update generic error message
2019-05-03 11:40:05 -04:00
taehoon
d115d98a1b
add translations
2019-05-03 11:40:05 -04:00
taehoon
471085f0f3
add error message
2019-05-03 11:40:05 -04:00
taehoon
dfc56dfee2
reset modal state if api request is completed
2019-05-03 11:40:05 -04:00
taehoon
1b07c6ae4f
add processing state and close modal after api request is completed
2019-05-03 11:40:05 -04:00
taehoon
1878e56c16
reset modal state when userId is changed
2019-05-03 11:40:05 -04:00
taehoon
02d169b92c
add promisedRequest helper
2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
taehoon
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
Shpuld Shpludson
0438031da4
Merge branch 'develop' into 'develop'
...
[i18n]Update oc.json
See merge request pleroma/pleroma-fe!777
2019-05-03 14:57:04 +00:00
Shpuld Shpludson
513613a4b2
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!779
2019-05-03 14:56:45 +00:00
taehoon
6ae3c1cfcf
autoload older notifications when scrolled to the bottom
2019-05-03 07:52:22 -04:00
tarteka
09253420a2
Update es.json
2019-05-03 00:22:14 +00:00
taehoon
f8ae631d8c
fix notifications div scrolling issue on mobile
2019-05-02 08:21:02 -04:00
Exilat
b98bab52a9
Update oc.json
2019-05-01 16:40:40 +00:00
shpuld
c44c048356
add title and alt for avatars, fix console errors in avatarlist
2019-05-01 17:33:56 +03:00
Shpuld Shpludson
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
HJ
0f7f685c5e
Merge branch '437-user-profile-settings' into 'develop'
...
Transition to MastoAPI: user profile settings
Closes #437
See merge request pleroma/pleroma-fe!682
2019-04-30 06:05:52 +00:00
eugenijm
b18fea8508
Debounce floating post button autohide
2019-04-29 22:53:30 +03:00
shpuld
da08388d6a
filter outside of component
2019-04-29 22:36:39 +03:00
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
HJ
d94fdd0617
Merge branch '220-import-export-blocks-mutes' into 'develop'
...
Allow import/export of blocks
See merge request pleroma/pleroma-fe!717
2019-04-29 18:15:58 +00:00
taehoon
5b16e36828
remove &
2019-04-29 13:57:44 -04:00
taehoon
a793835566
add a comment
2019-04-29 13:53:21 -04:00
taehoon
b1f8221a0a
show ellipsis for long user name and screen name
2019-04-29 13:27:10 -04:00
taehoon
3665c86d70
use default_scope parameter
2019-04-27 21:51:17 -04:00
taehoon
904a64de89
use json content type
2019-04-27 14:20:32 -04:00
taehoon
2c4af6693a
clean up
2019-04-27 14:04:30 -04:00
taehoon
ab19669bf1
refactoring
2019-04-27 08:31:06 -04:00
taehoon
95bc2d727b
add “export blocks” feature
2019-04-27 08:31:06 -04:00
taehoon
13abe64f87
fix wrong function binding
2019-04-27 08:31:06 -04:00
taehoon
08eaf9bd33
make reusable Exporter component
2019-04-27 08:31:06 -04:00
taehoon
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
taehoon
6ea4154084
change api function name
2019-04-27 08:31:06 -04:00
taehoon
6d0e98a1c2
make Importer component reusable
2019-04-27 08:31:06 -04:00
taehoon
18bb209ace
add uploading icon css
2019-04-27 08:31:06 -04:00
taehoon
903bce40c3
move formData generating logic to api.service
2019-04-27 08:31:06 -04:00
taehoon
562120ae48
split out follow’s importer as a separate component
2019-04-27 08:31:06 -04:00
taehoon
ac0b45fa14
Update avatar uploading
2019-04-27 08:30:08 -04:00
taehoon
e14720419f
Switch to mastoapi for updating user profile
2019-04-27 08:30:08 -04:00
taehoon
909d11825d
Switch to mastoapi for updating banner
2019-04-27 08:30:08 -04:00
taehoon
808e1ac11c
Switch to mastoapi for updating avatar
...
# Conflicts:
# src/services/api/api.service.js
2019-04-27 08:30:08 -04:00
Henry Jameson
e0247e21f6
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (126 commits)
entity normalizer: hook up in_reply_to_account_acct
add BBCode strings
fix follow button not updating bug in follow-card
refer searched user objects from the global user rep
set max-width of textarea in settings page
Remove space in the timeline setting copy
user_card.vue: Fix .emoji to apply to img
Update oc.json
Update oc.json
Update oc.json
Update oc.json
replace pencil with wrench icon
rebuild fontello with wrench icon added
fetch all friends using pagination
stop fetching user relationship when user is unauthorized
Revert "recover border between basic-user-card using list component"
remove extra spacing
code readability
fix typos
clean up
...
2019-04-27 12:26:17 +03:00
William Pitcock
f4420cbf9f
entity normalizer: hook up in_reply_to_account_acct
2019-04-27 04:52:11 +00:00