hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2774 commits 4 branches 0 tags 44 MiB
Commit graph

2774 commits

This branch
This branch
All branches
Author SHA1 Message Date
shpuld
e801d78e9d Take over branch and fix some issues 2019-02-17 18:54:22 +02:00
Henry Jameson
59196e1dd9 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  Parameter name changed.
  #361 - fix theme preview background
  Fix console error - maximum call stack size exceeded
  update japanese translation
 2019-02-16 19:51:10 +02:00
lambda
a842cadd15 Parameter name changed. 2019-02-16 16:09:14 +00:00
Shpuld Shpludson
2fb768cfd8 Merge branch 'update-japanese-translation' into 'develop' 
update japanese translation

See merge request pleroma/pleroma-fe!586
 2019-02-16 15:45:04 +00:00
taehoon
3094c50ff9 Fix lint errors 2019-02-15 13:34:33 -05:00
taehoon
2de756aa0c Better error handling 2019-02-15 13:34:33 -05:00
taehoon
2132d58075 Remove cropped image size restriction 2019-02-15 13:34:33 -05:00
taehoon
b6d197ce1d Remove modal component 2019-02-15 13:34:33 -05:00
taehoon
b24db12e1c Make embedded image cropper 2019-02-15 13:34:33 -05:00
taehoon
546ba9eba9 Revert eslintrc changes 2019-02-15 13:34:33 -05:00
taehoon
b458b2ae5f Check if variable exists before using 2019-02-15 13:34:33 -05:00
taehoon
ddfdaf3284 Remove event listeners when destory ImageCropper 2019-02-15 13:34:33 -05:00
taehoon
228e6681e3 Localization of ImageCropper component 2019-02-15 13:34:33 -05:00
taehoon
205e38ffa9 Remove event listener when modal is destroyed 2019-02-15 13:34:33 -05:00
taehoon
09949fc7ee Crop avatar image using minWidth/minHeight 2019-02-15 13:34:33 -05:00
taehoon
a001ffecf0 Add back the existing translation string 2019-02-15 13:34:33 -05:00
taehoon
13725f040b Add avatar crop popup 2019-02-15 13:34:33 -05:00
jasper
6c8ccf2733 Remove posts immediately by blocking 2019-02-15 07:52:34 -08:00
HJ
4f95371081 Merge branch 'issue-361-preview-background' into 'develop' 
#361 - fix theme preview background

Closes #361

See merge request pleroma/pleroma-fe!588
 2019-02-15 12:29:08 +00:00
dave
8f0e6b5045 #361 - fix theme preview background 2019-02-15 07:20:52 -05:00
HJ
7bc8fd1a5b Merge branch 'fix/maximum-call-stack-size-exceeded' into 'develop' 
#362 Fix console error - maximum call stack size exceeded

Closes #362

See merge request pleroma/pleroma-fe!587
 2019-02-15 10:09:33 +00:00
eugenijm
d831b81912 Added follow requests counter to nav bar to make it visible behorehand 2019-02-15 12:49:00 +03:00
jasper
daa10f3969 Fix console error - maximum call stack size exceeded 2019-02-15 00:01:13 -08:00
Hakaba Hitoyo
0f06cd6af5 update japanese translation 2019-02-15 13:16:34 +09:00
HJ
10990e1715 Merge branch 'fix-notifs' into 'develop' 
unfuck notifications

Closes #356

See merge request pleroma/pleroma-fe!583
 2019-02-14 20:43:48 +00:00
Edijs
3398817c25 watch only user 2019-02-14 13:25:22 -07:00
Edijs
0ca145ac95 Watch user change in follow-list 2019-02-14 13:19:00 -07:00
Henry Jameson
9a54d858df Merge branch 'fix-notifs' into shigusegubu 
* fix-notifs:
  fix notifications
 2019-02-14 22:15:44 +02:00
Henry Jameson
b8d594dc57 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop:
  Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
  Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
  Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'"
 2019-02-14 22:15:41 +02:00
Henry Jameson
f41341b79b fix notifications 2019-02-14 21:43:32 +02:00
HJ
8625a612cd Merge branch 'revert-2bc1cc9f' into 'develop' 
Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"

See merge request pleroma/pleroma-fe!582
 2019-02-14 19:19:58 +00:00
HJ
5d73a1dd06 Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'" 
This reverts merge request !551
 2019-02-14 19:15:59 +00:00
HJ
98c5e4a9d0 Merge branch 'revert-d6f9f34a' into 'develop' 
Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"

See merge request pleroma/pleroma-fe!581
 2019-02-14 19:15:03 +00:00
HJ
8d7ac0e14c Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'" 
This reverts merge request !573
 2019-02-14 19:11:17 +00:00
HJ
dfecbe0ab7 Merge branch 'revert-295becd6' into 'develop' 
Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'"

See merge request pleroma/pleroma-fe!580
 2019-02-14 19:09:32 +00:00
HJ
ee4c6f362b Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'" 
This reverts merge request !574
 2019-02-14 19:05:59 +00:00
Henry Jameson
f4e8b781a9 Merge remote-tracking branch 'upstream/develop' into shigusegubu 
* upstream/develop: (51 commits)
  fix convos
  resolve focus issue in the auto-complete for name field
  resolve issue related to event handler
  resolve issue in prop binding
  this fixes #350 - v-model binding issue
  #341 - fix naming
  #341 - automatic scroll with repeats/reports
  345 - fix long username issue in repeat status
  Update spanish translate - es.json
  Fix return
  Fix clicking link - open new tab unless tag or mention
  Fix max-width of profile banner in setting
  Fix unit test
  Typo
  #332 - add follow/not follow button to follow list
  Add quick css fix for user profile bg img preview
  Switch into Lodash
  Switch into Lodash
  Change the async stuff to not render app before theme is loaded
  fixing conflicts
  ...
 2019-02-14 20:17:22 +02:00
Edijs
28660d6986 Issue #335 - place hide button on right hand 2019-02-14 10:21:10 -07:00
Edijs
50f0d21686 Use static height if gallery has single image 2019-02-14 09:52:23 -07:00
Shpuld Shpludson
295becd6c8 Merge branch 'hotfix/issues-in-autocomplete' into 'develop' 
#355 hotfix/issues in autocomplete

Closes #355

See merge request pleroma/pleroma-fe!574
 2019-02-14 14:50:58 +00:00
Shpuld Shpludson
40b51b659e Merge branch 'fix-convos' into 'develop' 
fix convos

Closes #357

See merge request pleroma/pleroma-fe!575
 2019-02-14 14:20:03 +00:00
Henry Jameson
688906a61e fix convos 2019-02-14 00:11:11 +02:00
Xiaofeng An
19dd36945a resolve focus issue in the auto-complete for name field 2019-02-13 15:39:37 -05:00
Xiaofeng An
98c27fd812 resolve issue related to event handler 2019-02-13 07:38:53 -05:00
Xiaofeng An
2100cb247d resolve issue in prop binding 2019-02-13 07:38:13 -05:00
Shpuld Shpludson
d6f9f34ad8 Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop' 
hotfix/this fixes #350 - v-model binding issue

Closes #350

See merge request pleroma/pleroma-fe!573
 2019-02-13 04:48:05 +00:00
Xiaofeng An
64fab9d7bc this fixes #350 - v-model binding issue 2019-02-12 13:55:00 -05:00
Shpuld Shpludson
26954cb3dd Merge branch 'issue-341-repeat-auto-scroll' into 'develop' 
#341 - automatic scroll with repeats/reports

See merge request pleroma/pleroma-fe!568
 2019-02-12 16:06:23 +00:00
Edijs
5d0e51cae3 Fix styling 2019-02-12 09:00:09 -07:00
dave
25bb80a982 #341 - fix naming 2019-02-12 10:35:54 -05:00