Mergan/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
4948 commits 14 branches 24 tags 16 MiB
Commit graph

4948 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
d770bab1b0 Merge branch 'fix/timeline-error-handling-fixes' into 'develop' 
Various timeline fixes

See merge request pleroma/pleroma-fe!1283
 2020-11-18 11:49:54 +00:00
HJ
cd784396e7 Merge branch 'fix-pinned' into 'develop' 
Fix pinned statuses and perhaps some other stuff

See merge request pleroma/pleroma-fe!1288
 2020-11-17 18:41:43 +00:00
Henry Jameson
b66b4124f4 Merge remote-tracking branch 'origin/develop' into fix-pinned 
* origin/develop:
  change favicon dimensions for high res, add handling when favicon isn't available
  remove the favicon changes
  make badge just a ball, make it use theming
  add favicon badge for unread notifs
 2020-11-17 20:32:56 +02:00
Henry Jameson
5c47aeeccf changelong 2020-11-17 20:32:39 +02:00
Shpuld Shpludson
d905a6cb70 Merge branch 'feat/favicon-badge' into 'develop' 
Add favicon badge for unread notifs

See merge request pleroma/pleroma-fe!1273
 2020-11-17 18:25:05 +00:00
Henry Jameson
49f7c84e3f Fix pinned statuses and perhaps some other stuff 2020-11-17 15:25:38 +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 pleroma/pleroma-fe!1286
 2020-11-11 21:13:09 +00:00
Shpuld Shpuldson
6cdf347ed1 update changelog 2020-11-11 23:04:07 +02:00
Shpuld Shpludson
fb5d3d3292 Merge branch 'develop' into 'fix/timeline-error-handling-fixes' 
# Conflicts:
#   CHANGELOG.md
 2020-11-11 20:58:47 +00: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 pleroma/pleroma-fe!1285
 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 #999  emoji not working in profile field names

Closes #999

See merge request pleroma/pleroma-fe!1284
 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 Shpuldson
1d2ba946b6 make notifications also use the popup errors, remove all error from status/notif state 2020-11-10 14:28:10 +02:00
Shpuld Shpuldson
d150dae5d1 fixes to timeline error handling 2020-11-10 12:52:54 +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 pleroma/pleroma-fe!1282
 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 pleroma/pleroma-fe!1281
 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 pleroma/pleroma-fe!1279
 2020-11-09 08:58:17 +00:00
HJ
def1bd0676 Merge branch 'fix/react-menu-overflow-fix' into 'develop' 
Fix #994 react popover overflowing

Closes #994

See merge request pleroma/pleroma-fe!1280
 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 Shpuldson
56c1d65384 Merge branch 'develop' into feat/favicon-badge 2020-11-06 14:57:50 +02:00
Shpuld Shpludson
60983ae42b Merge branch 'chat-fix-for-vertical-screen' into 'develop' 
Chat scroll fix for vertical screen

Closes #997

See merge request pleroma/pleroma-fe!1277
 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 pleroma/pleroma-fe!1276
 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 pleroma/pleroma-fe!1275
 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 pleroma/pleroma-fe!1274
 2020-11-03 11:05:33 +00:00
Shpuld Shpuldson
0206b2bcc5 change favicon dimensions for high res, add handling when favicon isn't available 2020-11-03 11:55:29 +02:00
Henry Jameson
979efb301a fix mobile navbar hitboxes 2020-11-03 11:37:11 +02:00
Shpuld Shpuldson
19fd1d4a1e remove the favicon changes 2020-11-03 10:29:03 +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
Shpuld Shpuldson
1fa046126e make badge just a ball, make it use theming 2020-11-02 16:45:15 +02:00
Shpuld Shpuldson
350eb489c2 add favicon badge for unread notifs 2020-11-02 15:46:49 +02:00
HJ
f0a66448ee Merge branch 'chchchchangechangelog' into 'develop' 
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1272
 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 pleroma/pleroma-fe!1271
 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 pleroma/pleroma-fe!1270
 2020-11-02 08:35:22 +00:00
Shpuld Shpuldson
757706425a fix test 2020-11-02 09:42:09 +02:00