Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3574 commits 59 branches 16 tags 15 MiB
Commit graph

3574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
e5e9bb27f3 Move poll state handling to its own module 2019-06-20 13:02:04 +00:00
Shpuld Shpludson
eca533aab6 Merge branch 'fix/messed-up-long-polls' into 'develop' 
Fix/messed up long polls

See merge request pleroma/pleroma-fe!843
 2019-06-20 13:00:10 +00:00
Shpuld Shpludson
44a03922e6 Fix/messed up long polls 2019-06-20 13:00:10 +00:00
Wyatt Benno
066efd5b3c A small sass fix for #577 2019-06-20 16:15:49 +09:00
HJ
752ee9d70c Merge branch '584' into 'develop' 
Fix "Status submission box overlap and alignment issues"

Closes #584

See merge request pleroma/pleroma-fe!835
 2019-06-19 12:27:12 +00:00
taehoon
90fda1f245 reset margin property of form controls 2019-06-19 07:55:54 -04: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
Shpuld Shpludson
0cfa28a7de Merge branch 'feature/polls-attempt-2' into 'develop' 
Feature/polls attempt 2

See merge request pleroma/pleroma-fe!826
 2019-06-18 20:28:31 +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
HJ
69eff65130 Merge branch 'refactor-emoji-input' into 'develop' 
EmojiInput refactoring

Closes #565

See merge request pleroma/pleroma-fe!824
 2019-06-18 19:17:37 +00:00
Henry Jameson
46e0122067 review 2019-06-18 22:13:03 +03:00
Henry Jameson
0032802f0a review 2019-06-18 21:30:35 +03:00
HJ
e5020d6936 Update emoji-input.js 2019-06-18 17:49:43 +00:00
Shpuld Shpludson
c0c012ccf9 Merge branch 'fix-user-search' into 'develop' 
fix user search

See merge request pleroma/pleroma-fe!839
 2019-06-18 16:32:11 +00:00
HJ
3cd4201ce4 Merge branch '573' into 'develop' 
Apply font smoothing in webkit and firefox

Closes #573

See merge request pleroma/pleroma-fe!841
 2019-06-18 16:31:33 +00:00
HJ
195057040c Merge branch 'fix/minor-fixes-console-warnings-stretching' into 'develop' 
Misc fixes: Fix uploads stretching on chrome, fix warnings in console

See merge request pleroma/pleroma-fe!842
 2019-06-18 16:31:20 +00:00
Shpuld Shpludson
76efbcbe92 Misc fixes: Fix uploads stretching on chrome, fix warnings in console 2019-06-18 16:31:20 +00:00
taehoon
2b5ac611c9 apply font smoothing in webkit and firefox 2019-06-17 23:34:20 -04:00
Henry Jameson
de03eda9f3 fix user search 2019-06-17 23:39:30 +03:00
HJ
ac46de3972 Merge branch 'mastoapi-login-and-config-fixes' into 'develop' 
Mastoapi login and config fixes

See merge request pleroma/pleroma-fe!833
 2019-06-17 20:17:58 +00:00
HJ
22a3351208 Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js 2019-06-17 20:12:11 +00:00
Henry Jameson
5f4a8dcc05 properly position the caret after replacement 2019-06-17 21:24:10 +03:00
HJ
3ec9ef8975 Apply suggestion to docs/CONFIGURATION.md 2019-06-17 16:08:32 +00:00
HJ
886b097a67 Apply suggestion to docs/CONFIGURATION.md 2019-06-17 16:06:01 +00:00
HJ
201ea169fe Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:40:31 +00:00
HJ
8543bab582 Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:39:23 +00:00
HJ
934ca66d87 Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:38:54 +00:00
HJ
65520d7a01 Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:38:22 +00:00
HJ
ee9bacee7a Apply suggestion to docs/USER_GUIDE.md 2019-06-17 11:37:03 +00:00
HJ
8caf13bbce Apply suggestion to src/services/api/api.service.js 2019-06-17 08:20:02 +00:00
lain
8d2e63a8e4 Merge branch 'fix-mfa' into 'develop' 
fix MFA crashing on user-settings page

See merge request pleroma/pleroma-fe!834
 2019-06-17 07:33:39 +00:00
Henry Jameson
5a70eda5e8 fix 2019-06-16 21:54:27 +03:00
Henry Jameson
bda36c64c0 User guide + updates 2019-06-16 21:53:00 +03:00
Henry Jameson
06c84a9cf3 fix MFA crashing on user-settings page 2019-06-16 20:36:21 +03:00
Henry Jameson
b00da17788 Merge remote-tracking branch 'upstream/develop' into docs 
* upstream/develop: (374 commits)
  fix typo
  rename mutations according to actual property names
  fix
  fix
  fix logged out post-update
  fix user banner
  fix
  AMERICA
  comments
  No longer sending extra data, renamed some properties
  Revert "add TOTP/Recovery Form for mobile version"
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  i18n/Update Japanese translation
  render modal at the root level using portal
  install portal vue
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
  remove console spam
  i18n
  wire up user.description with masto api data
  ...
 2019-06-16 20:24:03 +03:00
Henry Jameson
b72aa97098 fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options 2019-06-16 20:23:07 +03:00
Henry Jameson
6744396f82 getting and setting user background via MastoAPI 2019-06-16 20:17:59 +03:00
Henry Jameson
e3638af031 Removed formattingOptionsEnabled in favor of relying on BE-provided list of 
accepted formatting options
 2019-06-16 20:16:52 +03:00
HJ
1db3c785d8 Merge branch 'masto-register-app-secret' into 'develop' 
Proper clientId/secret/token caching, MastoAPI registration

Closes #554

See merge request pleroma/pleroma-fe!806
 2019-06-16 11:18:21 +00:00
HJ
1fc460a7a5 Merge branch 'hotfix-token-auth' into 'develop' 
Fix broken token authentication

See merge request pleroma/pleroma-fe!831
 2019-06-13 19:05:05 +00:00
taehoon
de2504ad6c fix typo 2019-06-13 15:00:13 -04:00
Henry Jameson
acbeea59ff rename mutations according to actual property names 2019-06-13 10:11:17 +03:00
Henry Jameson
f9c3aabea4 Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret 
* upstream/develop:
  fix user banner
 2019-06-13 10:05:53 +03:00
Henry Jameson
0988065f50 fix 2019-06-13 10:05:22 +03:00
Henry Jameson
dba8d8910c fix 2019-06-13 10:00:06 +03:00
Henry Jameson
d551b39859 fix logged out post-update 2019-06-13 09:48:43 +03:00