Commit Graph

457 Commits

Author SHA1 Message Date
William Pitcock
28ca504576 wire up notification settings 2019-05-25 07:34:59 +00:00
j1t
4249a2fd6f Translation to Hebrew of everything other than theme_helpers and style. 2019-05-22 21:33:05 +03:00
j1t
3b3e4ffc54 Translate up to settings. 2019-05-22 01:46:08 +03:00
HJ
b78ad8998d Merge branch 'masto-remains' into 'develop'
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that

See merge request pleroma/pleroma-fe!792
2019-05-20 20:54:05 +00:00
HJ
b436e0dd12 Merge branch 'webpack-4-dart-sass' into 'develop'
Massive update for dependencies

See merge request pleroma/pleroma-fe!734
2019-05-20 18:09:14 +00:00
Henry Jameson
7976d118ca Cleanup, little documentation, localization 2019-05-15 20:44:35 +03:00
taehoon
beaf512573 add translation 2019-05-15 12:04:26 -04:00
taehoon
d76bd0044f fix typo 2019-05-15 12:04:26 -04:00
dave
9fc997500e #468 - add extra buttons for status actions 2019-05-15 12:04:25 -04:00
Henry Jameson
750dca4a10 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (116 commits)
  Fix small mistake in Polish translation
  link interaction avatars to the user profile
  Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
  use backendInteractor
  refactor api service functions using new helper
  clean up
  update favorite number earlier
  update status interaction upon retweet action response
  sync up favoritedBy with favorite/unfavorite action
  do not regenerate status object
  reduce needless calculation
  Move scope visibility notice to the status form, make it dismissible
  Revert "eliminate expandable prop in favor of inConversation"
  status attention doesn’t have relationship entities
  make it short
  fix wrong inlineExpanded
  expanded is always false, eliminate it
  eliminate expandable prop in favor of inConversation
  fix conversationId comparision bug using integer format
  Display additional scope description above the status form for mobile users.
  ...
2019-05-13 20:38:54 +03:00
Marcin Mikołajczak
caf9e627a7 Fix small mistake in Polish translation 2019-05-10 06:52:01 +00:00
HJ
177e53cf6a Merge branch 'mobile-scope' into 'develop'
Display additional scope description above the status form for mobile users.

Closes #505

See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
eugenijm
a89010843d Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice. 2019-05-08 16:50:39 +03:00
HJ
157d4e601e Merge branch 'fix/floating-button' into 'develop'
Mobile Post button fix

Closes #506

See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
eugenijm
4af343374a Move scope visibility notice to the status form, make it dismissible 2019-05-07 19:13:45 +03:00
tarteka
bfd25a5c3f Update es.json 2019-05-06 08:38:24 +00:00
taehoon
cf72ebb407 update copy 2019-05-03 11:40:05 -04:00
taehoon
5d0bae5569 update generic error message 2019-05-03 11:40:05 -04:00
taehoon
d115d98a1b add translations 2019-05-03 11:40:05 -04:00
taehoon
2cda9010df add user reporting modal 2019-05-03 11:40:05 -04:00
Shpuld Shpludson
0438031da4 Merge branch 'develop' into 'develop'
[i18n]Update oc.json

See merge request pleroma/pleroma-fe!777
2019-05-03 14:57:04 +00:00
tarteka
09253420a2 Update es.json 2019-05-03 00:22:14 +00:00
Exilat
b98bab52a9 Update oc.json 2019-05-01 16:40:40 +00:00
Shpuld Shpludson
b1bd5bd08e Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
# Conflicts:
#   src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
eugenijm
ae1496cfb4 Make floating post button configurable 2019-04-29 21:32:29 +03:00
taehoon
95bc2d727b add “export blocks” feature 2019-04-27 08:31:06 -04:00
taehoon
08eaf9bd33 make reusable Exporter component 2019-04-27 08:31:06 -04:00
taehoon
0ab2f9dfa5 add “block import” feature 2019-04-27 08:31:06 -04:00
taehoon
6d0e98a1c2 make Importer component reusable 2019-04-27 08:31:06 -04:00
Henry Jameson
e0247e21f6 Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (126 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
2019-04-27 12:26:17 +03:00
William Pitcock
55823b8d67 add BBCode strings 2019-04-26 22:48:21 +00:00
Henry Jameson
2b5cf61a8f firefox 2019-04-24 21:53:51 +03:00
shpuld
8af8f719e4 fix i18n 2019-04-22 21:37:27 +03:00
Exilat
ed9aa8df76 Update oc.json 2019-04-20 14:44:43 +00:00
Exilat
213891ac71 Update oc.json 2019-04-20 14:38:04 +00:00
Exilat
69468c7c41 Update oc.json 2019-04-20 14:35:14 +00:00
Exilat
44f18caf4d Update oc.json 2019-04-20 14:29:04 +00:00
taehoon
ac9ddfb1e2 support i18n 2019-04-17 11:32:49 -04:00
taehoon
d874ca905c support i18n 2019-04-14 23:44:50 -04:00
Henry Jameson
fd171da0dc attempt at making it work 2019-04-13 18:28:50 +03:00
Shpuld Shpludson
546ced43d9 Merge branch 'moderation-menu' into 'develop'
Moderation menu #310

See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
dave
70071b870f #469 - update text copy 2019-04-02 12:46:22 -04:00
dave
67258571c5 #469 - update behavior of safe_dm 2019-04-02 11:19:45 -04:00
eugenijm
6b6878bde0 Added moderation menu 2019-04-01 23:30:06 +03:00
Shpuld Shpludson
a595febcb8 Merge branch 'develop' into 'develop'
[i18n] Update oc.json for !611 and !691

See merge request pleroma/pleroma-fe!712
2019-04-01 19:49:16 +00:00
Shpuld Shpludson
3b38e1b8a7 Merge branch 'patch-2' into 'develop'
Update Polish translation

See merge request pleroma/pleroma-fe!719
2019-04-01 19:44:11 +00:00
HJ
3c2931529e Merge branch 'minimal-scopes-mode' into 'develop'
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode

See merge request pleroma/pleroma-fe!633
2019-04-01 19:32:37 +00:00
jared
dee9ab7bda #470 - update button text capitalization 2019-04-01 13:04:40 -04:00
jared
6847e70a49 #470 - update i18n 2019-04-01 12:58:23 -04:00
Marcin Mikołajczak
6828c7d74c Update Polish translation 2019-03-31 13:50:51 +00:00