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

3797 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini
3dae1cf396 Merge branch 'ocd-triggered' into 'develop' 
achieve the perfect speeeeen in media-upload

See merge request pleroma/pleroma-fe!991
 2019-11-11 19:51:05 +00:00
Henry Jameson
9e774fffbf achieve the perfect speeeeen in media-upload 2019-11-11 21:45:40 +02:00
Shpuld Shpludson
7502ee9734 Merge branch '704' into 'develop' 
Fix "hideISP setting checkbox is broken"

Closes #704

See merge request pleroma/pleroma-fe!990
 2019-11-10 20:00:16 +00:00
taehoon
3c3f2c654e add hideISP to defaultState of config module 2019-11-10 14:42:01 -05:00
kaniini
c873a18c64 Merge branch 'feature/about-page' into 'develop' 
Feature/about page

Closes #699

See merge request pleroma/pleroma-fe!985
 2019-11-09 17:38:45 +00:00
Ariadne Conill
a2a94c4b7b add changelog entry 2019-11-09 11:33:47 -06:00
Ariadne Conill
c24f95b498 mrf transparency panel: refactor to use vuex mapState 2019-11-09 11:32:18 -06:00
Ariadne Conill
6d6b5f3dbb mrf transparency panel: remove unneeded components{} 2019-11-09 11:16:19 -06:00
Ariadne Conill
a4ae956a62 boot: cleanup resolveStaffAccounts 2019-11-09 00:34:05 -06:00
Ariadne Conill
6dfe3cc911 lint 2019-11-09 00:23:22 -06:00
Ariadne Conill
90f764224d about: add MRF transparency panel 2019-11-09 00:09:32 -06:00
Ariadne Conill
20ccd93a17 about: add staff panel 2019-11-08 23:21:07 -06:00
Ariadne Conill
5db77c839b about page: fix hiding of instance-specific panel, flow ToS and ISP better 2019-11-08 21:57:09 -06:00
Ariadne Conill
6cede475be nav panel: add link to about page 2019-11-08 21:53:53 -06:00
HJ
044c9ad056 Merge branch 'feature/redirect-external-user-to-id' into 'develop' 
[Feature] Redirect remote user to internal ID

See merge request pleroma/pleroma-fe!921
 2019-11-08 22:27:25 +00:00
Hakaba Hitoyo
e4820012a3 redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id 2019-11-08 22:27:25 +00:00
HJ
2b68134ab0 Merge branch 'emoji-optimizations' into 'develop' 
Emoji fixes, optimizations and improvements

Closes #690, #686, #682, #674, and #678

See merge request pleroma/pleroma-fe!969
 2019-11-08 22:01:42 +00:00
Henry Jameson
a3501d58d8 clear filter on reopen, fix error message in console 2019-11-08 23:57:20 +02:00
Henry Jameson
23137dfd4b reset position when reopening emoji picker 2019-11-08 21:44:36 +02:00
Henry Jameson
a69946923b eslint fix 2019-11-08 21:35:58 +02:00
Henry Jameson
a43f1614ca fix not being able to see unicode emojis when there few of them when searching 
on emoji-a-ton instances
 2019-11-08 21:28:51 +02:00
Henry Jameson
9338c81f4a replace sanity button with loading on scroll 2019-11-08 21:25:13 +02:00
kaniini
5679dcdd18 Merge branch 'eslint-fix' into 'develop' 
Fix eslint warnings

See merge request pleroma/pleroma-fe!984
 2019-11-08 18:46:44 +00:00
Henry Jameson
a38d16273d fix search not working, use computer property instead of state 2019-11-08 20:12:01 +02:00
Henry Jameson
0dcb696e26 Merge remote-tracking branch 'upstream/develop' into emoji-optimizations 
* upstream/develop: (95 commits)
  Lightbox/modal multi image improvements - #381
  '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
  Add ability to change user's email
  translations-de-batch-1
  eu-translate update
  profile-banner rounding css, fixes #690
  fix indentation
  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
  ...
 2019-11-08 19:48:31 +02:00
taehoon
c1478b0887 fix eslint warnings 2019-11-08 11:14:01 -05:00
Shpuld Shpludson
632773ba91 Merge branch 'issue_381' into 'develop' 
Lightbox/modal multi image improvements - #381

See merge request pleroma/pleroma-fe!982
 2019-11-08 06:16:26 +00:00
Wyatt Benno
f66026bf20 Lightbox/modal multi image improvements - #381 2019-11-08 06:16:26 +00:00
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
Henry Jameson
6ade3be5b4 fix loadEmojiInsane button submitting the form 2019-10-27 19:20:38 +02: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