Commit Graph

327 Commits

Author SHA1 Message Date
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
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
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
eugenijm d831b81912 Added follow requests counter to nav bar to make it visible behorehand 2019-02-15 12:49:00 +03: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
Edijs fc26f1852e Merge branch 'develop' into fix/hashtag-opening 2019-02-10 11:59:19 -07:00
dave 4b18989fef #332 - add follow/not follow button to follow list 2019-02-09 23:05:23 -05:00
shpuld 3fb531976a Change the async stuff to not render app before theme is loaded 2019-02-09 11:26:35 +02: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
Edijs c0b833cb85 Added tag extractor method and spec 2019-02-07 14:46:10 -07: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
dave a3a9949a21 #315 - clean up the request 2019-02-06 13:18:54 -05:00
dave 2f12ac7ea4 #315 - export all follows as CSV 2019-02-06 11:17:23 -05: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
Maxim Filippov 0c5c889850 Rename "hide_following" to "hide_follows" 2019-02-06 14:21:13 +03:00
Maxim Filippov 18594569bd Split hide_network into hide_followers & hide_followings 2019-02-06 02:59:59 +03:00
shpuld 54e7e0e31b merge develop and fix conflicts AGAIN 2019-02-04 19:49:23 +02: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