Commit graph

345 commits

Author SHA1 Message Date
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
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
dave d70928792d #448 - fix timeline fetch error when status text is null 2019-03-22 13:15:11 -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 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 af85a3f244 Switch to mastoapi 2019-03-21 21:27:10 -04:00
taehoon 9857002bf5 Add hideMutedPosts setting and wire up to post-returning endpoints 2019-03-21 16:33:02 -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 302310a653 Remove old muting logic 2019-03-21 16:19:09 -04:00
taehoon 3255950b0e Add mute/unmute featrue and mutes management tab 2019-03-21 16:19:03 -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 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
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
taehoon 6e60873a3d Switch to mastoapi for user search 2019-03-15 11:03:11 -04: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
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
Henry Jameson 4efcda1b41 Added some tests 2019-03-11 22:41:08 +02:00
Edijs 8952761370 Version links to BE/FE 2019-03-10 18:06:51 -07:00
Edijs 068c9724e4 Added new tab to display versions of BE/FE 2019-03-10 16:58:12 -07:00
Henry Jameson 47211fb32c emoji adder 2019-03-09 02:23:50 +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
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
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
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
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 cccf33d6dd #388: update naming properly 2019-02-28 12:53:37 -05:00
taehoon cb383df517 Fix bug to get wrapped component prop name list 2019-02-28 12:40:22 -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
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 2c7406d9a8 Add OAuth Tokens management to settings 2019-02-28 04:04:26 +03:00
dave 7c6446a9de #388: get follow request on a real-time basis 2019-02-27 14:38:10 -05: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
dave 4e8b696797 #380: fix false alarm for unread notifications 2019-02-25 12:12:49 -05:00
taehoon 32c112bc96 Remove pagination logic in fetchBlocks api 2019-02-20 13:30:31 -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 8c8a6edc78 Remove pagination support from block-list 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
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
lambda a842cadd15 Parameter name changed. 2019-02-16 16:09:14 +00:00