Commit Graph

2621 Commits

Author SHA1 Message Date
Henry Jameson ee94a6732a why did i do that 2019-03-21 22:49:26 +02:00
Henry Jameson 307b4ba698 Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
* upstream/develop: (47 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  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
  ...
2019-03-21 22:40:20 +02: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
Henry Jameson fe13b1b75a Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl
* upstream/develop: (47 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  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
  ...
2019-03-21 22:28:29 +02: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
Henry Jameson faef769b40 Merge remote-tracking branch 'upstream/develop' into masto-api/direct
* upstream/develop: (47 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  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
  ...
2019-03-21 22:11:02 +02: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
dave 5717d97182 #442 - update placeholder linebreak 2019-03-18 10:35:13 -04:00
dave 543cc0d285 #442 - clean up Bio placeholder text 2019-03-17 16:59:08 -04: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
lambda c626f84336 Merge branch 'afterstore-refactor' into 'develop'
afterStoreSetup: Move log in and theme load to afterStoreSetup.

See merge request pleroma/pleroma-fe!680
2019-03-15 13:03:19 +00:00
HJ ebc6a75d30 Merge branch 'issue-434-plain-text' into 'develop'
#434 - fix plain text issue

Closes #434

See merge request pleroma/pleroma-fe!675
2019-03-14 22:03:33 +00:00
William Pitcock f93d4a3754 after store: fix setting postFormats field 2019-03-14 21:35:45 +00:00
Henry Jameson 71c12fa3a5 fix user-card avatar falling into permament failed state 2019-03-14 23:07:28 +02:00
Henry Jameson 6420c93e98 fix flake id users not fetching correctly 2019-03-14 23:07:28 +02:00
Henry Jameson 885a3a77df fix console error 2019-03-14 18:50:51 +02:00
Edijs 3c5c09c74f Merge branch 'develop' into feature/version-info 2019-03-13 15:24:09 -07:00
lain 5318227c37 afterStoreSetup: Move log in and theme load to afterStoreSetup. 2019-03-13 13:29:34 +01:00
lambda 9fd44e4a52 Merge branch 'afterstore-refactor' into 'develop'
Afterstore refactor

See merge request pleroma/pleroma-fe!679
2019-03-13 12:08:28 +00:00