Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3221 commits 59 branches 16 tags 15 MiB
Commit graph

2717 commits

Author SHA1 Message Date
dave
43e97e590c #433 - sort conversation for retweets and clean up 2019-03-27 16:00:54 -04:00
HJ
ea50f55148 Merge branch 'develop' into 'masto-api/direct' 
# Conflicts:
#   src/services/api/api.service.js
 2019-03-27 19:48:41 +00:00
HJ
3870adf51f Merge branch 'mastoapi/friends-tl' into 'develop' 
Mastoapi/friends tl

See merge request pleroma/pleroma-fe!711
 2019-03-27 19:40:51 +00:00
Exilat
e1e0b8b254 Update oc.json for !611 and !691 2019-03-27 18:46:40 +00:00
dave
0e2931e7de Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form 2019-03-27 13:50:51 -04:00
Shpuld Shpludson
85e9e52090 Merge branch 'fix/add-await-to-login-request' into 'develop' 
!701 Add await to login action in after_store

See merge request pleroma/pleroma-fe!709
 2019-03-27 16:22:31 +00:00
jared
37b33fc615 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input 2019-03-27 11:13:06 -04:00
dave
578b412177 #457 - merge develop and resolve conflict 2019-03-27 11:09:30 -04:00
Henry Jameson
b3a6bec17b Revert "Merge branch 'revert-987b5162' into 'develop'" 
This reverts commit 96753e6a5f, reversing
changes made to 987b5162a7.
 2019-03-27 11:17:04 +02:00
HJ
e750b2f197 Merge branch 'mastoapi/public-tl' into 'develop' 
switch public and TWKN to MastoAPI

See merge request pleroma/pleroma-fe!650
 2019-03-27 08:54:57 +00:00
HJ
95459ff0bc Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" 
This reverts merge request !647
 2019-03-27 08:47:54 +00:00
jasper
2d05aef24b Add await to login action' 2019-03-26 14:26:26 -07:00
jasper
26955af60b Remove console log 2019-03-26 13:36:33 -07:00
jasper
ab99d5ef95 Fix warnings in user profile routing 2019-03-26 13:35:08 -07:00
shpuld
c50e64f8ee Add tests for gesture service, fix bug with perpendicular directions 2019-03-26 22:11:45 +02:00
jared
8fe9101f0b #255 - clean up autocomplete form 2019-03-26 14:53:27 -04:00
jared
6dc2cedab0 #255 - clean up user settings page with self-closing html tags 2019-03-26 13:42:27 -04:00
jared
2927454233 #255 - support textarea and update user settings page 2019-03-26 13:40:37 -04:00
Shpuld Shpludson
987b5162a7 Merge branch 'mastoapi/friends-tl' into 'develop' 
Switch friends TL to MastoAPI

See merge request pleroma/pleroma-fe!647
 2019-03-26 17:24:37 +00:00
dave
982be05873 #457 - update tag timeline endpoint to MastoAPI 2019-03-26 11:40:34 -04:00
dave
5fd589d5e7 merge develop & resolve conflict 2019-03-26 10:52:46 -04:00
jared
441deb405d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input 2019-03-26 09:38:45 -04:00
jared
b97a033839 #255 - add emoji input component 2019-03-25 22:38:15 -04:00
HJ
2f1e690478 Merge branch 'issue-442-placeholder-fix' into 'develop' 
#442 - clean up Bio placeholder text

Closes #442

See merge request pleroma/pleroma-fe!689
 2019-03-25 22:29:17 +00:00
shpuld
e23c19468a somewhat functioning gesture service 2019-03-25 22:44:58 +02:00
dave
467647d5d7 #433 - fix retweet abnormal behavior 2019-03-25 16:09:40 -04:00
HJ
04217fc660 Merge branch 'develop' into 'mastoapi/friends-tl' 
# Conflicts:
#   src/services/api/api.service.js
 2019-03-25 19:21:48 +00:00
Henry Jameson
d766059dee correctly update relationship on follow/unfollow 2019-03-25 21:19:24 +02:00
Henry Jameson
82f077feb9 fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions 2019-03-25 21:12:54 +02:00
Henry Jameson
0ffd43954e Merge remote-tracking branch 'upstream/develop' into mastoapi/actions 
* upstream/develop: (87 commits)
  review
  Update attachment normalizer
  Add fallback for attachments uploaded via the other platforms
  Get correct mimetype through entity_normalizer
  Set default parameter
  Switch to mastoapi for posting status and uploading media
  Revert changes
  prevent text pasting if image is pasted
  remove border radius of suggested emojis
  #450 - dispatch login after saved state is loaded
  #448 - fix timeline fetch error when status text is null
  #451 - add class to username span
  No need to fetch mutes on load anymore 🙌
  switch to mastoapi
  switch to mastoapi
  masto api sends muted property now
  No need to fetch user data using old api anymore 🎉
  Switch to mastoapi
  reactivity fixes
  less hackery, more direct usage of mastoapi
  ...
 2019-03-25 21:12:15 +02:00
dave
c5ec4829a7 #433 - consider page on focused 2019-03-25 15:10:45 -04:00
HJ
3025532ecf Merge branch 'develop' into 'mastoapi/public-tl' 
# Conflicts:
#   src/services/api/api.service.js
 2019-03-25 19:09:22 +00:00
Henry Jameson
72749834f3 Merge remote-tracking branch 'upstream/develop' into masto-api/direct 
* upstream/develop: (40 commits)
  review
  Update attachment normalizer
  Add fallback for attachments uploaded via the other platforms
  Get correct mimetype through entity_normalizer
  Set default parameter
  Switch to mastoapi for posting status and uploading media
  Revert changes
  prevent text pasting if image is pasted
  remove border radius of suggested emojis
  #450 - dispatch login after saved state is loaded
  #448 - fix timeline fetch error when status text is null
  #451 - add class to username span
  No need to fetch mutes on load anymore 🙌
  switch to mastoapi
  switch to mastoapi
  masto api sends muted property now
  No need to fetch user data using old api anymore 🎉
  Switch to mastoapi
  reactivity fixes
  less hackery, more direct usage of mastoapi
  ...
 2019-03-25 21:06:58 +02:00
Henry Jameson
968e6c7fe8 correctly paginate on MastoAPI 2019-03-25 21:04:52 +02:00
dave
73dfb00be2 #433 - remove needless nesting/bloating 2019-03-25 14:59:47 -04:00
dave
1a68a9db36 #433 - Fix conversation page highlight, fetch conversation on converation page 2019-03-25 14:55:58 -04:00
dave
6143b1ce0f Resolve merge conflict, 
Fix few issues (conversation page highlight, fetch conversation, ...)
 2019-03-25 14:47:54 -04:00
Henry Jameson
50960c7cfc Merge remote-tracking branch 'upstream/develop' into mastoapi/followers 
* upstream/develop: (87 commits)
  review
  Update attachment normalizer
  Add fallback for attachments uploaded via the other platforms
  Get correct mimetype through entity_normalizer
  Set default parameter
  Switch to mastoapi for posting status and uploading media
  Revert changes
  prevent text pasting if image is pasted
  remove border radius of suggested emojis
  #450 - dispatch login after saved state is loaded
  #448 - fix timeline fetch error when status text is null
  #451 - add class to username span
  No need to fetch mutes on load anymore 🙌
  switch to mastoapi
  switch to mastoapi
  masto api sends muted property now
  No need to fetch user data using old api anymore 🎉
  Switch to mastoapi
  reactivity fixes
  less hackery, more direct usage of mastoapi
  ...
 2019-03-25 20:32:12 +02:00
shpuld
b13a751926 start creating gesture service 2019-03-25 20:27:44 +02:00
Henry Jameson
cb122e3a99 review 2019-03-25 20:11:06 +02:00
Henry Jameson
3b5fc88989 Merge remote-tracking branch 'upstream/develop' into mastoapi/convos 
* upstream/develop: (34 commits)
  Update attachment normalizer
  Add fallback for attachments uploaded via the other platforms
  Get correct mimetype through entity_normalizer
  Set default parameter
  Switch to mastoapi for posting status and uploading media
  Revert changes
  prevent text pasting if image is pasted
  remove border radius of suggested emojis
  #450 - dispatch login after saved state is loaded
  #448 - fix timeline fetch error when status text is null
  #451 - add class to username span
  No need to fetch mutes on load anymore 🙌
  switch to mastoapi
  switch to mastoapi
  masto api sends muted property now
  No need to fetch user data using old api anymore 🎉
  Switch to mastoapi
  Add comment
  Reset statusnet_blocking of all fetched users first while refreshing block list
  Add hideMutedPosts setting and wire up to post-returning endpoints
  ...
 2019-03-25 19:54:15 +02:00
Shpuld Shpludson
b02085f2ef Merge branch 'issue-450-user-data-populate' into 'develop' 
#450 - dispatch login after saved state is loaded

Closes #450

See merge request pleroma/pleroma-fe!701
 2019-03-25 16:57:05 +00:00
Shpuld Shpludson
57b82e9236 Merge branch 'file-paste' into 'develop' 
#455 - prevent text pasting if image is pasted

Closes #455

See merge request pleroma/pleroma-fe!705
 2019-03-25 16:52:25 +00:00
Shpuld Shpludson
182eab051d Merge branch 'develop' into 'develop' 
Remove border radius of suggested emojis

See merge request pleroma/pleroma-fe!704
 2019-03-25 16:52:01 +00:00
taehoon
932652e335 Update attachment normalizer 2019-03-25 12:19:33 -04:00
dave
6a9159b255 #433 - fix broken conversation page 2019-03-25 10:50:09 -04:00
dave
4cec0d589d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form 2019-03-25 10:22:16 -04:00
taehoon
6fdbc182ca Add fallback for attachments uploaded via the other platforms 2019-03-24 21:16:57 -04:00
taehoon
909c315a44 Get correct mimetype through entity_normalizer 2019-03-24 21:16:57 -04:00
taehoon
966add1b29 Set default parameter 2019-03-24 21:16:57 -04:00
taehoon
9802344603 Switch to mastoapi for posting status and uploading media 2019-03-24 21:16:56 -04:00
HJ
01d0531699 Merge branch '227-manage-blocks-mutes' into 'develop' 
Transition to MastoAPI: Mute & Block and Add Mutes management tab

See merge request pleroma/pleroma-fe!611
 2019-03-24 17:15:21 +00:00
taehoon
f03747e841 Revert changes 2019-03-24 13:04:47 -04:00
nik
b241539d4d prevent text pasting if image is pasted 2019-03-23 22:45:24 -05:00
nik
05634d222d remove border radius of suggested emojis 2019-03-23 22:26:31 -05:00
shpuld
fd12263cac merge develop in 2019-03-23 22:21:57 +02:00
shpuld
85584021fb make notifications close on navigation 2019-03-23 22:03:38 +02:00
Shpuld Shpludson
f86a5dc804 Merge branch 'issue-448-status-text-null' into 'develop' 
#448 - fix timeline fetch error when status text is null

Closes #448

See merge request pleroma/pleroma-fe!700
 2019-03-23 14:17:47 +00:00
Shpuld Shpludson
e9b58f1af7 Merge branch 'issue-452-unfollow-button' into 'develop' 
#452 - unfollow button issue

Closes #452

See merge request pleroma/pleroma-fe!698
 2019-03-23 07:45:42 +00:00
Shpuld Shpludson
f3f006c8e3 Merge branch 'issue-451-long-user-name' into 'develop' 
#451 - long username on follow/follower tabs

Closes #451

See merge request pleroma/pleroma-fe!697
 2019-03-23 07:45:04 +00:00
dave
31d09931c8 #450 - dispatch login after saved state is loaded 2019-03-22 14:04:22 -04:00
dave
d70928792d #448 - fix timeline fetch error when status text is null 2019-03-22 13:15:11 -04:00
dave
ed4540530b #451 - add class to username span 2019-03-22 10:42:21 -04:00
lambda
277790e462 Merge branch '438-mastoapi-user-search' into 'develop' 
Transition to MastoAPI: user search

Closes #438

See merge request pleroma/pleroma-fe!677
 2019-03-22 11:16:25 +00:00
taehoon
9fa1bc63b0 No need to fetch mutes on load anymore 🙌 2019-03-21 21:58:02 -04:00
taehoon
a64e744c1b switch to mastoapi 2019-03-21 21:53:24 -04:00
taehoon
8702d23a13 switch to mastoapi 2019-03-21 21:44:59 -04:00
taehoon
379e33f6a5 masto api sends muted property now 2019-03-21 21:31:16 -04:00
taehoon
883a84b313 No need to fetch user data using old api anymore 🎉 2019-03-21 21:30:30 -04:00
taehoon
af85a3f244 Switch to mastoapi 2019-03-21 21:27:10 -04:00
Henry Jameson
e617ed285e reactivity fixes 2019-03-22 00:05:20 +02:00
Henry Jameson
67719e9a23 less hackery, more direct usage of mastoapi 2019-03-21 23:45:18 +02:00
Henry Jameson
d6c62fa50f minor UI improvements - keep current behavior of showing originating post initially 2019-03-21 23:27:14 +02:00
Henry Jameson
ee94a6732a why did i do that 2019-03-21 22:49:26 +02:00
Henry Jameson
307b4ba698 Merge remote-tracking branch 'upstream/develop' into mastoapi/convos 
* upstream/develop: (47 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  after store: fix setting postFormats field
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  ...
 2019-03-21 22:40:20 +02:00
taehoon
a0bccbce94 Add comment 2019-03-21 16:39:41 -04:00
taehoon
d7919109ec Reset statusnet_blocking of all fetched users first while refreshing block list 2019-03-21 16:39:41 -04:00
taehoon
9857002bf5 Add hideMutedPosts setting and wire up to post-returning endpoints 2019-03-21 16:33:02 -04:00
Henry Jameson
fe13b1b75a Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl 
* upstream/develop: (47 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  after store: fix setting postFormats field
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  ...
 2019-03-21 22:28:29 +02:00
taehoon
300259fd97 Add todo comment 2019-03-21 16:26:15 -04:00
taehoon
333afd2138 Minor code refactoring 2019-03-21 16:26:15 -04:00
taehoon
d65422a6a5 Improve fetch error handling using a util 2019-03-21 16:26:13 -04:00
taehoon
9b690209d0 Reset old mutes state after fetching new mutes data 2019-03-21 16:21:28 -04:00
taehoon
302310a653 Remove old muting logic 2019-03-21 16:19:09 -04:00
taehoon
a6ce191cbc Update MuteCard ui 2019-03-21 16:19:05 -04:00
taehoon
859ed4f34f Fetct full data of muted users after fetchMutes api call 2019-03-21 16:19:05 -04:00
taehoon
f04cbc8875 Add mute/unmute mutations 2019-03-21 16:19:05 -04:00
taehoon
3255950b0e Add mute/unmute featrue and mutes management tab 2019-03-21 16:19:03 -04:00
Henry Jameson
faef769b40 Merge remote-tracking branch 'upstream/develop' into masto-api/direct 
* upstream/develop: (47 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  after store: fix setting postFormats field
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  ...
 2019-03-21 22:11:02 +02:00
dave
23bae67146 #452 - update button class name 2019-03-21 15:03:54 -04:00
dave
8932c53706 #451 - update styling 2019-03-21 14:58:28 -04:00
dave
dfcdf4f32c #452 - unfollow button issue 2019-03-21 13:19:10 -04:00
dave
1c6e5d3688 #451 - long username on follow/follower tabs 2019-03-21 13:06:37 -04:00
Shpuld Shpludson
66e60572bc Merge branch 'issue-449-auto-token-fetch' into 'develop' 
#449 - fix auth token fetch issue

Closes #449

See merge request pleroma/pleroma-fe!696
 2019-03-21 16:12:33 +00:00
dave
db3b48d444 #449 - fix auth token fetch issue 2019-03-21 12:04:57 -04:00
Shpuld Shpludson
c2b7aff325 Merge branch 'issue-444-remote-follow' into 'develop' 
#444 - show `remote follow` button when logged out

Closes #444

See merge request pleroma/pleroma-fe!692
 2019-03-21 15:46:05 +00:00
Shpuld Shpludson
9890e41440 Merge branch 'feature/bypass-avatar-cropper' into 'develop' 
#443 Add button to save without cropping

Closes #443

See merge request pleroma/pleroma-fe!691
 2019-03-21 15:44:26 +00:00
Shpuld Shpludson
9e17853b2c Merge branch 'patch-2' into 'develop' 
[i18n] Update oc.json

See merge request pleroma/pleroma-fe!684
 2019-03-21 15:38:19 +00:00
Shpuld Shpludson
a284a267ce Merge branch 'develop' into 'develop' 
Fixing typos and badly translated strings (Portuguese)

See merge request pleroma/pleroma-fe!676
 2019-03-21 15:37:05 +00:00
Shpuld Shpludson
57cd6f8018 Merge branch 'feature/version-info' into 'develop' 
Added new tab to display versions of BE/FE

Closes #397

See merge request pleroma/pleroma-fe!671
 2019-03-21 15:25:59 +00:00
shpuld
f389128e53 make mobile notifs drawer more like an actual drawer, make mobile nav buttons bigger to press, fix alert dot 2019-03-20 22:09:29 +02:00
Marcin Mikołajczak
4ace0866da Make select tag use --inputText as text color 2019-03-20 11:52:58 +00:00
dave
96c88b334c #444 - remote follow clean up 2019-03-19 14:41:50 -04:00
dave
07b8115a37 #444 - show remote follow button when logged out 2019-03-19 14:36:27 -04:00
jasper
3108722eda Add button to save without cropping 2019-03-18 18:19:42 -07:00
dave
13e727b5ee #436: sync notification with timeline 2019-03-18 14:42:09 -04:00
dave
060d3b0713 #436: implement is_seen logic 2019-03-18 12:30:34 -04:00
dave
55d7bd6d4e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-18 10:37:26 -04:00
dave
5717d97182 #442 - update placeholder linebreak 2019-03-18 10:35:13 -04:00
dave
543cc0d285 #442 - clean up Bio placeholder text 2019-03-17 16:59:08 -04:00
dave
241503346f #436: clean up based on comment 2019-03-17 10:08:01 -04:00
Henry Jameson
4cdfd5fb86 post-merge fixes 2019-03-17 14:41:05 +02:00
Henry Jameson
30c0cafff1 Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis 
* upstream/develop: (34 commits)
  after store: fix setting postFormats field
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  actually use embedded relationship if it's present
  instead of filtering nulls, let's just not have them in the first place
  #434 - fix plain text issue
  Add floating post-status button on mobile
  Update user settings icon to pencil
  I18n: Update Czech translation
  user_card.vue: Copy over .status-content img styling
  ...
 2019-03-17 13:32:56 +02:00
Exilat
7babbce522 [i18n] Update oc.json 2019-03-15 17:23:30 +00:00
dave
e5786f32a7 #436: merge develop 2019-03-15 11:28:33 -04:00
taehoon
6e60873a3d Switch to mastoapi for user search 2019-03-15 11:03:11 -04:00
HJ
9364964b01 Merge branch 'mastoapi/user-stuff' into 'develop' 
Transition to MastoAPI: user data

See merge request pleroma/pleroma-fe!655
 2019-03-15 13:14:41 +00:00
lambda
92eb55c7bc Merge branch 'bugfix/nodeinfo-post-formats' into 'develop' 
after store: fix setting postFormats field

See merge request pleroma/pleroma-fe!683
 2019-03-15 13:03:35 +00:00
lambda
c626f84336 Merge branch 'afterstore-refactor' into 'develop' 
afterStoreSetup: Move log in and theme load to afterStoreSetup.

See merge request pleroma/pleroma-fe!680
 2019-03-15 13:03:19 +00:00
dave
8ade93bb4d #436: update test 2019-03-14 22:36:11 -04:00
dave
935aae054f #436: add is_local for statuses 2019-03-14 22:07:42 -04:00
HJ
ebc6a75d30 Merge branch 'issue-434-plain-text' into 'develop' 
#434 - fix plain text issue

Closes #434

See merge request pleroma/pleroma-fe!675
 2019-03-14 22:03:33 +00:00
William Pitcock
f93d4a3754 after store: fix setting postFormats field 2019-03-14 21:35:45 +00:00
Henry Jameson
71c12fa3a5 fix user-card avatar falling into permament failed state 2019-03-14 23:07:28 +02:00
Henry Jameson
6420c93e98 fix flake id users not fetching correctly 2019-03-14 23:07:28 +02:00
shpuld
0a86d39ba9 remove notifications from sidebar, make notifications appear on login only 2019-03-14 20:40:56 +02:00
dave
97a3f9c0f5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-14 14:24:23 -04:00
Henry Jameson
885a3a77df fix console error 2019-03-14 18:50:51 +02:00
dave
52326e6551 #436: remove clear & dismiss UI updates 2019-03-14 11:57:24 -04:00
shpuld
f19284357e make nav bar slide, move mobile post status to mobile nav 2019-03-14 17:46:04 +02:00
dave
e5e1d4c643 #436: fix notification order, follow type link issue, duplicate key 2019-03-14 07:55:39 -04:00
Edijs
3c5c09c74f Merge branch 'develop' into feature/version-info 2019-03-13 15:24:09 -07:00
dave
93a2510ede #436: update is_local 2019-03-13 15:43:48 -04:00
dave
78951964fb #436: update entity_normalizer 2019-03-13 15:34:45 -04:00
dave
2f7d890ad2 #436: add dismiss button, disable is_seen part 2019-03-13 14:08:03 -04:00
lain
5318227c37 afterStoreSetup: Move log in and theme load to afterStoreSetup. 2019-03-13 13:29:34 +01:00
lain
48ac96cfc7 afterStoreSetup: Handle 404 cases. 2019-03-13 12:41:39 +01:00
lain
446785ddce afterStoreSetup: Emoji and nodeinfo refactor. 2019-03-13 12:26:40 +01:00
lain
f535ccd925 afterStoreSetup: refactor TOS and panel fetching, handle 404s. 2019-03-13 12:10:57 +01:00
lain
c030e62254 afterStoreSetup: refactor. 2019-03-13 11:57:30 +01:00
lain
1387dfb889 Load persistedStated with async/await. 2019-03-13 11:29:45 +01:00
shpuld
7ce8fe9214 merge develop, add mobile nav component 2019-03-12 23:50:54 +02:00
dave
cd9a7dd488 #436: integrate mastoAPI notifications 2019-03-12 17:16:57 -04:00
Henry Jameson
644eba87fe whoops 2019-03-12 22:14:41 +02:00
Henry Jameson
27cbe3ca65 レインせんぱいにサンキュー 2019-03-12 22:10:22 +02:00
Henry Jameson
ce8b5fcd11 fix embedded relationship card parsing 2019-03-12 21:49:03 +02:00
Henry Jameson
b9877a4323 actually use embedded relationship if it's present 2019-03-11 23:45:24 +02:00
Rond
03f1b95252 fixing typos and badly translated strings 2019-03-11 18:26:40 -03:00
Henry Jameson
a6a162177b instead of filtering nulls, let's just not have them in the first place 2019-03-11 23:08:09 +02:00
dave
130fb7ae1e #434 - fix plain text issue 2019-03-11 16:48:27 -04:00
Henry Jameson
4efcda1b41 Added some tests 2019-03-11 22:41:08 +02:00
dave
63d7c7bd80 #433: persistency of status form 2019-03-11 16:24:37 -04:00
dave
19015a4ae7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form 2019-03-11 13:41:55 -04:00
Shpuld Shpludson
4a27c6d8d3 Add floating post-status button on mobile 2019-03-11 16:51:37 +00:00
taehoon
d8e938bb5e Update user settings icon to pencil 2019-03-11 11:52:49 -04:00
dave
4f455eefe5 #433: do not remove the reply dialog 2019-03-11 10:52:28 -04:00
lambda
f52a33f711 Merge branch 'develop' into 'develop' 
Only connect to chat upon authenticating

Closes #403

See merge request pleroma/pleroma-fe!666
 2019-03-11 14:43:40 +00:00
Lorem Ipsum
3414fce53b I18n: Update Czech translation 2019-03-11 14:28:44 +00:00
HJ
89d684af4e Merge branch 'emoji-limit-profile' into 'develop' 
user_card.vue: Set img.emoji to 32×32px

See merge request pleroma/pleroma-fe!665
 2019-03-11 09:45:16 +00:00
Haelwenn (lanodan) Monnier
d0e78df220
user_card.vue: Copy over .status-content img styling 2019-03-11 05:14:49 +01:00
Edijs
9c60934786 Code refactoring 2019-03-10 18:13:01 -07:00
Edijs
8952761370 Version links to BE/FE 2019-03-10 18:06:51 -07:00
Henry Jameson
06d39b62a8 fixed tests, review fixes, now storing local users with downcase screen name for 
better compatibility
 2019-03-11 02:17:58 +02:00
Edijs
068c9724e4 Added new tab to display versions of BE/FE 2019-03-10 16:58:12 -07:00
shpuld
70d7ed3607 Make minId reset with minVisibleId to prevent gaps when showing new 2019-03-10 22:40:48 +02:00
slice
e618c6ffb0
Only connect to chat when authenticating in the first place 
To avoid duplication of the connection, the chat socket is destroyed
upon logging out.
 2019-03-10 11:25:36 -07:00
Henry Jameson
4a5aef8883 basic user and status actions implemented 2019-03-10 19:15:07 +02:00
Henry Jameson
0b1506a4c0 wip support for follower/following, a bit broken and with regression 2019-03-10 18:05:51 +02:00
slice
a67881b096
Check for websocket token before connecting to chat 
Closes #403. Previously, a socket to the chat channel would be opened if
chat is enabled, regardless if the user is logged in or not. This patch
only allows a connection to be opened if a wsToken (websocket token) is
present, which prevents websocket errors from unauthenticated users.
 2019-03-10 01:54:26 -08:00
Haelwenn (lanodan) Monnier
07a46f7736
user_card.vue: Set img.emoji to 32×32px 
Related to https://git.pleroma.social/pleroma/pleroma/merge_requests/792
 2019-03-10 01:56:51 +01:00
Henry Jameson
49b0f0a04a Fetching convos via MastoAPI. Had to change conversation component a bit for 
better support, since MastoAPI doesn't have coversation ids
 2019-03-09 18:33:49 +02:00
Henry Jameson
489f840d84 fix error 2019-03-09 11:54:11 +02:00
Henry Jameson
47211fb32c emoji adder 2019-03-09 02:23:50 +02:00
Henry Jameson
a02a74e9b9 attempt at fixing switching to user TL 2019-03-09 01:51:36 +02:00
Henry Jameson
fe624f6114 fix reply-to marker, also whoops console log 2019-03-09 01:34:15 +02:00
Henry Jameson
690c1dcd7a revert some stuff, turns out it's actually breaking. Fixed some local user things 2019-03-09 01:19:56 +02:00
Henry Jameson
4f3a220487 Since BE doesn't support fetching user by screen name over MastoAPI we'll gonna 
just fetching it over QvitterAPI real quick :DDDDDDDDD
 2019-03-08 22:40:57 +02:00
dave
3468c0fd04 #432 - prevent post status form textarea keydown event propagation 2019-03-08 13:53:46 -05:00
Henry Jameson
853e0bc26f switch to mastoapi for user timeline 2019-03-08 00:50:58 +02:00
Henry Jameson
ee49409049 Partially transitioned user data to MastoAPI. Added support for fetching 
relationship data. Upgraded code to be more resilient to nulls caused by missing
data in either APIs
 2019-03-08 00:35:30 +02:00
Henry Jameson
6e2946f352 switch direct messages to mastoapi 2019-03-07 20:21:07 +02:00
Henry Jameson
8522063b2c switch public and TWKN to MastoAPI 2019-03-07 20:16:35 +02:00
Henry Jameson
c038d0c12a undo this change since BE returns empty object for relationship, add in a 
separate MR
 2019-03-07 20:04:29 +02:00
Henry Jameson
2e59ab738b updates normalizer for proper user handling and adds support for friends tl via mastoapi 2019-03-07 19:49:41 +02:00
Shpuld Shpludson
09736691ea Merge branch '420-redo-user-card-content' into 'develop' 
Re-do UserCardContent Component CSS

Closes #420

See merge request pleroma/pleroma-fe!642
 2019-03-07 16:38:45 +00:00
Shpuld Shpludson
82cd1252b5 Merge branch '415-timeline' into 'develop' 
Fix timeline updating bug when scrolled down

Closes #415

See merge request pleroma/pleroma-fe!644
 2019-03-07 16:34:43 +00:00
Shpuld Shpludson
09b0f6dd87 Merge branch 'issue-392-other-user-stale-data' into 'develop' 
#392: stale data served to new user account

Closes #392

See merge request pleroma/pleroma-fe!625
 2019-03-07 16:33:22 +00:00
Shpuld Shpludson
e3b3ef156b Merge branch 'fix/remove-posts-immediately-by-blocking-someone' into 'develop' 
#330 Remove posts immediately by blocking someone

See merge request pleroma/pleroma-fe!589
 2019-03-07 16:07:01 +00:00
Shpuld Shpludson
2baff88e3f Merge branch 'fix/gallery-css' into 'develop' 
Fix gallery style - move hide button to top right

Closes #335

See merge request pleroma/pleroma-fe!579
 2019-03-07 16:03:32 +00:00
Shpuld Shpludson
bf1fa52e5e Merge branch 'fix/post-content-type' into 'develop' 
#327: Load post status content type from instance config

Closes #327

See merge request pleroma/pleroma-fe!641
 2019-03-07 16:03:06 +00:00
Shpuld Shpludson
c44f0a9bde Merge branch 'fix/fetch-activities-by-last-id' into 'develop' 
#406 Fetch activities by last id

See merge request pleroma/pleroma-fe!621
 2019-03-07 05:06:43 +00:00
Edijs
292cdfb24b Merge content types translations 2019-03-06 20:13:04 -08:00
Shpuld Shpludson
423e1b3b12 Merge branch 'i18n-cs' into 'develop' 
I18n: Add Czech translation

See merge request pleroma/pleroma-fe!627
 2019-03-06 20:23:46 +00:00
Shpuld Shpludson
de46ede8fd Merge branch 'issue-346-auto-post' into 'develop' 
#346: Hyperlink is not included

Closes #346

See merge request pleroma/pleroma-fe!626
 2019-03-06 20:22:12 +00:00
taehoon
aca3b37134 Use a cross browser safe solution to get scroll top 2019-03-06 12:10:29 -05:00
taehoon
5f51fe897d Revert modifier class notation 2019-03-05 21:52:04 -05:00
taehoon
37acb51df4 Update classname 2019-03-05 21:48:07 -05:00
taehoon
7bceabb5bd Rename UserCardContent to UserCard 2019-03-05 14:01:49 -05:00
taehoon
baf603a506 Update block class name of BasicUserCard component 2019-03-05 13:56:40 -05:00
taehoon
43c52cb950 Update modifier class notation 2019-03-05 13:25:31 -05:00
Henry Jameson
68b2d9ef56 compatibility with upcoming changes 2019-03-05 20:15:18 +02:00
taehoon
e0a66b989d Re-do UserCardContent css 2019-03-05 10:46:03 -05:00
Shpuld Shpludson
216073eb58 Merge branch 'fix/gallery-and-attachment-spacing' into 'develop' 
Unify spacing between gallery/link preview/attachment components

See merge request pleroma/pleroma-fe!638
 2019-03-05 14:40:20 +00:00
Edijs
f91e4a5801 Load post status content type from instance config 2019-03-04 21:29:56 -08:00
taehoon
ff9e55ae42 Generate cropped avatar image in the original file type 2019-03-04 21:22:32 -05:00
Shpuld Shpludson
3e4d465eba Merge branch 'patch-2' into 'develop' 
Update of the Occitan file.

See merge request pleroma/pleroma-fe!635
 2019-03-04 19:27:38 +00:00
Exilat
5a273d528f Update oc.json 2019-03-04 18:53:16 +00:00
Shpuld Shpludson
4ab3e29877 Merge branch 'develop' into 'develop' 
Portuguese translation update

See merge request pleroma/pleroma-fe!637
 2019-03-04 18:21:14 +00:00
shpuld
bd0485ad2f unify spacing between gallery/link preview/attachment components 2019-03-04 18:56:47 +02:00
Shpuld Shpludson
d6e9ad3b61 Merge branch 'develop' into 'develop' 
Update and complete the Esperanto translation

See merge request pleroma/pleroma-fe!630
 2019-03-04 16:11:17 +00:00
Shpuld Shpludson
893767b780 Merge branch 'issue-417-profile-tab' into 'develop' 
Issue 417 profile tab

Closes #417

See merge request pleroma/pleroma-fe!634
 2019-03-04 16:09:23 +00:00
aaabulafiaaa
a2a3bda1f6 more pt strings 2019-03-04 08:36:35 -03:00
aaabulafiaaa
116a51e949 more pt strings 2019-03-03 19:42:02 -03:00
aaabulafiaaa
ae1a9a8626 More strings 2019-03-03 19:03:11 -03:00
rondnelly assis
793abed7ed Translating more strings 2019-03-03 21:55:16 +00:00
dave
0ea9e4ca14 #418: update timeago margin to align with icons 2019-03-03 14:15:53 -05:00
dave
f392668b73 #418: update notification timeago format 2019-03-03 14:11:38 -05:00
Exilat
3e16b5a2e0 Update of the Occitan file. 
Not at 100% but more complete then what it was.
 2019-03-03 19:06:32 +00:00
dave
5a0bb29f02 #417: reset tab from the outside 2019-03-03 13:38:48 -05:00
dave
3d30ad1dda #417: refresh tab on user profile only 2019-03-03 12:53:01 -05:00
dave
10711f9045 #417: reset tab status when active user changes 2019-03-03 12:15:55 -05:00
shpuld
c7e180080a more work with notifications drawer 2019-03-03 16:33:40 +02:00
Henry Jameson
6184c88ac7 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:45:17 +02:00
Henry Jameson
6841f516fc fix broken statuses 2019-03-02 20:39:04 +02:00
taehoon
94b0321c71 Update font-size of username in UserCardContent component 2019-03-02 12:58:17 -05:00
Aditoo17
93f5f94698 I18n: Add Czech translation 2019-03-02 18:25:49 +01:00
Tirifto
a884bbb6a6
Update and complete the Esperanto translation 2019-03-02 17:50:59 +01:00
Shpuld Shpludson
c4f8426349 Re-do status header a bit, add more consistent spacing to status 2019-03-02 16:35:38 +00:00
Shpuld Shpludson
6f903016a4 Merge branch 'fix/fetching-error-by-tag' into 'develop' 
#402 Fix fetching error by tag

See merge request pleroma/pleroma-fe!622
 2019-03-02 15:48:54 +00:00
shpuld
1d3b1ac934 start working on one tap notifications 2019-03-02 16:57:32 +02:00
shpuld
068da3cf9f Fix JS error when no statuses returned 2019-03-02 14:57:41 +02:00
jasper
81e89fed3d Fetch activites by last id 2019-03-01 12:53:24 -08:00
jasper
c26f32ed92 Fix fetching error by tag 2019-03-01 10:20:25 -08:00
Shpuld Shpludson
53e104dc32 Merge branch 'issue-388-request-count-broken' into 'develop' 
#388: get follow request on a real-time basis

Closes #388

See merge request pleroma/pleroma-fe!619
 2019-03-01 18:03:30 +00:00
dave
f3f9fbe302 #392: clean up notification stopping section 2019-03-01 11:59:50 -05:00
dave
bbab1b1dc6 #346: Hyperlink is not included 2019-02-28 21:03:35 -05:00
dave
bbe1821be7 #392: update object.entries 2019-02-28 14:44:43 -05:00
dave
f5adb62e2e #392: update defaultState into a function 2019-02-28 14:27:47 -05:00
dave
ba2e05bc63 #392: stale data served to new user account 2019-02-28 14:03:44 -05:00
Shpuld Shpludson
bbe4f3e3af Merge branch 'issue-410-greyout-checkbox' into 'develop' 
#410: disable checkbox when parent is disabled

Closes #410

See merge request pleroma/pleroma-fe!624
 2019-02-28 18:02:15 +00:00
dave
cccf33d6dd #388: update naming properly 2019-02-28 12:53:37 -05:00
taehoon
36460fd384 Fix layout overflow issue 2019-02-28 12:48:14 -05:00
taehoon
a8d11b22e7 Add a class to screen name 2019-02-28 12:41:20 -05:00
taehoon
24e1adf6df Add back accidently removed logic 2019-02-28 12:41:20 -05:00
taehoon
0e86681aba Merge all slots of BasicUserCard into one 2019-02-28 12:41:20 -05:00
taehoon
6e41b4b546 Revert "Minor mobile layout improvement for BasicUserCard" 
This reverts commit 1cd964bffff3ae4d324d0ab99e5c218eae7cd0ca.
 2019-02-28 12:41:20 -05:00
taehoon
d5f8e2b1ee Minor mobile layout improvement for BasicUserCard 2019-02-28 12:41:20 -05:00
taehoon
651c97153b Use native filter function 2019-02-28 12:41:20 -05:00
taehoon
a6f2af4ad9 Shorten a classname 2019-02-28 12:41:20 -05:00
taehoon
c5519fa587 Improve mobile layout of user card 2019-02-28 12:41:20 -05:00
taehoon
1fecac9ba6 Update naming 2019-02-28 12:41:20 -05:00
taehoon
8dd42cfc65 Add back some css 2019-02-28 12:41:20 -05:00
taehoon
30f5bf1463 Remove legacy class names in BasicUserCard 2019-02-28 12:41:20 -05:00
taehoon
0d283c3f17 Remove UserCard 2019-02-28 12:41:20 -05:00
taehoon
96e7e8235d Migrate UserCard to FollowCard and FollowRequestCard 2019-02-28 12:41:20 -05:00
taehoon
390b2bcfee Add FollowRequestCard component 2019-02-28 12:41:20 -05:00
taehoon
4b0a11acef Improve action button size and position in BasicUserCard 2019-02-28 12:41:20 -05:00
taehoon
8923492e68 Remove needless div wrapper 2019-02-28 12:41:20 -05:00
taehoon
9ca805a991 Add new FollowCard component 2019-02-28 12:41:20 -05:00
taehoon
1337e42b2d Add third slot area to BasicUserCard 2019-02-28 12:41:20 -05:00
taehoon
784523b8ec Use big avatar in BasicUserCard 2019-02-28 12:41:20 -05:00
taehoon
3ab42efbc3 Remove unused component local registration 2019-02-28 12:41:20 -05:00
taehoon
3f9fd07f93 Remove non-existing prop binding 2019-02-28 12:41:20 -05:00
taehoon
bb1fac4bc2 Remove needless component local registration 2019-02-28 12:41:20 -05:00
taehoon
080786c945 Rewrite FollowList using hocs 2019-02-28 12:41:20 -05:00
taehoon
cb383df517 Fix bug to get wrapped component prop name list 2019-02-28 12:40:22 -05:00
taehoon
5c43374588 Clean up addFollowers action 2019-02-28 12:40:22 -05:00
taehoon
3a689ef8ee Allow HOCs to accept additional props 2019-02-28 12:40:22 -05:00
dave
1c57a1c9b4 #410: disable checkbox when parent is disabled 2019-02-28 12:28:45 -05:00
Shpuld Shpludson
dc01f90dde Merge branch '386-display-invalid-user-profile' into 'develop' 
Show error message when visit profile page of invalid user

Closes #386

See merge request pleroma/pleroma-fe!606
 2019-02-28 17:19:14 +00:00
Shpuld Shpludson
24f3770fb5 Merge branch 'keyboard-binding' into 'develop' 
Keyboard binding

Closes #369

See merge request pleroma/pleroma-fe!593
 2019-02-28 17:11:31 +00:00
Edijs
882e024331 Revert code 2019-02-28 11:16:16 +08:00
jasper
4d026baf17 Fix fetching error by tag 2019-02-27 18:14:42 -08:00
jasper
9aec49bacb Fetch activites by last id 2019-02-27 17:45:08 -08:00
Maxim Filippov
267952b4e7 "Are you sure?" -> i18n 2019-02-28 04:05:54 +03:00
Maxim Filippov
c71f411ad6 Show only "app_name" and "valid_until" (OAuth tokens table) 2019-02-28 04:05:54 +03:00
Maxim Filippov
afbe524a2e use translations 2019-02-28 04:04:26 +03:00
Maxim Filippov
c10a15386a Code style 2019-02-28 04:04:26 +03:00
Maxim Filippov
2c7406d9a8 Add OAuth Tokens management to settings 2019-02-28 04:04:26 +03:00
dave
9f1214555e #388: remove empty line 2019-02-27 14:40:21 -05:00
dave
7c6446a9de #388: get follow request on a real-time basis 2019-02-27 14:38:10 -05:00
Shpuld Shpludson
95fb768b5a Fix #399 Make max attachments configurable 2019-02-27 14:38:58 +00:00
jasper
7698a6fb0d Remove posts by blocking or unfollowing 2019-02-26 23:21:04 -08:00
taehoon
b78227456e Better error handling 2019-02-26 12:26:04 -05:00
taehoon
e687b58091 Show error message when visit profile page of invalid user 2019-02-26 11:08:13 -05:00
jasper
4e79300232 Remove posts by blocking or unfollowing 2019-02-25 14:35:47 -08:00
HJ
d5348c13ff Merge branch 'issue-380-noification-unread' into 'develop' 
#380: fix false alarm for unread notifications

Closes #380

See merge request pleroma/pleroma-fe!614
 2019-02-25 20:08:45 +00:00
HJ
fef0981bc4 Merge branch 'issue-396-registration-bio-field' into 'develop' 
#396: update registration form

Closes #396

See merge request pleroma/pleroma-fe!612
 2019-02-25 19:58:17 +00:00
dave
7dbbd8e270 #380: simply and remove redundancy 2019-02-25 14:57:56 -05:00
dave
4e8b696797 #380: fix false alarm for unread notifications 2019-02-25 12:12:49 -05:00
Shpuld Shpludson
dbf46942d0 Merge branch 'fix/active-user-search-text-field' into 'develop' 
#387 Activate user search text field after click button.

See merge request pleroma/pleroma-fe!608
 2019-02-25 16:09:18 +00:00
dave
662e6bda14 #390: fixed the problem loading other user's media data 2019-02-25 10:21:17 -05:00
jasper
bbd3e6b10f Update search input name 2019-02-25 06:08:52 -08:00
dave
20c68d33eb #396: update en.json 2019-02-24 15:44:06 -05:00
dave
8275f2aa9a #396: update registration form 2019-02-24 14:30:29 -05:00
Edijs
66a105a519 Revert 2019-02-22 13:53:43 -07:00
dave
9bedf96b98 #389: add loading icon in search panel 2019-02-22 13:37:02 -05:00
Shpuld Shpludson
99051f4a55 Merge branch 'fix/fetch-error-when-login' into 'develop' 
#370 fix/fetch-error-when-login

See merge request pleroma/pleroma-fe!596
 2019-02-22 15:17:17 +00:00
Shpuld Shpludson
e34e1ccdae Merge branch '227-manage-blocks-mutes' into 'develop' 
Add Blocks / Mutes management tabs under user settings page

See merge request pleroma/pleroma-fe!578
 2019-02-22 14:54:12 +00:00
taehoon
22851a3a96 Remove needless code 2019-02-21 20:15:51 -05:00
jasper
34d723215b Activate user search text field 2019-02-21 11:20:46 -08:00
Henry Jameson
4136d9cdd1 bad defaults 2019-02-21 19:52:58 +02:00
Shpuld Shpludson
c3fa2c90e2 Merge branch 'issue-376-no-statuses' into 'develop' 
#376: update status timeline when it's empty

Closes #376

See merge request pleroma/pleroma-fe!601
 2019-02-21 17:24:39 +00:00
dave
09822cc15b #383: content type error 2019-02-21 11:16:11 -05:00
taehoon
eb22e7f462 Use Object.entries instead of Object.keys 2019-02-20 21:50:10 -05:00
taehoon
37eec09b9b Comment out the mutes tab 2019-02-20 13:30:31 -05:00
taehoon
5bd36c6476 Remove needless css 2019-02-20 13:30:31 -05:00
taehoon
46e1f30347 Fix indent 2019-02-20 13:30:31 -05:00
taehoon
85d43d17f5 Add missing translation strings 2019-02-20 13:30:31 -05:00
taehoon
32c112bc96 Remove pagination logic in fetchBlocks api 2019-02-20 13:30:31 -05:00
taehoon
395d212904 Add new strings to i18n 2019-02-20 13:30:31 -05:00
taehoon
a5162bd636 Add note for empty state to the lists using slot 2019-02-20 13:30:31 -05:00
taehoon
b4a5b5203f Minor css improvements of hocs 2019-02-20 13:30:31 -05:00
taehoon
8680046c4e Pass down slots into wrapped components 2019-02-20 13:30:31 -05:00
taehoon
6d4d705c51 Rename some options and add comments to HOCs 2019-02-20 13:30:31 -05:00
taehoon
339373b495 Improve chaining hocs using vue-compose 2019-02-20 13:30:30 -05:00
taehoon
f81b82b471 Use hoc definitions to be factor of factory 2019-02-20 13:30:30 -05:00
taehoon
8f608e060c Just save blocks/mutes instead of adding 2019-02-20 13:30:30 -05:00
taehoon
1fd9a1c7c0 Set blockIds and muteIds to the currentUser state only 2019-02-20 13:30:30 -05:00
taehoon
e91a94ff9c Add mutes tab 2019-02-20 13:30:30 -05:00
taehoon
09315b2780 Add a prop to force-refresh data to withSubscription hoc 2019-02-20 13:30:30 -05:00
taehoon
8c8a6edc78 Remove pagination support from block-list 2019-02-20 13:30:30 -05:00
taehoon
159e84532e Add withSubscription hoc 2019-02-20 13:30:30 -05:00
taehoon
8270274865 Update hocs to pass parent-scope bindings to the wrapped component 2019-02-20 13:30:30 -05:00
taehoon
52913d8f87 Complete functionality of BlockCard 2019-02-20 13:30:30 -05:00
taehoon
0220d3d304 Finally, added BlockCard 2019-02-20 13:30:30 -05:00
taehoon
5d6e1864a5 Update BasicUserCard template and add a slot for customization 2019-02-20 13:30:30 -05:00
taehoon
94e6de11b7 Add withList hoc and remove UserList component 2019-02-20 13:30:30 -05:00
taehoon
a817cc7cb4 Wire up ui to real blocks api data 2019-02-20 13:30:30 -05:00
taehoon
a56d2dfeb1 Add blocks tab with test data to user settings page 2019-02-20 13:30:30 -05:00
taehoon
4a737cbe45 Add reusable BasicUserCard and UserList components 2019-02-20 13:30:30 -05:00
taehoon
12df967cb6 Add withLoadMore hoc 2019-02-20 13:30:30 -05:00
dave
e20a7be3aa #376: update status timeline when it's empty 2019-02-20 10:13:28 -05:00
Shpuld Shpludson
cfdd885e04 Merge branch 'issue-371-user-setting-notification' into 'develop' 
#371: show notification when user setting's saved

Closes #371

See merge request pleroma/pleroma-fe!598
 2019-02-20 14:42:27 +00:00
Shpuld Shpludson
a49f6dbf65 Merge branch 'fix/follow-list' into 'develop' 
Watch user change in follow-list

Closes #360

See merge request pleroma/pleroma-fe!584
 2019-02-20 14:32:45 +00:00
dave
0caf59a911 #377: no exteral profile link for local users 2019-02-19 13:49:04 -05:00
Shpuld Shpludson
40159324b4 Merge branch 'issue-364-register-freeze' into 'develop' 
#364: update ap_id error with username

Closes #364

See merge request pleroma/pleroma-fe!597
 2019-02-19 18:00:39 +00:00
jasper
1e43a47c3c Update: Fix fetch error when login 2019-02-19 09:42:53 -08:00
dave
63cfe051c7 #371: show notification when user setting's saved 2019-02-19 12:38:49 -05:00
Shpuld Shpludson
53484ae4bf Merge branch 'issue-344-css-refactor' into 'develop' 
#344 - replace float: with flexbox, clean up

See merge request pleroma/pleroma-fe!566
 2019-02-19 16:49:44 +00:00
Shpuld Shpludson
0e1295edea Merge branch 'follow-requests-for-locked-accounts' into 'develop' 
Follow Request notification count for restricted accounts

See merge request pleroma/pleroma-fe!561
 2019-02-19 16:38:05 +00:00
shpuld
32df77c16a Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop 2019-02-19 18:34:09 +02:00
shpuld
4e0f934301 Clean up CSS a bit 2019-02-19 18:33:40 +02:00
Shpuld Shpludson
7b9a6f8d43 Merge branch '256-avatar-crop-popup' into 'develop' 
Add avatar cropper

Closes #256

See merge request pleroma/pleroma-fe!547
 2019-02-19 15:37:01 +00:00
Shpuld Shpludson
ed3c318be0 Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop' 
Fix followers/follows UI, fix #343 fix #340

Closes #340 and #343

See merge request pleroma/pleroma-fe!590
 2019-02-19 14:47:32 +00:00
dave
5251ccd708 #364: update ap_id error with username 2019-02-19 09:22:42 -05:00
Edijs
d032ce2758 Validate if there are any new status to show 2019-02-18 18:32:20 -07:00
jasper
b4709515f2 Fix error when login 2019-02-18 17:15:16 -08:00
jasper
d4a2376e12 fix/fetch-error-when-login 2019-02-18 12:32:08 -08:00
jasper
24d7f9917b Remove posts by blocking or following 2019-02-18 11:39:35 -08:00
Edijs
0d2922afb3 Remove event listener when component destroy 2019-02-17 14:37:24 -07:00
Edijs
642b0be0b2 Bind a keyboard to show new status 2019-02-17 14:31:13 -07:00
Edijs
c30dabbdd4 Rename: instanceSpecificPanelPresent 2019-02-17 14:24:14 -07:00
Edijs
e871e3f2ac Hide isp option if instance has panel disabled 2019-02-17 13:24:24 -07:00
shpuld
e801d78e9d Take over branch and fix some issues 2019-02-17 18:54:22 +02:00
lambda
a842cadd15 Parameter name changed. 2019-02-16 16:09:14 +00:00
Shpuld Shpludson
2fb768cfd8 Merge branch 'update-japanese-translation' into 'develop' 
update japanese translation

See merge request pleroma/pleroma-fe!586
 2019-02-16 15:45:04 +00:00
taehoon
3094c50ff9 Fix lint errors 2019-02-15 13:34:33 -05:00
taehoon
2de756aa0c Better error handling 2019-02-15 13:34:33 -05:00
taehoon
2132d58075 Remove cropped image size restriction 2019-02-15 13:34:33 -05:00
taehoon
b6d197ce1d Remove modal component 2019-02-15 13:34:33 -05:00
taehoon
b24db12e1c Make embedded image cropper 2019-02-15 13:34:33 -05:00
taehoon
546ba9eba9 Revert eslintrc changes 2019-02-15 13:34:33 -05:00
taehoon
b458b2ae5f Check if variable exists before using 2019-02-15 13:34:33 -05:00
taehoon
ddfdaf3284 Remove event listeners when destory ImageCropper 2019-02-15 13:34:33 -05:00
taehoon
228e6681e3 Localization of ImageCropper component 2019-02-15 13:34:33 -05:00
taehoon
205e38ffa9 Remove event listener when modal is destroyed 2019-02-15 13:34:33 -05:00
taehoon
09949fc7ee Crop avatar image using minWidth/minHeight 2019-02-15 13:34:33 -05:00
taehoon
a001ffecf0 Add back the existing translation string 2019-02-15 13:34:33 -05:00
taehoon
13725f040b Add avatar crop popup 2019-02-15 13:34:33 -05:00
jasper
6c8ccf2733 Remove posts immediately by blocking 2019-02-15 07:52:34 -08:00
HJ
4f95371081 Merge branch 'issue-361-preview-background' into 'develop' 
#361 - fix theme preview background

Closes #361

See merge request pleroma/pleroma-fe!588
 2019-02-15 12:29:08 +00:00
dave
8f0e6b5045 #361 - fix theme preview background 2019-02-15 07:20:52 -05:00
eugenijm
d831b81912 Added follow requests counter to nav bar to make it visible behorehand 2019-02-15 12:49:00 +03:00
jasper
daa10f3969 Fix console error - maximum call stack size exceeded 2019-02-15 00:01:13 -08:00
Hakaba Hitoyo
0f06cd6af5 update japanese translation 2019-02-15 13:16:34 +09:00
Edijs
3398817c25 watch only user 2019-02-14 13:25:22 -07:00
Edijs
0ca145ac95 Watch user change in follow-list 2019-02-14 13:19:00 -07:00
Henry Jameson
f41341b79b fix notifications 2019-02-14 21:43:32 +02:00
HJ
5d73a1dd06 Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'" 
This reverts merge request !551
 2019-02-14 19:15:59 +00:00
HJ
8d7ac0e14c Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'" 
This reverts merge request !573
 2019-02-14 19:11:17 +00:00
HJ
ee4c6f362b Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'" 
This reverts merge request !574
 2019-02-14 19:05:59 +00:00
Edijs
28660d6986 Issue #335 - place hide button on right hand 2019-02-14 10:21:10 -07:00
Edijs
50f0d21686 Use static height if gallery has single image 2019-02-14 09:52:23 -07:00
Shpuld Shpludson
295becd6c8 Merge branch 'hotfix/issues-in-autocomplete' into 'develop' 
#355 hotfix/issues in autocomplete

Closes #355

See merge request pleroma/pleroma-fe!574
 2019-02-14 14:50:58 +00:00
Henry Jameson
688906a61e fix convos 2019-02-14 00:11:11 +02:00
Xiaofeng An
19dd36945a resolve focus issue in the auto-complete for name field 2019-02-13 15:39:37 -05:00
Xiaofeng An
98c27fd812 resolve issue related to event handler 2019-02-13 07:38:53 -05:00
Xiaofeng An
2100cb247d resolve issue in prop binding 2019-02-13 07:38:13 -05:00
Xiaofeng An
64fab9d7bc this fixes #350 - v-model binding issue 2019-02-12 13:55:00 -05:00
Shpuld Shpludson
26954cb3dd Merge branch 'issue-341-repeat-auto-scroll' into 'develop' 
#341 - automatic scroll with repeats/reports

See merge request pleroma/pleroma-fe!568
 2019-02-12 16:06:23 +00:00
Edijs
5d0e51cae3 Fix styling 2019-02-12 09:00:09 -07:00
dave
25bb80a982 #341 - fix naming 2019-02-12 10:35:54 -05:00
Shpuld Shpludson
6f4fbcffc0 Merge branch 'patch-2' into 'develop' 
Update spanish translate - es.json

See merge request pleroma/pleroma-fe!564
 2019-02-12 15:25:52 +00:00
Shpuld Shpludson
6d8862dc9a Merge branch '300-fixed-background-issue' into 'develop' 
Fix fixed background issue

Closes #300

See merge request pleroma/pleroma-fe!518
 2019-02-12 15:25:18 +00:00
Shpuld Shpludson
25cfb04873 Merge branch 'fix/profile-banner-preview-width' into 'develop' 
#333 Fix max-width of profile banner in setting

See merge request pleroma/pleroma-fe!560
 2019-02-12 15:05:26 +00:00
Shpuld Shpludson
2bc1cc9ff9 Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop' 
#255 - implement autocomplete in non post forms

See merge request pleroma/pleroma-fe!551
 2019-02-12 14:55:18 +00:00
dave
493d542d92 #341 - automatic scroll with repeats/reports 2019-02-12 05:10:27 -05:00
jared
4d930c7c26 345 - fix long username issue in repeat status 2019-02-11 23:03:51 -05:00
dave
f2ce2e9176 #344 - replace float: with flexbox, clean up 2019-02-11 22:35:24 -05:00
tarteka
2226f80076 Update spanish translate - es.json 2019-02-11 18:29:56 +00:00
Edijs
dd1b256005 Fix typo 2019-02-11 11:08:25 -07:00
Edijs
9f3f1ee7cb Fix UI of followers list 2019-02-11 11:03:01 -07:00
Edijs
f3d2e41a9b Fix return 2019-02-11 07:45:22 -07:00
Edijs
9959c311a9 Fix clicking link - open new tab unless tag or mention 2019-02-11 07:38:12 -07:00
Shpuld Shpludson
b6bac4d06d Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop' 
Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
 2019-02-11 13:34:03 +00:00
Shpuld Shpludson
0e6134b32e Merge branch 'issue-332-update-follow-tabs' into 'develop' 
#332 - add follow/not follow button to follow list

See merge request pleroma/pleroma-fe!558
 2019-02-11 13:29:58 +00:00
taehoon
a20974faac Use correct syntax for pseudoelement 2019-02-11 06:56:46 -05:00
jasper
db465ff839 Fix max-width of profile banner in setting 2019-02-11 00:06:37 -08:00
Edijs
fc26f1852e Merge branch 'develop' into fix/hashtag-opening 2019-02-10 11:59:19 -07:00
taehoon
971e75aa64 Add translation strings 2019-02-10 13:26:08 -05:00
taehoon
750c308909 Support lightbox gallery navigation via arrow buttons and keyboard 2019-02-10 13:23:01 -05:00
dave
4b18989fef #332 - add follow/not follow button to follow list 2019-02-09 23:05:23 -05:00
Shpuld Shpludson
4bea3c525f Merge branch 'fix/subject-copying-composition-bug' into 'develop' 
#326 Subject copying composition bug

See merge request pleroma/pleroma-fe!550
 2019-02-09 20:47:29 +00:00
jo
7743e3b277 Add quick css fix for user profile bg img preview 2019-02-09 20:42:51 +00:00
jasper
0a43546564 Switch into Lodash 2019-02-09 04:18:52 -08:00
jasper
f75ec48a80 Switch into Lodash 2019-02-09 04:13:52 -08:00
shpuld
3fb531976a Change the async stuff to not render app before theme is loaded 2019-02-09 11:26:35 +02:00
Shpuld Shpludson
d2d06983c9 Merge branch 'patch-2' into 'develop' 
Update spanish translate

See merge request pleroma/pleroma-fe!549
 2019-02-09 07:06:40 +00:00
Shpuld Shpludson
5296d41372 Merge branch 'fix/js-error-in-tag-page' into 'develop' 
Fixed JS error in tag page

See merge request pleroma/pleroma-fe!543
 2019-02-09 06:56:46 +00:00
Shpuld Shpludson
531f150dd3 Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop' 
#254 Add option to hide filtered statuses

See merge request pleroma/pleroma-fe!539
 2019-02-09 06:47:29 +00:00
jasper
5b52e020e3 fixing conflicts 2019-02-08 13:20:47 -08:00
jasper
ced29a6482 fixing conflicts 2019-02-08 13:18:50 -08:00
jasper
92874b6902 Fxing conflicts 2019-02-08 13:13:11 -08:00
jasper
70c05a0c08 Fix showFeaturesPanel option as instance 2019-02-08 12:17:14 -08:00
Xiaofeng An
9f83aee1ed fix auto-complete field not taking the whole parent width in flex 2019-02-08 11:54:12 -05:00
Xiaofeng An
59cde429b9 fix naming 2019-02-08 11:40:54 -05:00
Xiaofeng An
63680227c1 select either textarea or input 2019-02-08 11:26:17 -05:00
jasper
e90e7ce2db Subject copying composition bug 2019-02-08 08:25:53 -08:00
Xiaofeng An
e8dc019afd remove rows attribute from input 2019-02-08 11:13:35 -05:00
Xiaofeng An
dd8531f9c9 move styles for AutoCompleteInput 2019-02-08 11:13:35 -05:00
Xiaofeng An
17c70fc0ef add id & placeholder props to AutoCompleteInput component 2019-02-08 11:13:35 -05:00
Xiaofeng An
128dcc637e make name field auto-complete 2019-02-08 11:13:35 -05:00
Xiaofeng An
2d91c9d949 make bio field auto-complete 2019-02-08 11:13:35 -05:00
Xiaofeng An
fb0cf64549 #255 - make AutoCompleteInput component 2019-02-08 11:13:35 -05:00
dave
910b63624b #291 - fixed typo 2019-02-08 10:40:03 -05:00
dave
d112d5b333 #291 - remove whitespace 2019-02-08 10:02:00 -05:00
dave
34169e692f #291 - enable media/favorite tabs with prefetched data 2019-02-08 09:56:45 -05:00
tarteka
b129049fed Update spanish translate 2019-02-08 13:42:02 +00:00
jasper
7818d6786b Add option to hide filtered statuses 2019-02-08 05:17:20 -08:00
jasper
10c7365451 Add option to hide filtered statuses 2019-02-08 04:31:44 -08:00
dave
b57b4c6e45 #291 - disable empty tabs in user profile panel 2019-02-08 05:31:06 -05:00
Edijs
0dc7c45f32 Code refactoring 2019-02-07 16:23:18 -07:00
HJ
62b3b9b8d4 Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop' 
Add admin and moderator indicators to the user profile

See merge request pleroma/pleroma-fe!519
 2019-02-07 22:45:08 +00:00
eugenijm
19dbdd24b4 Update user settings text: staff badges are only visible in user profile 
Use capitalized text in badges
 2019-02-08 01:33:24 +03:00
Edijs
d39e2643f5 Fix lint warning 2019-02-07 14:56:00 -07:00
Edijs
e44d8ad71e Extract tag name from href and open in same tab 2019-02-07 14:54:49 -07:00
Edijs
c0b833cb85 Added tag extractor method and spec 2019-02-07 14:46:10 -07:00
Shpuld Shpludson
9b49fa3c0c Merge branch '287-following-followers-tabs' into 'develop' 
Hide Following/Followers tabs if user has them disabled

Closes #287

See merge request pleroma/pleroma-fe!515
 2019-02-07 15:59:37 +00:00
Shpuld Shpludson
85e281d406 Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop' 
#301 - add an option for a default formatting

See merge request pleroma/pleroma-fe!541
 2019-02-07 15:55:54 +00:00
taehoon
55da7dbfde Fix naming 2019-02-07 10:53:36 -05:00
taehoon
fae93217b8 Show back followees/followers counts 2019-02-07 10:48:47 -05:00
taehoon
ea1d7f46b5 Always show my own followees/followers 2019-02-07 10:48:47 -05:00
taehoon
55fc31ea4d Hide followers and followees tabs when they are disabled 2019-02-07 10:48:47 -05:00
Shpuld Shpludson
05ef0432d3 Merge branch 'issue-315-csv-export' into 'develop' 
#315 - export all follows as CSV

See merge request pleroma/pleroma-fe!538
 2019-02-07 15:42:18 +00:00
dave
bd24c615d1 #315 - revert changes 2019-02-07 09:59:12 -05:00
dave
3128417176 #315 - separate export and fetch follows logic 2019-02-07 09:57:16 -05:00
Edijs
a215f6856d Always open tag in same instance 2019-02-06 21:26:32 -07:00
Edijs
19870c0b6d Fix issue while fetching timelines for tag page 2019-02-06 19:19:43 -07:00
Edijs
fafe258f2b Typo 2019-02-06 19:19:14 -07:00
Mark Felder
b3823b79b4 Grammar 2019-02-06 22:00:31 +00:00
shpuld
4dbc6a3c56 Fix repeater html not showing properly 2019-02-06 22:17:06 +02:00
Xiaofeng An
e107ed8ddc Merge branch 'develop' into feature/add-an-option-for-a-default-formatting 2019-02-06 14:28:50 -05:00
Xiaofeng An
460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
jasper
fbdb7d3d95 Add german translation for option label 2019-02-06 10:50:21 -08:00
Edijs
a12397cf38 Hashtag opens in same tab 2019-02-06 11:34:21 -07:00
dave
a3a9949a21 #315 - clean up the request 2019-02-06 13:18:54 -05:00
jasper
a57f8bdd68 Add option to hide filtered statuses 2019-02-06 10:18:13 -08:00
Shpuld Shpludson
6cca15bade Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop' 
create a login hint on mobile

Closes #308

See merge request pleroma/pleroma-fe!530
 2019-02-06 18:13:56 +00:00
Xiaofeng An
a40d1eb3a0 remove unnecessary div 2019-02-06 11:53:51 -05:00
dave
2f12ac7ea4 #315 - export all follows as CSV 2019-02-06 11:17:23 -05:00
eugenijm
fd4cd2e10a Make role badge visible only on user profile page 2019-02-06 18:07:37 +03:00
eugenijm
676e6da3a5 Add theming support for admin/moderator badges 2019-02-06 18:07:37 +03:00
eugenijm
d00b74b607 Refactor visibleRole for better readability 
Improve translation
 2019-02-06 18:07:37 +03:00
eugenijm
648f635429 Allow to configure visibility for admin and moderator badges 2019-02-06 18:07:10 +03:00
eugenijm
c714eb2600 Add admin and moderator indicators to the user card 2019-02-06 18:04:21 +03:00
Shpuld Shpludson
6a867f6ae3 Merge branch 'feature/split-hide-network-fixed' into 'develop' 
Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma-fe!536
 2019-02-06 14:38:50 +00:00
Maxim Filippov
0c5c889850 Rename "hide_following" to "hide_follows" 2019-02-06 14:21:13 +03:00
Xiaofeng An
f512ee2c3c move login hint into the main content 2019-02-06 05:01:32 -05:00
Xiaofeng An
e4c0bbddd9 Merge branch 'develop' into fix/create-a-login-hint-on-mobile 2019-02-06 04:37:00 -05:00
Shpuld Shpludson
2d333f99e8 Merge branch 'patch-1' into 'develop' 
Update es.json

See merge request pleroma/pleroma-fe!535
 2019-02-06 04:29:30 +00:00
Shpuld Shpludson
68e5360229 Merge branch 'fix/add-option-to-hide-features-panel' into 'develop' 
Add option to hide features panel

See merge request pleroma/pleroma-fe!529
 2019-02-06 04:21:06 +00:00
Maxim Filippov
18594569bd Split hide_network into hide_followers & hide_followings 2019-02-06 02:59:59 +03:00
tarteka
37c7d850f1 Update es.json 2019-02-05 22:20:45 +00:00
Edijs
52f5ffa862 Fix avatar link in search result 2019-02-05 15:11:17 -07:00
Xiaofeng An
d2436fb9e5 move hint inside Timeline component 2019-02-05 15:43:56 -05:00
Shpuld Shpludson
2db7774a3a Merge branch 'issue-316-empty-username' into 'develop' 
#316 - fix empty username issue

See merge request pleroma/pleroma-fe!531
 2019-02-05 19:58:45 +00:00
dave
0b24454561 #316 - fix empty username issue 2019-02-05 14:33:16 -05:00
Xiaofeng An
bf642ebab7 fix #308 - hide login hint on desktop 2019-02-05 13:48:12 -05:00
Xiaofeng An
c758d103bd fix #308 - show login hint above timeline when user is not logged in 2019-02-05 13:47:27 -05:00
Shpuld Shpludson
8e51c78471 Merge branch 'issue-138-html-escaping' into 'develop' 
#138 - escape html entities in BIO text

See merge request pleroma/pleroma-fe!522
 2019-02-05 15:24:31 +00:00
shpuld
5974dfebfb Fix mishandled @error in stillImage 2019-02-05 17:17:50 +02:00
dev92341
e3da156162 Add option to hide features panel (About page) 2019-02-05 06:12:14 -08:00
dev92341
1ee762cf6e Add option to hide features panel 2019-02-05 04:32:00 -08:00
dev92341
f2c6dd6581 Add option to hide features panel 2019-02-05 03:57:11 -08:00
dave
94fdc2d583 #138 - fix lint error 2019-02-04 15:06:38 -05:00
dave
e1f9298ef2 #138 - unescape user bio 2019-02-04 15:03:01 -05:00
dave
c1883f5282 #138 - escape html entities in BIO text 2019-02-04 14:25:21 -05:00
Shpuld Shpludson
448317338e Merge branch '309-add-logo-to-hamburger-menu' into 'develop' 
Add logo and sitename to the side drawer area

Closes #309

See merge request pleroma/pleroma-fe!517
 2019-02-04 19:00:38 +00:00
taehoon
13ee624341 Do not use BEM 2019-02-04 13:34:07 -05:00
taehoon
5675b9326c Improve readability using v-if and v-else 2019-02-04 13:30:33 -05:00
taehoon
4528a4cbfa Show logo/sitename in the side drawer only if logged out 2019-02-04 13:30:33 -05:00
taehoon
537631002b Add logo and sitename to the side drawer area 2019-02-04 13:30:32 -05:00
shpuld
54e7e0e31b merge develop and fix conflicts AGAIN 2019-02-04 19:49:23 +02:00
Shpuld Shpludson
3cd1deb133 Merge branch 'issue-154-shorten-cw-subject' into 'develop' 
Issue #154 shorten subject

Closes #154

See merge request pleroma/pleroma-fe!520
 2019-02-04 17:29:58 +00:00
dave
97fbc1d402 #312 - media uploader not working with same file in adjacent order 2019-02-04 10:45:26 -05:00
dave
9d72c7e1bd #154 - update long subject determine logic, meaningful variable names 2019-02-04 09:28:14 -05:00
dave
887f1def2e handle poster attachment with tall subjects 2019-02-04 03:16:55 -05:00
dave
06cf8628e5 shorten incredibly long content warning or subject 2019-02-03 23:47:26 -05:00
Shpuld Shpludson
bb335ea71b Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into 'develop' 
#307 - replace user links with router links in repeats

See merge request pleroma/pleroma-fe!516
 2019-02-04 04:22:33 +00:00
Shpuld Shpludson
d6ee6e8394 Merge branch '275-avatar-placeholder' into 'develop' 
Support avatar placeholder

Closes #275

See merge request pleroma/pleroma-fe!511
 2019-02-04 04:17:11 +00:00
taehoon
0483f1d636 Revert a change which can break the theme preview 2019-02-03 20:12:22 -05:00
taehoon
ee694d62eb Fix fixed background issue 2019-02-03 15:32:24 -05:00
Xiaofeng An
abf53838e2 #307 - replace user links with router links in repeats 2019-02-03 14:08:04 -05:00
taehoon
e7f43d6bc3 Use an existing image served by backend instead 2019-02-03 13:30:54 -05:00
Shpuld Shpludson
7115584882 Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into 'develop' 
#306 - fix conversation arrow smushed in notifications panel

See merge request pleroma/pleroma-fe!513
 2019-02-03 15:10:19 +00:00
Xiaofeng An
6d3a7809be #306 - fix conversation arrow smushed in notifications panel 2019-02-03 09:59:32 -05:00
Xiaofeng An
965a578561 Revert "#306 - fix conversation arrow smushed in notifications panel" 
This reverts commit 1e40e70efc.
 2019-02-03 09:49:22 -05:00
Shpuld Shpludson
d4991d0162 Revert "Merge branch 'feature/split-hide-network' into 'develop'" 
This reverts merge request !497
 2019-02-03 14:32:23 +00:00
shpuld
18ae7bd5f3 Combine friends/followers 2019-02-03 11:58:49 +02:00
shpuld
b614cb94e5 merge develop in 2019-02-03 10:13:09 +02:00
Shpuld Shpludson
c7ee2ed831 Merge branch '238-add-avatar-size-suggestion' into 'develop' 
Add avatar size instruction notice

Closes #238

See merge request pleroma/pleroma-fe!512
 2019-02-03 07:05:38 +00:00
Shpuld Shpludson
f0721ed83b Merge branch 'fix/default-inlined-videos' into 'develop' 
Change video playing default without bothering making it an instance configurable

See merge request pleroma/pleroma-fe!505
 2019-02-03 06:45:04 +00:00
Xiaofeng An
1e40e70efc #306 - fix conversation arrow smushed in notifications panel 2019-02-02 21:49:07 -05:00
taehoon
d8ad494081 Add avatar size instruction notice 2019-02-02 20:39:41 -05:00
taehoon
4833f79cc2 Fix class ordering issues related to avatar 2019-02-02 15:50:25 -05:00
taehoon
0b66a43a83 Improve reusability of UserAvatar component 2019-02-02 15:33:02 -05:00
shpuld
dbb16d56e2 follows/followers pagination ready for review 2019-02-02 22:29:10 +02:00
taehoon
89b9aed134 Move avatar css into a correct place 2019-02-02 14:33:13 -05:00
taehoon
d607e4195a Migrate StillImage to UserAvatar for avatars 2019-02-02 14:23:52 -05:00
taehoon
9c4092dbd5 Use a correct avatar placeholder image 2019-02-02 14:17:00 -05:00
taehoon
95b735ff72 Show placeholder image if avatar image url is broken 2019-02-02 14:11:36 -05:00
HJ
815b9d2391 Merge branch 'fix-max-id-for-notifications' into 'develop' 
Fix incorrect latest_id value in notifications_read request

See merge request pleroma/pleroma-fe!509
 2019-02-02 15:51:06 +00:00
eugenijm
b62d2c76e5 Use integer type of notitication ids (avoid redundant casting for getting maxId in addNewNotifications) 2019-02-02 18:40:47 +03:00
eugenijm
0ab2f17991 Explicitly cast notification ids to integers when using them for setting maxId 
This fixes the bug where BE receives incorrect `since_id` when marking
notifications as read.
 2019-02-02 17:04:09 +03:00
Shpuld Shpludson
0fba655cf0 Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into 'develop' 
fix #157 show screen_name when name is empty in retweet

Closes #157

See merge request pleroma/pleroma-fe!508
 2019-02-02 05:52:39 +00:00
Joshua Burch
7d93beb96d fix #157 show screen_name when name is empty in retweet 2019-02-01 17:40:06 -05:00
Joshua Burch
9eddaf6c3e fix #209 make name field length as wide as the bio field 2019-02-01 16:12:14 -05:00
Shpuld Shpludson
1a6207be1d Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop' 
Fix #298 Add option to tab switcher to not render background tabs

Closes #298

See merge request pleroma/pleroma-fe!504
 2019-01-31 19:21:49 +00:00
shpuld
a8c6b3f538 Change video playing default without bothering making it an instance configurable 2019-01-31 21:19:41 +02:00
shpuld
8ce513ed09 initial draft for follows/following pagination 2019-01-31 21:11:28 +02:00
Shpuld Shpludson
3e4c598af4 Merge branch 'fix/statistics' into 'develop' 
Fix statistics label visibility via configuration

See merge request pleroma/pleroma-fe!503
 2019-01-31 15:11:29 +00:00
shpuld
476bf0afe1 Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher 2019-01-31 17:00:31 +02:00
Edijs
6a8d10f0bb Fix statistics label visibility via configuration 2019-01-30 18:53:34 -07:00
shadowfacts
3c4cf5ed11 Only generate mentions string if there are mentions 
Otherwise, a user replying to themselves without mentioning anyone else will insert a space at the beginning of the reply text area, hiding the placeholder.
 2019-01-31 00:50:19 +00:00
shpuld
aaa5f1a638 Adjust margins for attachments/previews 2019-01-30 21:41:07 +02:00
shpuld
c7cffbb6c7 Merge branch 'develop' into feat/media-modal 2019-01-30 20:49:24 +02:00
lambda
b1facdf7ad Merge branch 'fix/timeline-too-eager-flush' into 'develop' 
Fix #290 Add a better check for fresh TL flushing

Closes #290

See merge request pleroma/pleroma-fe!494
 2019-01-30 17:51:12 +00:00
lambda
1717e70046 Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop' 
fix #292 dont show "load more" when bottomed out

Closes #292

See merge request pleroma/pleroma-fe!496
 2019-01-30 17:49:27 +00:00
lambda
0bd77149a0 Merge branch 'fix/tall-statuses-v2' into 'develop' 
More tall status related fixes that I didn't know was borkd

See merge request pleroma/pleroma-fe!498
 2019-01-30 17:47:46 +00:00