Commit Graph

3898 Commits

Author SHA1 Message Date
taehoon
9476fbba5a fix user avatar fallback logic 2019-08-28 14:02:04 -04:00
taehoon
c01d2543d5 remove dead code 2019-08-28 13:06:57 -04:00
Echedey López Romero
a15810afc8 Corrected "Media Proxy" translation. 2019-08-27 19:07:07 +00:00
Echedey López Romero
50bf9e633b Update es.json 2019-08-26 21:37:39 +00:00
HJ
8c465719cc Merge branch '650' into 'develop'
Make bio textarea resizable vertically only

Closes #650

See merge request pleroma/pleroma-fe!928
2019-08-26 21:18:11 +00:00
taehoon
e1c2c5cfed make bio textarea resizable vertically only 2019-08-26 16:00:19 -04:00
HJ
8e33934e50 Merge branch 'remove-dead-code' into 'develop'
Remove dead code

See merge request pleroma/pleroma-fe!925
2019-08-26 18:34:56 +00:00
taehoon
a0712270aa remove dead code 2019-08-26 14:29:40 -04:00
Shpuld Shpuldson
15c4088a68 Make image orientation consistent on FF, fix videos w/ modal 2019-08-26 14:08:30 +03:00
taehoon
7b5cdab7cd remove dead code 2019-08-25 16:58:13 -04:00
Shpuld Shpludson
0e21c3cdd9 Merge branch '646' into 'develop'
Fix "Making hundreds of needless api requests in profile page"

Closes #646

See merge request pleroma/pleroma-fe!923
2019-08-25 20:03:06 +00:00
taehoon
9b8bf655e1 fix crazy watch logic in conversation 2019-08-23 13:49:39 -04:00
Shpuld Shpludson
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
taehoon
65579796ed show three dot button only if needed 2019-08-20 17:00:28 -04:00
taehoon
92a0c475f7 hide mute conversation button to guests 2019-08-20 16:55:42 -04:00
Shpuld Shpludson
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
taehoon
4bedbfea3c update keyBy 2019-08-17 22:10:01 -04:00
taehoon
1146119d6a generate idObj at timeline level 2019-08-17 14:33:32 -04:00
taehoon
4b444708f2 fix pin showing logic in conversation 2019-08-17 14:33:32 -04:00
Shpuld Shpludson
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
Sergey Suprunenko
6795769b93 Show a message when JS is disabled 2019-08-17 08:26:00 +00:00
Shpuld Shpludson
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
Sergey Suprunenko
d74f6ed6ea Initialize chat only if user is logged in and it wasn't initialized before 2019-08-17 08:18:42 +00:00
Shpuld Shpludson
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
Shpuld Shpludson
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
Shpuld Shpludson
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
Shpuld Shpludson
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
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