49159e6db3
Merge branch 'mastoapi-follow-reqs' into 'develop'
...
Use mastodon api in follow requests
See merge request pleroma/pleroma-fe!937
2019-09-03 10:58:17 +00:00
8e3d6f5c28
Use mastodon api in follow requests
2019-09-03 13:50:26 +03:00
6238fe3633
Merge branch '652' into 'develop'
...
Fix "TypeError: Cannot set property 'pinned' of undefined"
Closes #652
See merge request pleroma/pleroma-fe!936
2019-09-03 04:48:24 +00:00
c43a5ab992
Merge branch 'patch-1' into 'develop'
...
Some corrections to the spanish translation
See merge request pleroma/pleroma-fe!929
2019-09-03 04:11:16 +00:00
fbfedf0084
Merge branch 'fix/attachment-css' into 'develop'
...
Make image orientation consistent on FF, fix videos w/ modal
See merge request pleroma/pleroma-fe!926
2019-09-03 04:09:56 +00:00
66e9f17c58
"Optional" in lowercase.
2019-09-02 11:41:30 +00:00
4f82ea0fea
Update es.json
2019-09-01 21:57:07 +00:00
daf7d4e661
fix pin/unpin status logic
2019-09-01 13:07:43 -04:00
13b80b5c7c
rename a mutation
2019-09-01 13:07:43 -04:00
9825a857f3
Merge branch 'docs' into 'develop'
...
Documentation
See merge request pleroma/pleroma-fe!718
2019-08-31 19:44:44 +00:00
9e3891de61
Merge remote-tracking branch 'upstream/docs' into docs
...
* upstream/docs:
Apply suggestion to docs/HACKING.md
Apply suggestion to docs/CONFIGURATION.md
2019-08-31 22:39:56 +03:00
2dfba76772
update
2019-08-31 22:39:26 +03:00
18ec13d796
Merge remote-tracking branch 'upstream/develop' into docs
...
* upstream/develop: (193 commits)
fix user avatar fallback logic
remove dead code
make bio textarea resizable vertically only
remove dead code
remove dead code
fix crazy watch logic in conversation
show three dot button only if needed
hide mute conversation button to guests
update keyBy
generate idObj at timeline level
fix pin showing logic in conversation
Show a message when JS is disabled
Initialize chat only if user is logged in and it wasn't initialized before
i18n/Update Japanese
i18n/Update pedantic Japanese
sync profile tab state with location query
refactor TabSwitcher
use better name of controlled prop
fix potential bug to render active tab in controlled way
remove unused param
...
2019-08-31 22:38:02 +03:00
018a650166
Merge branch 'remove-dead-code' into 'develop'
...
Remove dead code
See merge request pleroma/pleroma-fe!927
2019-08-29 17:16:57 +00:00
814ba88f1c
Merge branch 'fix-user-avatar-fallback' into 'develop'
...
Fix broken user avatar fallback logic
See merge request pleroma/pleroma-fe!933
2019-08-29 17:10:18 +00:00
9476fbba5a
fix user avatar fallback logic
2019-08-28 14:02:04 -04:00
c01d2543d5
remove dead code
2019-08-28 13:06:57 -04:00
a15810afc8
Corrected "Media Proxy" translation.
2019-08-27 19:07:07 +00:00
50bf9e633b
Update es.json
2019-08-26 21:37:39 +00:00
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
e1c2c5cfed
make bio textarea resizable vertically only
2019-08-26 16:00:19 -04:00
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
a0712270aa
remove dead code
2019-08-26 14:29:40 -04:00
15c4088a68
Make image orientation consistent on FF, fix videos w/ modal
2019-08-26 14:08:30 +03:00
7b5cdab7cd
remove dead code
2019-08-25 16:58:13 -04:00
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
9b8bf655e1
fix crazy watch logic in conversation
2019-08-23 13:49:39 -04:00
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
HJ