Commit Graph

3119 Commits

Author SHA1 Message Date
Maksim Pechnikov 30f054a628 add abortMFA 2019-06-08 15:33:49 +03:00
Maksim Pechnikov f1e8edab11 updated user_settings/setup otp 2019-06-08 15:05:26 +03:00
Maksim Pechnikov 1b1e182f27 add initStrategy to authFlow 2019-06-07 21:55:52 +03:00
Maksim Pechnikov 9b3a5f1b11 fix localization 2019-06-07 21:52:40 +03:00
Maksim Pechnikov a6c2563b62 fix typo 2019-06-07 21:48:49 +03:00
Maksim Pechnikov 94589b7769 fix localization 2019-06-07 09:01:59 +03:00
Maksim Pechnikov b9a64a523e update init LoginMethod 2019-06-06 22:19:07 +03:00
Maksim Pechnikov 0d31704c95 update authFlow 2019-06-06 14:13:28 +03:00
Maksim Pechnikov 4e1e6d9cc8 update authFlow 2019-06-06 13:31:52 +03:00
Maksim Pechnikov d0a23df5db fix localization 2019-06-05 22:36:52 +03:00
Maksim Pechnikov 8447ab9d3b update login_form & mfa_form 2019-06-05 17:04:33 +03:00
Maksim Pechnikov e4a34d94a6 Merge branch 'develop' into feature/2fa 2019-06-04 22:26:20 +03:00
Maksim Pechnikov 1567d5e72c update login_form, and add mfa_form 2019-06-04 22:20:21 +03:00
HJ e9e7b36c69 Merge branch 'fix/avatars-in-who-to-follow-page-are-missing' into 'develop'
Fix/Small fix in the who to follow page

See merge request pleroma/pleroma-fe!820
2019-06-04 08:04:47 +00:00
Hakaba Hitoyo 809d872b2d Fix/Small fix in the who to follow page 2019-06-04 08:04:47 +00:00
Shpuld Shpludson 7ce9b7be07 Merge branch 'fix/remove-notifications-console-spam' into 'develop'
fix: Remove some console spam

See merge request pleroma/pleroma-fe!818
2019-06-01 09:15:53 +00:00
shpuld 4526939dae remove console spam 2019-06-01 12:10:00 +03: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
feld 9c0ec9b794 Merge branch 'fix/interactions-i18n' into 'develop'
Interactions i18n

See merge request pleroma/pleroma-fe!817
2019-05-31 15:19:10 +00:00
Mark Felder f67f14495b i18n 2019-05-31 10:13:06 -05:00
Maksim Pechnikov fa99aa4d47 fix fetch codes 2019-05-31 16:01:12 +03:00
Maksim Pechnikov f934525ced update MFA settings 2019-05-31 15:58:36 +03:00
Maksim Pechnikov 49177babf6 update MFA settings 2019-05-31 09:13:29 +03:00
Maksim Pechnikov 740d3f7394 Merge branch 'develop' into feature/2fa 2019-05-30 08:15:45 +03:00
Shpuld Shpludson 50618b81c8 Merge branch '543' into 'develop'
Fix "stale user settings shown after save"

Closes #543

See merge request pleroma/pleroma-fe!813
2019-05-29 17:08:27 +00:00
Shpuld Shpludson 6045708a5d Merge branch 'fix-dropdown' into 'develop'
move drowdown menu to popper

Closes #559

See merge request pleroma/pleroma-fe!814
2019-05-29 16:55:28 +00:00
taehoon 0532995847 wire up user.description with masto api data 2019-05-29 12:32:14 -04:00
Maksim Pechnikov a8f5f3f215 update MFA settings 2019-05-29 17:18:12 +03:00
HJ 152617e20d Merge branch 'i18n/add-pedantic-japanese-2' into 'develop'
i18n/Add Japanese with kanji (2)

Closes #522

See merge request pleroma/pleroma-fe!816
2019-05-29 05:31:03 +00:00
Hakaba Hitoyo 443794b000 i18n/Add Japanese with kanji (2) 2019-05-29 05:31:03 +00:00
Maksim Pechnikov 2545d8beb5 update MFA settings 2019-05-28 08:30:18 +03:00
Maksim Pechnikov 7196de22d2 remove unused css 2019-05-27 08:20:07 +03:00
Henry Jameson 6c7eeb93fe move drowdown menu to popper 2019-05-27 00:13:08 +03:00
William Pitcock 855566f887 notification controls: redesign entirely 2019-05-25 23:44:36 +00:00
William Pitcock ac97cd3e46 entity normalizer: collapse data.pleroma if blocks 2019-05-25 22:59:04 +00:00
William Pitcock 28ca504576 wire up notification settings 2019-05-25 07:34:59 +00:00
Maksim Pechnikov 17a7b5af80 fix typo 2019-05-23 21:49:04 +03:00
Maksim Pechnikov 291da74630 updated localization 2019-05-23 21:26:41 +03:00
Maksim Pechnikov 54c0262c00 updated login form 2019-05-23 21:03:38 +03:00
Maksim Pechnikov 097c9cf75d fix mfa settings 2019-05-23 17:28:49 +03:00
Maksim Pechnikov b643a95bb5 fix lint 2019-05-23 16:43:38 +03:00
Maksim Pechnikov 661456e9f9 Merge branch 'develop' into feature/2fa 2019-05-23 14:50:53 +03:00
HJ ab34a75bcf Merge branch '556' into 'develop'
Fix User links/mentions opening in new tab issue

Closes #556

See merge request pleroma/pleroma-fe!808
2019-05-23 05:34:15 +00:00
taehoon 2af35b8404 do not miss statusnet_profile_url of mentions 2019-05-22 23:47:20 -04:00
HJ 45961331b6 Merge branch 'update-hebrew-transalation' into 'develop'
Update he.json

See merge request pleroma/pleroma-fe!807
2019-05-22 18:50:32 +00:00
j1t 4249a2fd6f Translation to Hebrew of everything other than theme_helpers and style. 2019-05-22 21:33:05 +03:00
Maksim Pechnikov 649627b00f updated mfa settings 2019-05-22 17:26:18 +03:00
Maksim Pechnikov 7d372e7fe5 updated localization 2019-05-22 16:47:30 +03:00
Maksim Pechnikov ec883a6d4b add mfa_api.js 2019-05-22 16:07:23 +03:00
Maksim Pechnikov e27420cd5a update login form 2019-05-22 15:59:09 +03:00