1
0
Fork 0
Commit graph

4937 commits

Author SHA1 Message Date
Shpuld Shpuldson
1495db084a fix keyboard highlight 2020-11-19 11:37:06 +02:00
Shpuld Shpuldson
0f386ccbc7 use users state + fetching with delay 2020-11-18 18:43:24 +02:00
Shpuld Shpuldson
dd3c8631bf store failed experiment 2020-11-17 17:46:26 +02:00
Shpuld Shpludson
fa2884a805 Merge branch 'chore/update-changelog-to-match-release' into 'develop'
Update develop changelog to contain 2.2.1 release

See merge request 
2020-11-11 21:13:09 +00:00
Shpuld Shpuldson
6cdf347ed1 update changelog 2020-11-11 23:04:07 +02:00
HJ
3e1c828ba9 Merge branch 'fix/html-title-name' into 'develop'
Remove title from index.html, title is now from server generated meta

See merge request 
2020-11-11 20:51:12 +00:00
Sean King
476154d0ee Remove title from index.html, title is now from server generated meta 2020-11-11 11:57:42 -07:00
HJ
563377b59c Merge branch 'fix/field-name-emoji-parsing' into 'develop'
fix   emoji not working in profile field names

Closes 

See merge request 
2020-11-11 10:15:29 +00:00
Shpuld Shpuldson
b536c6e3c5 changelog mention 2020-11-11 10:42:13 +02:00
Shpuld Shpuldson
41dbdc2b28 fix emoji not working in profile field names 2020-11-11 10:40:26 +02:00
Shpuld Shpludson
e6ca489d30 Merge branch 'fix/fix-1px-scroll-on-input' into 'develop'
Fix that 1px scroll on input for real this time maybe

See merge request 
2020-11-09 13:18:35 +00:00
Shpuld Shpuldson
c1c207788a change method of fix to rounding 2020-11-09 15:02:48 +02:00
Shpuld Shpuldson
fb80dbbc77 changelog 2020-11-09 14:47:42 +02:00
Shpuld Shpuldson
553155fc49 prevent call to scroll if the value doesn't change because firefox is stupid 2020-11-09 14:42:16 +02:00
Shpuld Shpludson
3963f240d5 Merge branch 'patch-1' into 'develop'
Update CHANGELOG.md

See merge request 
2020-11-09 09:08:41 +00:00
Shpuld Shpludson
9ff48b88bf Update CHANGELOG.md 2020-11-09 09:01:16 +00:00
Shpuld Shpludson
3220e72eb9 Merge branch 'patch-1' into 'develop'
Update CHANGELOG.md to match master

See merge request 
2020-11-09 08:58:17 +00:00
HJ
def1bd0676 Merge branch 'fix/react-menu-overflow-fix' into 'develop'
Fix  react popover overflowing

Closes 

See merge request 
2020-11-09 08:40:59 +00:00
Shpuld Shpuldson
9f96b592d4 wrap react button icon to a span to fix popover overflow 2020-11-09 09:40:20 +02:00
Shpuld Shpludson
82f17961d1 Update CHANGELOG.md to match master 2020-11-06 17:36:43 +00:00
Shpuld Shpludson
60983ae42b Merge branch 'chat-fix-for-vertical-screen' into 'develop'
Chat scroll fix for vertical screen

Closes 

See merge request 
2020-11-06 12:55:57 +00:00
eugenijm
15ea9d8c91 Fix the chat scroll behavior for vertical screens.
Fetch the messages until the scrollbar becomes visible, so that the user
always has the ability to scroll up and load new messages.
2020-11-06 11:11:19 +03:00
Shpuld Shpludson
dbeecd18ac Merge branch 'advanced-misclick-guard' into 'develop'
Instead of blocking all interaction, only block interaction in places that matter

See merge request 
2020-11-04 06:04:19 +00:00
Shpuld Shpludson
b485d21ba9 Merge branch 'fix-chat-badge' into 'develop'
Few more minor fixes

See merge request 
2020-11-03 17:09:10 +00:00
Henry Jameson
4e4b258c54 fix mobile badge alignment 2020-11-03 18:45:23 +02:00
Henry Jameson
d126eddfca change approach to disable all, enable some 2020-11-03 18:39:46 +02:00
Shpuld Shpludson
22bc0c0840 Merge branch 'svg-logo' into 'develop'
change logo to svg

See merge request 
2020-11-03 11:05:33 +00:00
Henry Jameson
979efb301a fix mobile navbar hitboxes 2020-11-03 11:37:11 +02:00
Henry Jameson
e351665bb3 Instead of blocking all interaction, only block interaction in places
that matter
2020-11-02 23:43:32 +02:00
Henry Jameson
b6a8ca44ef added comment 2020-11-02 21:08:22 +02:00
Henry Jameson
bdf2f36f11 fix chat heading not being aligned and using wrong styles 2020-11-02 21:03:55 +02:00
Henry Jameson
08e6e66642 fix chat badge and unify styles across all badges including follow
request count.
2020-11-02 20:51:38 +02:00
Henry Jameson
3db218dec1 change logo to svg 2020-11-02 19:37:01 +02:00
HJ
f0a66448ee Merge branch 'chchchchangechangelog' into 'develop'
Update CHANGELOG.md

See merge request 
2020-11-02 09:43:44 +00:00
HJ
a1e7852c10 Update CHANGELOG.md 2020-11-02 09:36:23 +00:00
Shpuld Shpludson
5ab1b0ab0e Merge branch 'update-changelog' into 'develop'
update changelog for optimistic chat posting

See merge request 
2020-11-02 08:51:40 +00:00
Shpuld Shpuldson
279205ade5 update changelog for optimistic chat posting 2020-11-02 10:42:38 +02:00
HJ
bcb6ee328f Merge branch 'fix/use-ids-for-chat-last-seen' into 'develop'
Fix: Use ids for chat last seen instead of timestamp

See merge request 
2020-11-02 08:35:22 +00:00
Shpuld Shpuldson
757706425a fix test 2020-11-02 09:42:09 +02:00
Shpuld Shpuldson
5e8db7ed93 move from using timestamps to ids when tracking last seen in chats 2020-11-02 09:15:13 +02:00
Shpuld Shpludson
5254fdba75 Merge branch 'optimistic-chat-posting' into 'develop'
Optimistic / nonblocking message posting for chats

See merge request 
2020-11-02 05:36:42 +00:00
HJ
590f8e1754 Merge branch 'various-css-fixes' into 'develop'
Various css fixes

Closes 

See merge request 
2020-11-01 20:50:02 +00:00
Eugenij
78e5a63922 Apply 1 suggestion(s) to 1 file(s) 2020-11-01 23:36:58 +03:00
eugenijm
e798e9a417 Optimistic message sending for chat 2020-11-01 23:36:58 +03:00
Shpuld Shpludson
148789767a Merge branch 'fix/chat-misc-fixes' into 'develop'
Misc Chat fixes

See merge request 
2020-11-01 17:50:43 +00:00
Shpuld Shpludson
40ce3a9bd8 Merge branch 'fix/block-misclicks-when-timeline-shifts' into 'develop'
block clicks for a second on timeline when timeline moves

See merge request 
2020-11-01 17:44:16 +00:00
HJ
8ae77e14d0 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
Translations update from Weblate

See merge request 
2020-11-01 15:18:08 +00:00
Henry Jameson
64da9a8e69 fix build warnings 2020-11-01 16:47:17 +02:00
Henry Jameson
8b1213ea1e lint 2020-11-01 16:44:57 +02:00
Henry Jameson
994b49ddfe Merge remote-tracking branch 'origin/develop' into various-css-fixes
* origin/develop:
  remove 'md' size that doesn't exist
2020-11-01 16:44:15 +02:00