DebaucheryLibrarian/traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian/traxxx-web:f9e03f47ba515ecda7c3a6e80ec6638ceef014f2
Branches Tags
DebaucheryLibrarian/traxxx-web:main
...
compare: DebaucheryLibrarian/traxxx-web:c9e698c9060d0a5b7b441f1576bcf8eb15dc3cf5
Branches Tags
DebaucheryLibrarian/traxxx-web:main
2 Commits
f9e03f47ba ... c9e698c906
Author SHA1 Message Date
DebaucheryLibrarian c9e698c906 0.57.4 2026-07-23 23:06:21 +02:00
DebaucheryLibrarian 286248e403 Widened actor merge avatar conflict ignore scope. 2026-07-23 23:06:18 +02:00
3 changed files with 4 additions and 4 deletions
Expand all files Collapse all files
package-lock.json
Generated
+2 -2
View File
@@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.57.3", "version": "0.57.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.57.3", "version": "0.57.4",
"dependencies": { "dependencies": {
"@brillout/json-serializer": "^0.5.25", "@brillout/json-serializer": "^0.5.25",
"@dicebear/collection": "7.0.5", "@dicebear/collection": "7.0.5",
package.json
+1 -1
View File
@@ -92,7 +92,7 @@
"overrides": { "overrides": {
"vite": "$vite" "vite": "$vite"
}, },
"version": "0.57.3", "version": "0.57.4",
"imports": { "imports": {
"#/*": "./*.js" "#/*": "./*.js"
}, },
src/actors.js
+1 -1
View File
@@ -871,7 +871,7 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
trx('actors_avatars') trx('actors_avatars')
.update('actor_id', targetActorId) .update('actor_id', targetActorId)
.whereIn('actor_id', sourceActorIds) .whereIn('actor_id', sourceActorIds)
.onConflict(['profile_id', 'media_id']) .onConflict()
.ignore(), .ignore(),
]); ]);