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

4365 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
96753e6a5f Merge branch 'revert-987b5162' into 'develop' 
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"

See merge request pleroma/pleroma-fe!710
 2019-03-27 08:51:35 +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
HJ
854d0e8051 Merge branch 'mastoapi/convos' into 'develop' 
Fetching convos via MastoAPI

See merge request pleroma/pleroma-fe!662
 2019-03-25 18:17:53 +00: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
HJ
153ad57007 Merge branch '435-mastoapi-composing-new-post' into 'develop' 
Transition to MastoAPI: composing new status and media upload

Closes #435

See merge request pleroma/pleroma-fe!686
 2019-03-25 16:42:20 +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