Commit Graph

2523 Commits

Author SHA1 Message Date
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
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
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 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
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
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
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
HJ 0659d2fd3a Merge branch 'patch-1' into 'develop'
Make select tag use --inputText as text color

See merge request pleroma/pleroma-fe!693
2019-03-20 13:12:51 +00: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
HJ 96f9eab700 Merge branch 'mastoapi/emojis' into 'develop'
MastoAPI: emoji support

See merge request pleroma/pleroma-fe!659
2019-03-17 14:08:01 +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
Exilat 7babbce522 [i18n] Update oc.json 2019-03-15 17:23:30 +00: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