Commit graph

6171 commits

Author SHA1 Message Date
Hakaba Hitoyo
091fb5573c i18n/Update Japanese 2019-08-17 08:14:17 +00:00
Shpuld Shpludson
271cf18f3c Merge branch 'i18n/update-pedantic-japanese' into 'develop'
i18n/Update pedantic Japanese

See merge request pleroma/pleroma-fe!912
2019-08-17 08:14:00 +00:00
Hakaba Hitoyo
fc68c3907d i18n/Update pedantic Japanese 2019-08-17 08:14:00 +00:00
Shpuld Shpludson
e8fad7a460 Merge branch 'telugu-translation' into 'develop'
i18n: Translated to Telugu (44.3%)

See merge request pleroma/pleroma-fe!913
2019-08-17 08:13:29 +00:00
Shpuld Shpludson
e5fe4f420c Merge branch '564' into 'develop'
Restore scroll position for user profile when navigate back and forward

Closes #636 and #564

See merge request pleroma/pleroma-fe!914
2019-08-17 08:12:21 +00:00
taehoon
7dfcabb543 sync profile tab state with location query 2019-08-15 13:25:38 -04:00
taehoon
e8c22fbfa3 refactor TabSwitcher 2019-08-15 13:25:38 -04:00
taehoon
6e51774ccb use better name of controlled prop 2019-08-15 13:25:38 -04:00
taehoon
eafd53f994 fix potential bug to render active tab in controlled way 2019-08-15 13:25:38 -04:00
taehoon
9dd9ba0205 remove unused param 2019-08-15 13:25:38 -04:00
taehoon
df3e80b7c3 use key prop instead of dataset to identify active tab 2019-08-15 13:25:38 -04:00
taehoon
cd14566a34 remove useless index param of onSwitch 2019-08-15 13:25:38 -04:00
taehoon
539913673f reset error state when load new profile 2019-08-15 13:25:38 -04:00
taehoon
2e0603bdca clear timelines only if load user not viewed previously 2019-08-15 13:25:38 -04:00
HJ
9f6be4fe65 Merge branch 'fix/fix-link-to-external-users-in-who-to-follow-page' into 'develop'
Fix/Fix links to external users in Who to follow page

See merge request pleroma/pleroma-fe!918
2019-08-15 17:19:49 +00:00
Hakaba Hitoyo
dd340bb9e3 Fix/Fix links to external users in Who to follow page 2019-08-15 17:19:49 +00:00
Shpuld Shpludson
877a71fa41 Merge branch '293' into 'develop'
Detect hashtag using rel instead of class

Closes #293

See merge request pleroma/pleroma-fe!908
2019-08-14 05:24:19 +00:00
Shpuld Shpludson
0ea1f6f582 Merge branch 'fix-chrome-logo' into 'develop'
Fix logo being all kinds of fucked on chrome by recovering autoprefixer

See merge request pleroma/pleroma-fe!917
2019-08-14 05:23:44 +00:00
Henry Jameson
aeae25b74e revives autoprefixer which went AWOL during Webpack v1 -> v4 migration 2019-08-14 01:18:07 +03:00
taehoon
9229f28edb rel also accepts list, update rel detection logic 2019-08-13 13:11:37 -04:00
taehoon
5aa2c44487 use hashtag class detection as fallback 2019-08-12 15:22:39 -04:00
taehoon
5e99bad417 detect hashtag using rel instead of class 2019-08-12 14:48:11 -04:00
Shpuld Shpludson
58b9b6c0a2 Merge branch '638' into 'develop'
Fix inconsistent space bug between panels

Closes #638

See merge request pleroma/pleroma-fe!916
2019-08-12 18:42:58 +00:00
taehoon
0bce615fe8 hide ISP if the panel content is empty 2019-08-12 14:29:11 -04:00
HJ
07086ec9ae Merge branch '637' into 'develop'
Fix user card overflow bug

Closes #637

See merge request pleroma/pleroma-fe!915
2019-08-12 18:04:52 +00:00
taehoon
a71d14704f fix user card overflow bug 2019-08-12 13:59:39 -04:00
Henry Jameson
5851f97eb0 fixed a lot of bugs with emoji picker, improved relevant components 2019-08-12 20:03:48 +03:00
Henry Jameson
579b5c9e77 initial attempts at making emoji-picker somewhat extensible 2019-08-12 14:20:08 +03:00
Henry Jameson
036882d27c rename for consistency 2019-08-12 13:51:05 +03:00
shpuld
f1bdbeabf0 fix js error on mute 2019-08-10 15:53:46 +03:00
Joseph Nuthalpati
5e0b4e06ec
i18n: Translated to Telugu (44.3%)
Verified that the translation strings work by running Pleroma-FE locally.

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
2019-08-10 16:50:59 +05:30
HJ
7e2d48a26e Merge branch 'fix/incorrect-follow-request-status' into 'develop'
Fix sent follow request detection

See merge request pleroma/pleroma-fe!910
2019-08-09 12:57:05 +00:00
rinpatch
114b5f6eff Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:26:58 +00:00
rinpatch
5f3ac6625f Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:25:58 +00:00
rinpatch
e83b321ff2 Apply suggestion to src/services/follow_manipulate/follow_manipulate.js 2019-08-09 12:01:57 +00:00
rinpatch
766bcc2a72 Fix sent follow request detection
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
2019-08-09 15:01:13 +03:00
HJ
59f2931361 Merge branch 'fix/text-dont-media-viewer' into 'develop'
fix english settings label regarding how to view videos

See merge request pleroma/pleroma-fe!909
2019-08-09 08:31:02 +00:00
matrixsasuke
3e7f0ecf9b fix english settings label regarding how to view videos 2019-08-09 08:03:21 +02:00
shpuld
d4c366a123 fix extra buttons merge bug 2019-08-08 21:24:40 +03:00
Shpuld Shpludson
a45f258a2c Merge branch '632' into 'develop'
Fix gif image zoom bug on hover

Closes #632

See merge request pleroma/pleroma-fe!905
2019-08-08 10:12:46 +00:00
Shpuld Shpludson
acb788d575 Merge branch '631' into 'develop'
Hide image block in rich media preview in case of broken image

Closes #631

See merge request pleroma/pleroma-fe!902
2019-08-08 10:10:58 +00:00
Shpuld Shpludson
74cf601094 Merge branch '627' into 'develop'
Fix "Post status modal disappearing on mobile landscape mode"

Closes #627

See merge request pleroma/pleroma-fe!899
2019-08-08 10:10:23 +00:00
Shpuld Shpludson
92380652fe Merge branch 'feat/conversation-muting' into 'develop'
Add Conversation/Thread Muting

See merge request pleroma/pleroma-fe!876
2019-08-08 10:09:07 +00:00
morguldir
b9fd3bebc5
Update norwegian bokmål translation 2019-08-08 00:47:48 +02:00
taehoon
4d54c67daa make size of gif image and preview equal 2019-08-06 22:41:27 -04:00
taehoon
32b4d4d223 css improvements 2019-08-06 20:53:10 -04:00
taehoon
a13c945143 do not unmount post status modal in desktop 2019-08-06 20:53:09 -04:00
taehoon
bb9cee84a3 hide rich media preview image in case of broken image 2019-08-06 20:52:42 -04:00
HJ
17dc7357d5 Merge branch 'issue-617' into 'develop'
Handle JSONified errors while registering

Closes #617

See merge request pleroma/pleroma-fe!888
2019-08-06 18:03:32 +00:00
Lee Starnes
4fc27414d2 Handle JSONified errors while registering
Closes #617
2019-08-06 18:03:31 +00:00