Commit Graph

479 Commits

Author SHA1 Message Date
absturztaube fa6210872f Feature/add sticker picker
Squash to avoid storing commits with stickers in it to avoid possible copyright problems and excess storage space. --hj
2019-07-24 19:35:52 +00:00
tarteka 51fc0a5c52 Update es.json 2019-07-23 15:16:03 +00:00
Shpuld Shpludson e86f6edb7c Merge branch 'patch-2' into 'develop'
Update es.json

See merge request pleroma/pleroma-fe!794
2019-07-15 19:21:37 +00:00
Hakaba Hitoyo 54b45ec4a3 i18n/Update pedantic Japanese translation 2019-07-15 19:18:40 +00:00
Hakaba Hitoyo f665ac83e7 i18n/Update easy Japanese trasnlation 2019-07-15 19:18:20 +00:00
Eugenij 69a4bcb238 New search 2019-07-15 16:42:27 +00:00
taehoon 4f26299bd5 update copy 2019-07-10 21:01:08 -04:00
taehoon 0c52d69a52 update copy 2019-07-10 21:01:07 -04:00
taehoon ace3b399ff support i18n 2019-07-10 21:01:07 -04:00
Exilat fe500c44ed Update oc.json 2019-06-30 14:24:34 +00:00
HJ c4fcdc7125 Merge branch 'mr-origin-740' into 'develop'
Update french translation

See merge request pleroma/pleroma-fe!829
2019-06-18 20:39:59 +00:00
lain 0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Dashie 57dbfc269c
Update translation with review comments 2019-06-18 22:14:02 +02:00
Dashie 64d7dd60cc
Update file with current en.json 2019-06-18 21:22:22 +02:00
Satak 3fcc4ba288
Update fr.json
added missing ,
2019-06-18 21:22:21 +02:00
Satak ceffe72f6f
Update fr.json
stoped at line 134, more to do below
2019-06-18 21:22:15 +02:00
Maksim 77eceedbf7 Revert "add TOTP/Recovery Form for mobile version"
This reverts commit a3811f9448.
2019-06-12 20:16:55 +00:00
Hakaba Hitoyo 322c9fbfb6 i18n/Update Japanese translation 2019-06-11 12:10:47 +00:00
kaniini b4796ccbf6 Merge branch 'feature/notification-controls' into 'develop'
wire up notification settings

See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
Hakaba Hitoyo 443794b000 i18n/Add Japanese with kanji (2) 2019-05-29 05:31:03 +00:00
William Pitcock 855566f887 notification controls: redesign entirely 2019-05-25 23:44:36 +00:00
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
tarteka bacbfc1154 Update es.json 2019-05-15 09:16:49 +00: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