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

3591 commits

This branch
This branch
All branches
Author SHA1 Message Date
shpuld
1e2c304f76 fix typo 2019-03-28 22:11:05 +02:00
Shpuld Shpludson
ee9aa40001 Merge branch 'issues/#466' into 'develop' 
show replies count right after reply icon

Closes #466

See merge request pleroma/pleroma-fe!716
 2019-03-28 20:09:59 +00:00
Shpuld Shpludson
7e8c2acc98 Merge branch 'issue-433-status-reply-form' into 'develop' 
Issue 433 status reply form

Closes #433

See merge request pleroma/pleroma-fe!674
 2019-03-28 20:08:40 +00:00
Brenden Bice
8e4ddcb843 update store according to retweeted status 2019-03-28 13:20:09 -04:00
dave
a39fc49e84 #433 - update sort by for conversation 2019-03-28 10:02:33 -04:00
dave
e24145e233 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form 2019-03-28 09:54:55 -04:00
Brenden Bice
6b5a84e2b3 display replies_count right after reply icon 2019-03-28 03:47:00 -04:00
Brenden Bice
95639fbd63 expose replies_count from mastodon api 2019-03-28 03:46:41 -04:00
HJ
e2e3a65c44 Merge branch 'fix/convos-masto' into 'develop' 
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...

Closes #460

See merge request pleroma/pleroma-fe!715
 2019-03-27 20:55:24 +00:00
Henry Jameson
31a71ee3ee Apparently, MastoAPI gives status in ancestors if you try opening a repeat... 2019-03-27 22:50:19 +02:00
HJ
86696167b7 Merge branch 'issue-457-mastodon-tag-timeline' into 'develop' 
#457 - update tag timeline endpoint to MastoAPI

Closes #457

See merge request pleroma/pleroma-fe!707
 2019-03-27 20:44:58 +00:00
shpuld
0eff4bd0ac make side drawer use gesture service and fix its animations 2019-03-27 22:44:25 +02:00
dave
30084a1204 merge develop and resolve conflict 2019-03-27 16:41:05 -04:00
HJ
aed0943678 Merge branch 'mastoapi/actions' into 'develop' 
transition to MastoAPI: Basic user/statuses manipulation

See merge request pleroma/pleroma-fe!669
 2019-03-27 20:28:55 +00:00
Henry Jameson
66ab131bd4 Merge remote-tracking branch 'upstream/develop' into mastoapi/actions 
* upstream/develop:
  errata
  review
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  correctly paginate on MastoAPI
  #442 - update placeholder linebreak
  #442 - clean up Bio placeholder text
  wip support for follower/following, a bit broken and with regression
  switch direct messages to mastoapi
  switch public and TWKN to MastoAPI
  undo this change since BE returns empty object for relationship, add in a separate MR
  updates normalizer for proper user handling and adds support for friends tl via mastoapi
 2019-03-27 22:24:38 +02:00
HJ
4d66b9cf45 Merge branch 'mastoapi/followers' into 'develop' 
MastoAPI support for followers/friends(following)

See merge request pleroma/pleroma-fe!667
 2019-03-27 20:18:44 +00:00
Henry Jameson
c2c7e12aad review/remove error hiding 2019-03-27 22:18:43 +02:00
Henry Jameson
a5e71d1dd1 Merge remote-tracking branch 'upstream/develop' into mastoapi/followers 
* upstream/develop:
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  switch direct messages to mastoapi
  switch public and TWKN to MastoAPI
 2019-03-27 22:14:26 +02:00
Henry Jameson
ff18e339cf Merge remote-tracking branch 'upstream/develop' into mastoapi/followers 
* upstream/develop:
  #442 - update placeholder linebreak
  #442 - clean up Bio placeholder text
  undo this change since BE returns empty object for relationship, add in a separate MR
  updates normalizer for proper user handling and adds support for friends tl via mastoapi
 2019-03-27 22:12:51 +02:00
Henry Jameson
0a031aae20 errata 2019-03-27 22:04:59 +02:00
Henry Jameson
fb2aca06de review 2019-03-27 22:02:46 +02:00
dave
43e97e590c #433 - sort conversation for retweets and clean up 2019-03-27 16:00:54 -04:00
HJ
f6e779a084 Merge branch 'masto-api/direct' into 'develop' 
switch direct messages to mastoapi

See merge request pleroma/pleroma-fe!649
 2019-03-27 19:53:56 +00: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
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