lamp/akkoma-fe
1
0
Fork 0
mirror of https://akkoma.dev/lamp/akkoma-fe.git synced 2026-06-04 14:20:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: lamp/akkoma-fe:4d91a7b2c36b3aff82d8988196ec1703709b93f8
Branches Tags
lamp/akkoma-fe:custom lamp/akkoma-fe:wtf lamp/akkoma-fe:public-favorites lamp/akkoma-fe:probably-not-good-merge
lamp/akkoma-fe:v3.11.0 lamp/akkoma-fe:v3.10.0 lamp/akkoma-fe:2023.05 lamp/akkoma-fe:2023.04 lamp/akkoma-fe:2023.03 lamp/akkoma-fe:v0.1 lamp/akkoma-fe:2.4.5-2 lamp/akkoma-fe:2.4.5-1 lamp/akkoma-fe:2.4.5 lamp/akkoma-fe:2.4.4-1 lamp/akkoma-fe:2.4.4 lamp/akkoma-fe:2.4.3 lamp/akkoma-fe:ci-1 lamp/akkoma-fe:ci-0 lamp/akkoma-fe:2.4.2 lamp/akkoma-fe:2.4.0 lamp/akkoma-fe:2.3.0 lamp/akkoma-fe:2.2.3 lamp/akkoma-fe:2.2.2 lamp/akkoma-fe:2.2.1 lamp/akkoma-fe:2.2.0 lamp/akkoma-fe:2.1.2 lamp/akkoma-fe:2.1.1 lamp/akkoma-fe:2.1.0 lamp/akkoma-fe:2.0.5 lamp/akkoma-fe:2.0.3 lamp/akkoma-fe:2.0.2 lamp/akkoma-fe:0.9.999 lamp/akkoma-fe:0.9.99 lamp/akkoma-fe:0.9.9
...
compare: lamp/akkoma-fe:2.2.1
Branches Tags
lamp/akkoma-fe:wtf lamp/akkoma-fe:public-favorites lamp/akkoma-fe:probably-not-good-merge lamp/akkoma-fe:custom
lamp/akkoma-fe:v3.11.0 lamp/akkoma-fe:v3.10.0 lamp/akkoma-fe:2023.05 lamp/akkoma-fe:2023.04 lamp/akkoma-fe:2023.03 lamp/akkoma-fe:v0.1 lamp/akkoma-fe:2.4.5-2 lamp/akkoma-fe:2.4.5-1 lamp/akkoma-fe:2.4.5 lamp/akkoma-fe:2.4.4-1 lamp/akkoma-fe:2.4.4 lamp/akkoma-fe:2.4.3 lamp/akkoma-fe:ci-1 lamp/akkoma-fe:ci-0 lamp/akkoma-fe:2.4.2 lamp/akkoma-fe:2.4.0 lamp/akkoma-fe:2.3.0 lamp/akkoma-fe:2.2.3 lamp/akkoma-fe:2.2.2 lamp/akkoma-fe:2.2.1 lamp/akkoma-fe:2.2.0 lamp/akkoma-fe:2.1.2 lamp/akkoma-fe:2.1.1 lamp/akkoma-fe:2.1.0 lamp/akkoma-fe:2.0.5 lamp/akkoma-fe:2.0.3 lamp/akkoma-fe:2.0.2 lamp/akkoma-fe:0.9.999 lamp/akkoma-fe:0.9.99 lamp/akkoma-fe:0.9.9

22 Commits
4d91a7b2c3 ... 2.2.1

Author SHA1 Message Date
Shpuld Shpuldson a7567ce6d0 set patch date to correct 2020-11-11 22:32:44 +02:00
Shpuld Shpuldson 8e87e3d88b Update MASTER with develop for 2.2.1 2020-11-09 11:13:49 +02:00
Shpuld Shpuldson 6aa276374f update changelog for 2.2.0 2020-11-06 19:35:01 +02:00
Shpuld Shpludson 23232e1c8f Merge branch 'develop' into 'master' 
Merge develop into master for 2.2.0

See merge request pleroma/pleroma-fe!1278
 2020-11-06 17:27:25 +00:00
Shpuld Shpludson b225c3578f Merge branch 'rc/2.1.2' into 'master' 
Merge 2.1.2 to MASTER

See merge request pleroma/pleroma-fe!1236
 2020-09-17 17:26:22 +00:00
Shpuld Shpludson 30efbaab34 Merge branch 'master' into 'rc/2.1.2' 
# Conflicts:
#   CHANGELOG.md
 2020-09-17 17:17:21 +00:00
Shpuld Shpuldson 8ca0586c0f update changelog for 2.1.2 2020-09-17 20:15:08 +03:00
Shpuld Shpludson 938887ef91 Merge branch 'rc/2.1.1' into 'master' 
Update master with 2.1.1

See merge request pleroma/pleroma-fe!1231
 2020-09-08 09:46:19 +00:00
Shpuld Shpludson f31bc5310e Merge branch 'master' into 'rc/2.1.1' 
# Conflicts:
#   CHANGELOG.md
 2020-09-08 09:35:36 +00:00
Shpuld Shpuldson 925bf5b5a4 update changelog with 2.1.1 2020-09-08 12:30:45 +03:00
Shpuld Shpludson e768ec1fca Merge branch '2.1.0-rc0' into 'master' 
2.1.0 into master

See merge request pleroma/pleroma-fe!1217
 2020-08-27 14:45:03 +00:00
Shpuld Shpuldson d09f43ba7a Merge branch '2.1.0-rc0' of git.pleroma.social:pleroma/pleroma-fe into 2.1.0-rc0 2020-08-27 17:13:43 +03:00
Shpuld Shpuldson 748c4d8c71 fix boomarks mistake in changelog 2020-08-27 17:13:14 +03:00
Shpuld Shpludson c7ddfefe34 Merge branch 'master' into '2.1.0-rc0' 
# Conflicts:
#   CHANGELOG.md
#   src/services/api/api.service.js
 2020-08-27 13:59:56 +00:00
Shpuld Shpuldson c0205d582a add missing release to changelog to fix conflicts 2020-08-27 16:56:47 +03:00
Shpuld Shpuldson 4ac882a3b0 add back unreleased/patch 2020-08-27 16:51:16 +03:00
Shpuld Shpuldson bdbc4b27b6 set 2.1.0 date and remove rc from changelog 2020-08-27 16:49:01 +03:00
Shpuld Shpuldson 42598fc675 change changelog 2020-08-26 14:28:43 +03:00
Shpuld Shpludson 5d49edc823 Merge branch 'rc/2.0.5' into 'master' 
Update MASTER for 2.0.5 patch

See merge request pleroma/pleroma-fe!1105
 2020-05-12 17:36:05 +00:00
Shpuld Shpuldson 0bc0a8d5f5 update changelog for 2.0.5 2020-05-12 20:27:37 +03:00
Shpuld Shpuldson 726d5279c1 Revert "remove with_move param" 
This reverts commit 02c8a9e314.
 2020-05-12 20:04:00 +03:00
Shpuld Shpludson a0f780c455 Merge branch 'rc/2.0.3' into 'master' 
Update MASTER with 2.0.3 for real

See merge request pleroma/pleroma-fe!1099
 2020-05-02 14:17:27 +00:00
2 changed files with 4 additions and 1 deletions
Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [2.2.1] - 2020-11-11
### Fixed ### Fixed
- Fixed regression in react popup alignment and overflowing - Fixed regression in react popup alignment and overflowing
src/services/notifications_fetcher/notifications_fetcher.service.js
+3
View File
@@ -12,9 +12,12 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
const rootState = store.rootState || store.state const rootState = store.rootState || store.state
const timelineData = rootState.statuses.notifications const timelineData = rootState.statuses.notifications
const hideMutedPosts = getters.mergedConfig.hideMutedPosts const hideMutedPosts = getters.mergedConfig.hideMutedPosts
const allowFollowingMove = rootState.users.currentUser.allow_following_move
args['withMuted'] = !hideMutedPosts args['withMuted'] = !hideMutedPosts
args['withMove'] = !allowFollowingMove
args['timeline'] = 'notifications' args['timeline'] = 'notifications'
if (older) { if (older) {
if (timelineData.minId !== Number.POSITIVE_INFINITY) { if (timelineData.minId !== Number.POSITIVE_INFINITY) {