Changes
Translation projects API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/projects/stream-view/changes/?format=api&page=4
{ "count": 488, "next": "https://weblate.foundryvtt-hub.com/api/projects/stream-view/changes/?format=api&page=5", "previous": "https://weblate.foundryvtt-hub.com/api/projects/stream-view/changes/?format=api&page=3", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-23T04:16:38.954337Z", "action": 15, "target": "", "old": "", "details": { "auto": true }, "id": 381868, "action_name": "Component unlocked", "url": "https://weblate.foundryvtt-hub.com/api/changes/381868/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/sPOiDar/?format=api", "author": null, "timestamp": "2023-09-23T04:16:38.912843Z", "action": 19, "target": "", "old": "", "details": {}, "id": 381867, "action_name": "Repository reset", "url": "https://weblate.foundryvtt-hub.com/api/changes/381867/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/sPOiDar/?format=api", "author": null, "timestamp": "2023-09-23T04:15:46.459068Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 628074c\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '628074c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 381866, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/381866/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-23T03:45:05.713487Z", "action": 47, "target": "", "old": "", "details": { "alert": "RepositoryOutdated" }, "id": 381863, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/381863/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-22T13:03:59.725295Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 628074c\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '628074c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 380247, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/380247/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-22T13:03:58.822814Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 380246, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/380246/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-22T13:01:04.441186Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto b689b2d\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'b689b2d'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 380245, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/380245/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-22T13:01:03.236862Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 380244, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/380244/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-19T22:03:53.973043Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto ef47143\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'ef47143'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 378539, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/378539/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-19T22:03:52.956316Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 378538, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/378538/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-19T21:50:41.494147Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 3ac30a8\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '3ac30a8'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 378537, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/378537/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-09-19T21:50:40.763647Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 378536, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/378536/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T22:21:19.808065Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 3796ae7\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '3796ae7'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 346344, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/346344/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T22:21:19.079440Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 346343, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/346343/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T22:19:04.578796Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8a76cdb\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '8a76cdb'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 346342, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/346342/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T22:19:03.849003Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 346341, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/346341/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T22:13:32.272431Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto a795d26\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'a795d26'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 346340, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/346340/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T22:13:31.687316Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 346339, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/346339/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T00:43:01.712533Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto ccb092d\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'ccb092d'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 345677, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/345677/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T00:43:01.013071Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 345676, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/345676/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T00:38:59.301915Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 6fd6d02\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '6fd6d02'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 345675, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/345675/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T00:38:58.649813Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 345674, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/345674/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T12:43:21.739230Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 3b5743e\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '3b5743e'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 338234, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338234/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T12:43:21.199571Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 338233, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338233/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T12:40:08.304557Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8ae2a38\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '8ae2a38'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 338232, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338232/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T12:40:07.646456Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 338231, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338231/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T12:37:57.416779Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 431e35d\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '431e35d'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 338230, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338230/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-09T12:37:56.561789Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 338229, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338229/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T06:06:42.335628Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto c4f1fa3\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'c4f1fa3'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 336961, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/336961/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T06:06:41.772934Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 336960, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/336960/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T06:04:38.520591Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 950de74\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '950de74'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 336959, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/336959/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T06:04:37.790022Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 336958, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/336958/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T01:30:32.822111Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto db4ed78\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'db4ed78'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 336949, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/336949/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T01:30:32.253721Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 336948, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/336948/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T01:29:14.280942Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 8c22620\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '8c22620'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 336947, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/336947/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-03T01:29:13.534315Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 336946, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/336946/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-29T11:14:37.036370Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 3146cdb\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '3146cdb'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335875, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335875/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-29T11:14:36.436830Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 335874, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335874/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-29T11:13:30.868095Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto ec82bee\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'ec82bee'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335873, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335873/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-29T11:13:30.261738Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 335872, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335872/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T05:50:31.421628Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto b84293c\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'b84293c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335437, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335437/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T05:50:30.738069Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 335436, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335436/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T05:48:46.366171Z", "action": 14, "target": "", "old": "", "details": { "auto": true }, "id": 335435, "action_name": "Component locked", "url": "https://weblate.foundryvtt-hub.com/api/changes/335435/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T05:48:46.349106Z", "action": 47, "target": "", "old": "", "details": { "alert": "MergeFailure" }, "id": 335434, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/335434/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T05:48:46.332613Z", "action": 23, "target": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "old": "", "details": { "error": "Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)", "status": "interactive rebase in progress; onto 100782f\nLast command done (1 command done):\n pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '100782f'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: lang/pl.json\n\nUnmerged paths:\n (use \"git restore --staged <file>...\" to unstage)\n (use \"git add <file>...\" to mark resolution)\n\tboth modified: module.json\n\n" }, "id": 335433, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335433/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T05:48:45.692333Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 335432, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335432/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T03:19:18.199687Z", "action": 18, "target": "", "old": "", "details": {}, "id": 335395, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/335395/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T03:19:17.205004Z", "action": 21, "target": "", "old": "", "details": {}, "id": 335394, "action_name": "Repository rebased", "url": "https://weblate.foundryvtt-hub.com/api/changes/335394/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-05-28T03:19:16.635519Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/sPOiDar/fvtt-module-stream-view", "git://github.com/sPOiDar/fvtt-module-stream-view.git", "[email protected]:sPOiDar/fvtt-module-stream-view", "[email protected]:sPOiDar/fvtt-module-stream-view.git", "https://github.com/sPOiDar/fvtt-module-stream-view", "https://github.com/sPOiDar/fvtt-module-stream-view.git" ], "branch": "develop", "repo_url": "https://github.com/sPOiDar/fvtt-module-stream-view", "full_name": "sPOiDar/fvtt-module-stream-view", "service_long_name": "GitHub" }, "id": 335393, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/335393/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=api", "translation": null, "user": "https://weblate.foundryvtt-hub.com/api/users/sPOiDar/?format=api", "author": null, "timestamp": "2023-05-21T10:13:50.852412Z", "action": 18, "target": "", "old": "", "details": {}, "id": 329465, "action_name": "Changes pushed", "url": "https://weblate.foundryvtt-hub.com/api/changes/329465/?format=api" } ] }