sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,216 Commits 159 Branches 3 Tags 443 MiB
Commit Graph

2216 Commits

Author SHA1 Message Date
Shpuld Shpludson 4800169f36 Merge branch 'cherry-pick-254b0afa' into 'master' 
Merge default content-type fix into master

See merge request pleroma/pleroma-fe!609
 2019-02-22 16:34:29 +00:00
Shpuld Shpludson 2d453e6355 Merge branch 'issue-383-content-type' into 'develop' 
#383: content type error

Closes #383

See merge request pleroma/pleroma-fe!603

(cherry picked from commit 254b0afab7)

09822cc1 #383: content type error
 2019-02-22 16:03:58 +00:00
Henry Jameson 533597fe25 bad defaults 2019-02-21 20:27:29 +02: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
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
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
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
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
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
Shpuld Shpludson 6f4fbcffc0 Merge branch 'patch-2' into 'develop' 
Update spanish translate - es.json

See merge request pleroma/pleroma-fe!564
 2019-02-12 15:25:52 +00:00
Shpuld Shpludson 6d8862dc9a Merge branch '300-fixed-background-issue' into 'develop' 
Fix fixed background issue

Closes #300

See merge request pleroma/pleroma-fe!518
 2019-02-12 15:25:18 +00:00
Shpuld Shpludson 25cfb04873 Merge branch 'fix/profile-banner-preview-width' into 'develop' 
#333 Fix max-width of profile banner in setting

See merge request pleroma/pleroma-fe!560
 2019-02-12 15:05:26 +00:00
Shpuld Shpludson 2bc1cc9ff9 Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop' 
#255 - implement autocomplete in non post forms

See merge request pleroma/pleroma-fe!551
 2019-02-12 14:55:18 +00:00
Shpuld Shpludson 8cce505cf5 Merge branch '345-long-username' into 'develop' 
345 - fix long username issue in repeat status

Closes #345

See merge request pleroma/pleroma-fe!567
 2019-02-12 14:45:54 +00:00
dave 493d542d92 #341 - automatic scroll with repeats/reports 2019-02-12 05:10:27 -05:00
jared 4d930c7c26 345 - fix long username issue in repeat status 2019-02-11 23:03:51 -05:00
tarteka 2226f80076 Update spanish translate - es.json 2019-02-11 18:29:56 +00:00
Edijs dd1b256005 Fix typo 2019-02-11 11:08:25 -07:00
Edijs 9f3f1ee7cb Fix UI of followers list 2019-02-11 11:03:01 -07:00
Shpuld Shpludson 8efe30c2dc Merge branch 'hotfix/open-link' into 'develop' 
Fix clicking link - open new tab unless tag or mention

See merge request pleroma/pleroma-fe!562
 2019-02-11 15:01:15 +00:00
Edijs f3d2e41a9b Fix return 2019-02-11 07:45:22 -07:00
Edijs 9959c311a9 Fix clicking link - open new tab unless tag or mention 2019-02-11 07:38:12 -07:00
Shpuld Shpludson b6bac4d06d Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop' 
Fix #324 Profiles sometimes not loading when there's no persisted state

Closes #324

See merge request pleroma/pleroma-fe!553
 2019-02-11 13:34:03 +00:00
Shpuld Shpludson 0e6134b32e Merge branch 'issue-332-update-follow-tabs' into 'develop' 
#332 - add follow/not follow button to follow list

See merge request pleroma/pleroma-fe!558
 2019-02-11 13:29:58 +00:00
jasper db465ff839 Fix max-width of profile banner in setting 2019-02-11 00:06:37 -08:00