moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,247 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

2247 Commits

Author SHA1 Message Date
Shpuld Shpludson cfdd885e04 Merge branch 'issue-371-user-setting-notification' into 'develop' 
#371: show notification when user setting's saved

Closes #371

See merge request pleroma/pleroma-fe!598
 2019-02-20 14:42:27 +00:00
Shpuld Shpludson a49f6dbf65 Merge branch 'fix/follow-list' into 'develop' 
Watch user change in follow-list

Closes #360

See merge request pleroma/pleroma-fe!584
 2019-02-20 14:32:45 +00:00
Shpuld Shpludson 22a0858ef4 Merge branch 'issue-377-local-user-no-link' into 'develop' 
#377: no exteral profile link for local users

Closes #377

See merge request pleroma/pleroma-fe!599
 2019-02-19 19:35:44 +00:00
dave 0caf59a911 #377: no exteral profile link for local users 2019-02-19 13:49:04 -05:00
Shpuld Shpludson 40159324b4 Merge branch 'issue-364-register-freeze' into 'develop' 
#364: update ap_id error with username

Closes #364

See merge request pleroma/pleroma-fe!597
 2019-02-19 18:00:39 +00:00
dave 63cfe051c7 #371: show notification when user setting's saved 2019-02-19 12:38:49 -05:00
Shpuld Shpludson 53484ae4bf Merge branch 'issue-344-css-refactor' into 'develop' 
#344 - replace float: with flexbox, clean up

See merge request pleroma/pleroma-fe!566
 2019-02-19 16:49:44 +00:00
Shpuld Shpludson 0e1295edea Merge branch 'follow-requests-for-locked-accounts' into 'develop' 
Follow Request notification count for restricted accounts

See merge request pleroma/pleroma-fe!561
 2019-02-19 16:38:05 +00:00
shpuld 32df77c16a Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop 2019-02-19 18:34:09 +02:00
shpuld 4e0f934301 Clean up CSS a bit 2019-02-19 18:33:40 +02:00
Shpuld Shpludson 7b9a6f8d43 Merge branch '256-avatar-crop-popup' into 'develop' 
Add avatar cropper

Closes #256

See merge request pleroma/pleroma-fe!547
 2019-02-19 15:37:01 +00:00
Shpuld Shpludson 8f96de2ba5 Merge branch 'patch-pleroma-615' into 'develop' 
#336: Deleted static/bg2.jpg, static/bgalt.jpg files

See merge request pleroma/pleroma-fe!555
 2019-02-19 15:27:54 +00:00
Shpuld Shpludson ed3c318be0 Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop' 
Fix followers/follows UI, fix #343 fix #340

Closes #340 and #343

See merge request pleroma/pleroma-fe!590
 2019-02-19 14:47:32 +00:00
dave 5251ccd708 #364: update ap_id error with username 2019-02-19 09:22:42 -05:00
HJ 962a33f887 Merge branch 'instance-specific-panel' into 'develop' 
Hide ISP option if instance has panel disabled

Closes #368

See merge request pleroma/pleroma-fe!592
 2019-02-17 21:27:58 +00:00
Edijs c30dabbdd4 Rename: instanceSpecificPanelPresent 2019-02-17 14:24:14 -07:00
Edijs e871e3f2ac Hide isp option if instance has panel disabled 2019-02-17 13:24:24 -07:00
shpuld e801d78e9d Take over branch and fix some issues 2019-02-17 18:54:22 +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
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 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
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