Skip to content

Commit

Permalink
Merge branch 'pr/1413' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Oct 25, 2023
2 parents 95a88a9 + 8c57117 commit 3be27f8
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 24 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Changed
- Rewrite of Chat activity
- Migrate localization to i18next
- Updated Etoys activity, supports (local) saving now

### Fixed
- Chess multiplayer bug when a third player join #1047
Expand Down
2 changes: 1 addition & 1 deletion activities.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{"id": "org.sugarlabs.gameOfLife", "name": "Game Of Life", "version": 1, "directory": "activities/GameOfLife.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.FotoToonJs", "name": "FotoToon", "version": 1, "directory": "activities/Fototoon.activity", "icon": "activity/fototoon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.GTDActivity", "name": "Get Things Done", "version": 1, "directory": "activities/GetThingsDone.activity", "icon": "activity/activity-icon.svg", "favorite": false, "activityId": null},
{"id": "org.squeak.EtoysActivity", "name": "Etoys", "version": 2, "directory": "activities/Etoys.activity", "icon": "activity/activity-etoys.svg", "favorite": false, "activityId": null},
{"id": "org.squeak.EtoysActivity", "name": "Etoys", "version": 3, "directory": "activities/Etoys.activity", "icon": "activity/activity-etoys.svg", "favorite": false, "activityId": null},
{"id": "org.olpcfrance.EbookReader", "name": "Ebook Reader", "version": 1, "directory": "activities/EbookReader.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.olpcfrance.Calligra", "name": "Calligra", "version": 1, "directory": "activities/Calligra.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.olpcfrance.MediaViewerActivity", "name": "MediaViewer", "version": 1, "directory": "activities/MediaViewer.activity", "icon": "activity/activity-icon.svg", "favorite": false, "activityId": null},
Expand Down
2 changes: 1 addition & 1 deletion activities/Etoys.activity/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2016 Bert Freudenberg
Copyright (c) 2013-2023 Vanessa Freudenberg
Copyright (c) 2016 Fabio Niephaus, Google Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
10 changes: 5 additions & 5 deletions activities/Etoys.activity/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Etoys running on SqueakJS
=========================

This version of Squeak/Etoys uses the [SqueakJS][homepage] virtual machine. Specifically, the minified version from the [gh-pages][src] branch.
Please [file issues][issues] there, mentioning "sugarizer".
This version of Squeak/Etoys uses the [SqueakJS][homepage] virtual machine.
Please [file issues][issues] in Vanessa's [github][github repo], mentioning "sugarizer".

[homepage]: http://bertfreudenberg.github.io/SqueakJS/
[src]: https://github.com/bertfreudenberg/SqueakJS/tree/gh-pages/run
[issues]: https://github.com/bertfreudenberg/SqueakJS/issues
[homepage]: https://squeak.js.org/
[github]: https://github.com/codefrau/SqueakJS/
[issues]: https://github.com/codefrau/SqueakJS/issues
2 changes: 1 addition & 1 deletion activities/Etoys.activity/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>Etoys Activity</title>
<!--
Copyright (c) 2013-2016 Bert Freudenberg
Copyright (c) 2013-2023 Vanessa Freudenberg
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
16 changes: 1 addition & 15 deletions activities/Etoys.activity/squeak.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion activities/Etoys.activity/squeak.min.js.map

Large diffs are not rendered by default.

0 comments on commit 3be27f8

Please sign in to comment.