Commit Graph

3706 Commits

Author SHA1 Message Date
kaniini df18ef30d0 Merge branch 'issue/209-2' into 'develop'
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'

See merge request pleroma/pleroma-fe!838
2019-11-08 02:42:32 +00:00
Maksim ded022a1d2 '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa' 2019-11-08 02:42:32 +00:00
kaniini e0a1b14eab Merge branch 'feature/change-email' into 'develop'
Add ability to change user's email

Closes pleroma#1297

See merge request pleroma/pleroma-fe!983
2019-11-08 02:21:19 +00:00
Sergey Suprunenko e3381cdef1 Add ability to change user's email 2019-11-08 02:21:19 +00:00
kaniini 326b2416a0 Merge branch 'develop' into 'develop'
Make mammal theme look more like gargsite

See merge request pleroma/pleroma-fe!802
2019-11-08 01:33:50 +00:00
kaniini b32a43fae5 Merge branch 'translations-de' into 'develop'
translations-de-batch-1

See merge request pleroma/pleroma-fe!978
2019-11-08 01:29:02 +00:00
Matrix-Sasuke 18acc7af29 translations-de-batch-1 2019-11-08 01:29:01 +00:00
kaniini 092adf9831 Merge branch 'es-translate' into 'develop'
[i18n] Spanish update

Closes #383

See merge request pleroma/pleroma-fe!981
2019-11-08 01:12:09 +00:00
Tarteka 28524ab4a6 eu-translate update 2019-10-30 22:31:55 +01:00
Tarteka fe4845a7c1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop 2019-10-30 22:17:19 +01:00
Tarteka a178346f1e Merge branch 'master' of https://git.pleroma.social/pleroma/pleroma-fe into develop 2019-10-30 22:16:12 +01:00
HJ 74f5f168d6 Merge branch 'develop' into 'develop'
profile-banner rounding css, fixes #690

Closes #690

See merge request pleroma/pleroma-fe!979
2019-10-30 06:00:32 +00:00
DYM 1d2ddaf2d0 profile-banner rounding css, fixes #690 2019-10-30 03:15:57 +00:00
HJ 21989c673e Merge branch 'settings-refactor' into 'develop'
Settings refactor

See merge request pleroma/pleroma-fe!960
2019-10-29 07:41:29 +00:00
Henry Jameson b66564a30d Merge remote-tracking branch 'upstream/develop' into settings-refactor
* upstream/develop: (89 commits)
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  fix popper go behind the top bar
  migrate Popper to v-popover
  fix popper go behind the top bar
  fix eslint warnings
  reset font-size to normal text size using rem
  use top placement by default
  hide status preview popper when hover popper content
  ...
2019-10-29 09:36:16 +02:00
Henry Jameson c79b2501d2 fix indentation 2019-10-29 09:35:42 +02:00
Shpuld Shpludson 42f428d90e Merge branch 'eu-translate' into 'develop'
[i18n] basque update and fix

See merge request pleroma/pleroma-fe!966
2019-10-29 07:04:51 +00:00
Shpuld Shpludson c79da5c456 Merge branch '599' into 'develop'
Fix "Posts get cut off when there is not enough space to display them at the bottom"

Closes #599

See merge request pleroma/pleroma-fe!863
2019-10-29 06:37:23 +00:00
Shpuld Shpludson 3a3db35985 Merge branch 'patch-3' into 'develop'
Little fix to some strings on es.json

See merge request pleroma/pleroma-fe!967
2019-10-29 06:06:58 +00:00
taehoon 237d95b0f7 remove needless ref 2019-10-24 23:50:50 -04:00
taehoon fbd1922567 show preview popover when hover numbered replies 2019-10-24 22:55:02 -04:00
taehoon c5e391b606 refactor conditions 2019-10-24 22:41:15 -04:00
taehoon 644343ccda do not make too many nested div 2019-10-24 22:27:23 -04:00
taehoon f969e9ab3d add fetchStatus action 2019-10-24 22:21:33 -04:00
taehoon e00cf288f5 refactor status loading logic 2019-10-24 22:14:53 -04:00
taehoon 62b2648a3e split status preview popover into a separate component 2019-10-24 16:53:36 -04:00
taehoon 54a26be90c uninstall mobile-detect library 2019-10-24 16:13:00 -04:00
taehoon 95e211ccb7 listen both events 2019-10-24 16:11:28 -04:00
taehoon 052a00dadb minor css fix 2019-10-24 15:15:33 -04:00
taehoon 17295429e5 restrict distance at top side only 2019-10-24 15:15:33 -04:00
taehoon c009f17651 set different trigger event in desktop and mobile by default 2019-10-24 15:15:33 -04:00
taehoon c9ba37ba2c fix eslint warnings 2019-10-24 15:15:33 -04:00
taehoon 39e92e76b9 fix popper go behind the top bar 2019-10-24 15:15:33 -04:00
taehoon 85c897403a migrate Popper to v-popover 2019-10-24 15:15:33 -04:00
taehoon 2f7f6967fd fix popper go behind the top bar 2019-10-24 15:15:33 -04:00
taehoon e834b9d88b fix eslint warnings 2019-10-24 15:15:33 -04:00
taehoon 1504b272d2 reset font-size to normal text size using rem 2019-10-24 15:15:33 -04:00
taehoon 0f65280e20 use top placement by default 2019-10-24 15:15:33 -04:00
taehoon 72fe385ec4 hide status preview popper when hover popper content 2019-10-24 15:15:33 -04:00
taehoon 498d7bcb5e use better name 2019-10-24 15:15:33 -04:00
taehoon 5d6fcb3bb3 css cleanup 2019-10-24 15:15:33 -04:00
taehoon a26ec64b3b fix minor css issues in status preview 2019-10-24 15:15:33 -04:00
taehoon 565d53812b reposition popper after fetching status 2019-10-24 15:15:33 -04:00
taehoon 5faafdb428 use popper for status preview 2019-10-24 15:15:32 -04:00
HJ f5c37231e1 Merge branch 'improve-gallery-sizing-logic' into 'develop'
Improve gallery sizing logic

See merge request pleroma/pleroma-fe!975
2019-10-23 16:17:56 +00:00
taehoon d76b83efc8 set flex-shrink and flex-basis explicitly 2019-10-22 14:47:21 -04:00
taehoon b9c281c553 set flex amount correctly 2019-10-22 07:17:02 -04:00
taehoon ad04522206 update flex-grow calculation logic 2019-10-22 07:17:02 -04:00
taehoon 0396c6f29d keep image natural ratio in gallery row 2019-10-22 07:17:02 -04:00
taehoon 6c4d23714a populate gallery row height without getting width 2019-10-22 07:17:01 -04:00