d7647be812
Merge branch '645' into 'develop'
...
Show "Mute Conversation" menu item and three dot button to users and only if needed
Closes #645
See merge request pleroma/pleroma-fe!922
2019-08-21 04:56:38 +00:00
65579796ed
show three dot button only if needed
2019-08-20 17:00:28 -04:00
92a0c475f7
hide mute conversation button to guests
2019-08-20 16:55:42 -04:00
6504d8ca0f
Merge branch '640' into 'develop'
...
Fix "Mixed pin markers from multiple users"
Closes #640
See merge request pleroma/pleroma-fe!919
2019-08-18 08:24:56 +00:00
4bedbfea3c
update keyBy
2019-08-17 22:10:01 -04:00
1146119d6a
generate idObj at timeline level
2019-08-17 14:33:32 -04:00
4b444708f2
fix pin showing logic in conversation
2019-08-17 14:33:32 -04:00
61f61947ad
Merge branch 'feature/noscript-message' into 'develop'
...
Show a message when JS is disabled
Closes pleroma#827
See merge request pleroma/pleroma-fe!822
2019-08-17 08:26:00 +00:00
6795769b93
Show a message when JS is disabled
2019-08-17 08:26:00 +00:00
7f35489e3e
Merge branch 'fix/chat-issues' into 'develop'
...
Initialize chat only if user is logged in and it wasn't initialized before
Closes pleroma#1067, pleroma#856, pleroma#1080, and #394
See merge request pleroma/pleroma-fe!894
2019-08-17 08:18:42 +00:00
d74f6ed6ea
Initialize chat only if user is logged in and it wasn't initialized before
2019-08-17 08:18:42 +00:00
58713e342d
Merge branch 'eu-translate' into 'develop'
...
add Basque translate
See merge request pleroma/pleroma-fe!900
2019-08-17 08:16:45 +00:00
84c3403143
Merge branch 'es-translate' into 'develop'
...
[i18n] Spanish corrections
See merge request pleroma/pleroma-fe!904
2019-08-17 08:15:06 +00:00
aef97bc9bc
Merge branch 'update-nb' into 'develop'
...
Update norwegian bokmål translation
See merge request pleroma/pleroma-fe!906
2019-08-17 08:14:47 +00:00
71eccabbe0
Merge branch 'i18n/update-japanese' into 'develop'
...
i18n/Update Japanese
See merge request pleroma/pleroma-fe!911
2019-08-17 08:14:18 +00:00
091fb5573c
i18n/Update Japanese
2019-08-17 08:14:17 +00:00
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
fc68c3907d
i18n/Update pedantic Japanese
2019-08-17 08:14:00 +00:00
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
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
7dfcabb543
sync profile tab state with location query
2019-08-15 13:25:38 -04:00
e8c22fbfa3
refactor TabSwitcher
2019-08-15 13:25:38 -04:00
6e51774ccb
use better name of controlled prop
2019-08-15 13:25:38 -04:00
eafd53f994
fix potential bug to render active tab in controlled way
2019-08-15 13:25:38 -04:00
9dd9ba0205
remove unused param
2019-08-15 13:25:38 -04:00
df3e80b7c3
use key prop instead of dataset to identify active tab
2019-08-15 13:25:38 -04:00
cd14566a34
remove useless index param of onSwitch
2019-08-15 13:25:38 -04:00
539913673f
reset error state when load new profile
2019-08-15 13:25:38 -04:00
2e0603bdca
clear timelines only if load user not viewed previously
2019-08-15 13:25:38 -04:00
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
dd340bb9e3
Fix/Fix links to external users in Who to follow page
2019-08-15 17:19:49 +00:00
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
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
aeae25b74e
revives autoprefixer which went AWOL during Webpack v1 -> v4 migration
2019-08-14 01:18:07 +03:00
9229f28edb
rel also accepts list, update rel detection logic
2019-08-13 13:11:37 -04:00
5aa2c44487
use hashtag class detection as fallback
2019-08-12 15:22:39 -04:00
5e99bad417
detect hashtag using rel instead of class
2019-08-12 14:48:11 -04:00
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
0bce615fe8
hide ISP if the panel content is empty
2019-08-12 14:29:11 -04:00
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
a71d14704f
fix user card overflow bug
2019-08-12 13:59:39 -04:00
f1bdbeabf0
fix js error on mute
2019-08-10 15:53:46 +03:00
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
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
114b5f6eff
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:26:58 +00:00
5f3ac6625f
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:25:58 +00:00
e83b321ff2
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
2019-08-09 12:01:57 +00:00
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
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
3e7f0ecf9b
fix english settings label regarding how to view videos
2019-08-09 08:03:21 +02:00
Shpuld Shpludson