Commits · eca533aab68322a6bb3b4fd91e62709c66daaff4 · Pleroma / pleroma-fe

Jun 20, 2019
- Merge branch 'fix/messed-up-long-polls' into 'develop' · eca533aa
  Shpuld Shpludson authored 5 years ago
  
  Fix/messed up long polls See merge request !843
  eca533aa
- Fix/messed up long polls · 44a03922
  Shpuld Shpludson authored 5 years ago
  
  44a03922
Jun 19, 2019
- Merge branch '584' into 'develop' · 752ee9d7
  HJ authored 5 years ago
  
  Fix "Status submission box overlap and alignment issues" Closes #584 See merge request !835
  752ee9d7
- reset margin property of form controls · 90fda1f2
  Tae Hoon authored 5 years ago
  
  90fda1f2
Jun 18, 2019
- Merge branch 'mr-origin-740' into 'develop' · c4fcdc71
  HJ authored 5 years ago
  
  Update french translation See merge request !829
  c4fcdc71
- Merge branch 'feature/polls-attempt-2' into 'develop' · 0cfa28a7
  Shpuld Shpludson authored 5 years ago
  
  Feature/polls attempt 2 See merge request !826
  0cfa28a7
- Feature/polls attempt 2 · 0eed2ccc
  lain authored 5 years ago and Shpuld Shpludson committed 5 years ago
  
  0eed2ccc
- Update translation with review comments · 57dbfc26
  dashie authored 5 years ago
  
  Verified
  
  57dbfc26
- Update file with current en.json · 64d7dd60
  dashie authored 5 years ago
  
  Verified
  
  64d7dd60
- Update fr.json · 3fcc4ba2
  Satak authored 5 years ago and dashie committed 5 years ago
  
  added missing ,
  Verified
  
  3fcc4ba2
- Update fr.json · ceffe72f
  Satak authored 5 years ago and dashie committed 5 years ago
  
  stoped at line 134, more to do below
  Verified
  
  ceffe72f
- Merge branch 'refactor-emoji-input' into 'develop' · 69eff651
  HJ authored 5 years ago
  
  EmojiInput refactoring Closes #565 See merge request !824
  69eff651
- review · 46e01220
  HJ authored 5 years ago
  
  46e01220
- review · 0032802f
  HJ authored 5 years ago
  
  0032802f
- Update emoji-input.js · e5020d69
  HJ authored 5 years ago
  
  e5020d69
- Merge branch 'fix-user-search' into 'develop' · c0c012cc
  Shpuld Shpludson authored 5 years ago
  
  fix user search See merge request !839
  c0c012cc
- Merge branch '573' into 'develop' · 3cd4201c
  HJ authored 5 years ago
  
  Apply font smoothing in webkit and firefox Closes #573 See merge request !841
  3cd4201c
- Merge branch 'fix/minor-fixes-console-warnings-stretching' into 'develop' · 19505704
  HJ authored 5 years ago
  
  Misc fixes: Fix uploads stretching on chrome, fix warnings in console See merge request !842
  19505704
- Misc fixes: Fix uploads stretching on chrome, fix warnings in console · 76efbcbe
  Shpuld Shpludson authored 5 years ago and HJ committed 5 years ago
  
  76efbcbe
- apply font smoothing in webkit and firefox · 2b5ac611
  Tae Hoon authored 5 years ago
  
  2b5ac611
Jun 17, 2019
- fix user search · de03eda9
  HJ authored 5 years ago
  
  de03eda9
- Merge branch 'mastoapi-login-and-config-fixes' into 'develop' · ac46de39
  HJ authored 5 years ago
  
  Mastoapi login and config fixes See merge request !833
  ac46de39
- Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js · 22a33512
  HJ authored 5 years ago
  
  22a33512
- properly position the caret after replacement · 5f4a8dcc
  HJ authored 5 years ago
  
  5f4a8dcc
- Apply suggestion to src/services/api/api.service.js · 8caf13bb
  HJ authored 5 years ago
  
  8caf13bb
- Merge branch 'fix-mfa' into 'develop' · 8d2e63a8
  lain authored 5 years ago
  
  fix MFA crashing on user-settings page See merge request !834
  8d2e63a8
Jun 16, 2019
- fix MFA crashing on user-settings page · 06c84a9c
  HJ authored 5 years ago
  
  06c84a9c
- fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided... · b72aa970
  HJ authored 5 years ago
  
  fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  b72aa970
- getting and setting user background via MastoAPI · 6744396f
  HJ authored 5 years ago
  
  6744396f
- Removed formattingOptionsEnabled in favor of relying on BE-provided list of · e3638af0
  HJ authored 5 years ago
  
  accepted formatting options
  e3638af0
- Merge branch 'masto-register-app-secret' into 'develop' · 1db3c785
  HJ authored 5 years ago
  
  Proper clientId/secret/token caching, MastoAPI registration Closes #554 See merge request !806
  1db3c785
Jun 13, 2019
- Merge branch 'hotfix-token-auth' into 'develop' · 1fc460a7
  HJ authored 5 years ago
  
  Fix broken token authentication See merge request !831
  1fc460a7
- fix typo · de2504ad
  Tae Hoon authored 5 years ago
  
  de2504ad
- rename mutations according to actual property names · acbeea59
  HJ authored 5 years ago
  
  acbeea59
- Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret · f9c3aabe
  HJ authored 5 years ago
  
  * upstream/develop: fix user banner
  f9c3aabe
- fix · 0988065f
  HJ authored 5 years ago
  
  0988065f
- fix · dba8d891
  HJ authored 5 years ago
  
  dba8d891
- fix logged out post-update · d551b398
  HJ authored 5 years ago
  
  d551b398
Jun 12, 2019
- Merge branch 'hotfix-user-background' into 'develop' · 2e77a3ff
  HJ authored 5 years ago
  
  fix user banner See merge request !828
  2e77a3ff
- fix user banner · d1fd3e3a
  HJ authored 5 years ago
  
  d1fd3e3a